Attachment 1791 Details for Bug 1712 – ServerAliveInterval support for SSH1

[patch] ServerAliveInterval support for SSH1

server-alive-ssh1.diff (text/plain), 1.95 KB, created by Colin Watson on 2010-02-10 08:08:10 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Watson

Created: 2010-02-10 08:08:10 AEDT

Size: 1.95 KB

patch

obsolete

>--- clientloop.c	2010-01-24 21:39:36 +0000
>+++ clientloop.c	2010-01-24 21:43:33 +0000
>@@ -502,16 +502,21 @@ client_global_request_reply(int type, u_
> static void
> server_alive_check(void)
> {
>-	if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
>-		logit("Timeout, server not responding.");
>-		cleanup_exit(255);
>-	}
>-	packet_start(SSH2_MSG_GLOBAL_REQUEST);
>-	packet_put_cstring("keepalive@openssh.com");
>-	packet_put_char(1);     /* boolean: want reply */
>-	packet_send();
>-	/* Insert an empty placeholder to maintain ordering */
>-	client_register_global_confirm(NULL, NULL);
>+	if (compat20) {
>+		if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
>+			logit("Timeout, server not responding.");
>+			cleanup_exit(255);
>+		}
>+		packet_start(SSH2_MSG_GLOBAL_REQUEST);
>+		packet_put_cstring("keepalive@openssh.com");
>+		packet_put_char(1);     /* boolean: want reply */
>+		packet_send();
>+		/* Insert an empty placeholder to maintain ordering */
>+		client_register_global_confirm(NULL, NULL);
>+	} else {
>+		packet_send_ignore(0);
>+		packet_send();
>+	}
> }
> 
> /*
>@@ -572,7 +577,7 @@ client_wait_until_can_do_something(fd_se
> 	 * event pending.
> 	 */
> 
>-	if (options.server_alive_interval == 0 || !compat20)
>+	if (options.server_alive_interval == 0)
> 		tvp = NULL;
> 	else {
> 		tv.tv_sec = options.server_alive_interval;
>--- ssh_config.5	2010-01-01 17:15:23 +0000
>+++ ssh_config.5	2010-01-01 17:23:42 +0000
>@@ -935,7 +935,10 @@ If, for example,
> .Cm ServerAliveCountMax
> is left at the default, if the server becomes unresponsive,
> ssh will disconnect after approximately 45 seconds.
>-This option applies to protocol version 2 only.
>+This option applies to protocol version 2 only; in protocol version
>+1 there is no mechanism to request a response from the server to the
>+server alive messages, so disconnection is the responsibility of the TCP
>+stack.
> .It Cm ServerAliveInterval
> Sets a timeout interval in seconds after which if no data has been received
> from the server,

Actions: View | Diff

Attachments on bug 1712: 1791