Attachment 2793 Details for Bug 2252 – fix rekey/clientalive interaction

[patch] fix rekey/clientalive interaction

bz2252.diff (text/plain), 1.16 KB, created by Damien Miller on 2016-02-26 14:04:21 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2016-02-26 14:04:21 AEDT

Size: 1.16 KB

patch

obsolete

>diff --git a/serverloop.c b/serverloop.c
>index 80d1db5..7a64762 100644
>--- a/serverloop.c
>+++ b/serverloop.c
>@@ -288,6 +288,7 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
> 	channel_prepare_select(readsetp, writesetp, maxfdp, nallocp,
> 	    &minwait_secs, 0);
> 
>+	/* XXX need proper deadline system for rekey/client alive */
> 	if (minwait_secs != 0)
> 		max_time_milliseconds = MIN(max_time_milliseconds,
> 		    (u_int)minwait_secs * 1000);
>@@ -300,11 +301,14 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
> 	 * this could be randomized somewhat to make traffic
> 	 * analysis more difficult, but we're not doing it yet.
> 	 */
>-	if (compat20 &&
>-	    max_time_milliseconds == 0 && options.client_alive_interval) {
>+	if (compat20 && options.client_alive_interval) {
> 		client_alive_scheduled = 1;
>-		max_time_milliseconds =
>-		    (u_int64_t)options.client_alive_interval * 1000;
>+		if (max_time_milliseconds == 0 ||
>+		    max_time_milliseconds >
>+		    (u_int64_t)options.client_alive_interval * 1000) {
>+			max_time_milliseconds =
>+			    (u_int64_t)options.client_alive_interval * 1000;
>+		}
> 	}
> 
> 	if (compat20) {

Actions: View | Diff

Attachments on bug 2252: 2793