diff options
| author |   dtucker <dtucker@openbsd.org> | 2017-08-11 04:16:35 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2017-08-11 04:16:35 +0000 |
| commit | 6974a929f75b87b2d89a80f8526cf12020047471 (patch) | |
| tree | 94f44ca2bec135c495cdb45fe42a971149fb3725 /usr.bin/ssh/serverloop.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-6974a929f75b87b2d89a80f8526cf12020047471.tar.xz wireguard-openbsd-6974a929f75b87b2d89a80f8526cf12020047471.zip | |
Tweak previous keepalive commit: if last_time + keepalive <= now
instead of just "<" so client_alive_check will fire if the select
happens to return on exact second of the timeout. ok djm@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 9d077d7b334..44e05fa1d45 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.194 2017/08/11 03:58:36 dtucker Exp $ */ +/* $OpenBSD: serverloop.c,v 1.195 2017/08/11 04:16:35 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -271,7 +271,7 @@ wait_until_can_do_something(int connection_in, int connection_out, } else if (FD_ISSET(connection_in, *readsetp)) { last_client_time = now; } else if (last_client_time != 0 && last_client_time + - options.client_alive_interval < now) { + options.client_alive_interval <= now) { client_alive_check(); last_client_time = now; } |