tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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@

Upstream-ID: e02756bd6038d11bb8522bfd75a4761c3a684fcc
This commit is contained in:
dtucker@openbsd.org 2017-08-11 04:16:35 +00:00 committed by Damien Miller
parent b60ff20051
commit 42a8f8bc28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serverloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -277,7 +277,7 @@ wait_until_can_do_something(int connection_in, int connection_out,
} else if (FD_ISSET(connection_in, *readsetp)) { } else if (FD_ISSET(connection_in, *readsetp)) {
last_client_time = now; last_client_time = now;
} else if (last_client_time != 0 && last_client_time + } else if (last_client_time != 0 && last_client_time +
options.client_alive_interval < now) { options.client_alive_interval <= now) {
client_alive_check(); client_alive_check();
last_client_time = now; last_client_time = now;
} }