RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: correct math for ClientAliveInterval that caused the 

probes to be sent less frequently than configured; from Dawid Majchrzak

OpenBSD-Commit-ID: 641153e7c05117436ddfc58267aa267ca8b80038
This commit is contained in:
djm@openbsd.org 2023-08-21 04:59:54 +00:00 committed by Damien Miller
parent 3c6ab63b38
commit 9d7193a835
No known key found for this signature in database
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.236 2023/03/08 04:43:12 guenther Exp $ */ /* $OpenBSD: serverloop.c,v 1.237 2023/08/21 04:59:54 djm 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
@ -253,7 +253,7 @@ wait_until_can_do_something(struct ssh *ssh,
/* ClientAliveInterval probing */ /* ClientAliveInterval probing */
if (client_alive_scheduled) { if (client_alive_scheduled) {
if (ret == 0 && if (ret == 0 &&
now > last_client_time + options.client_alive_interval) { now >= last_client_time + options.client_alive_interval) {
/* ppoll timed out and we're due to probe */ /* ppoll timed out and we're due to probe */
client_alive_check(ssh); client_alive_check(ssh);
last_client_time = now; last_client_time = now;