From 42a8f8bc288ef8cac504c5c73f09ed610bc74a34 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 11 Aug 2017 04:16:35 +0000 Subject: upstream commit 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 --- serverloop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverloop.c b/serverloop.c index 4b8d5ba68..5cc3fc099 100644 --- a/serverloop.c +++ b/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -277,7 +277,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; } -- cgit v1.2.3