summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--clientloop.c25
-rw-r--r--ssh_config.55
2 files changed, 19 insertions, 11 deletions
diff --git a/clientloop.c b/clientloop.c
index 311dc1393..dc76d6960 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -563,16 +563,21 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
563static void 563static void
564server_alive_check(void) 564server_alive_check(void)
565{ 565{
566 if (packet_inc_alive_timeouts() > options.server_alive_count_max) { 566 if (compat20) {
567 logit("Timeout, server %s not responding.", host); 567 if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
568 cleanup_exit(255); 568 logit("Timeout, server %s not responding.", host);
569 cleanup_exit(255);
570 }
571 packet_start(SSH2_MSG_GLOBAL_REQUEST);
572 packet_put_cstring("keepalive@openssh.com");
573 packet_put_char(1); /* boolean: want reply */
574 packet_send();
575 /* Insert an empty placeholder to maintain ordering */
576 client_register_global_confirm(NULL, NULL);
577 } else {
578 packet_send_ignore(0);
579 packet_send();
569 } 580 }
570 packet_start(SSH2_MSG_GLOBAL_REQUEST);
571 packet_put_cstring("keepalive@openssh.com");
572 packet_put_char(1); /* boolean: want reply */
573 packet_send();
574 /* Insert an empty placeholder to maintain ordering */
575 client_register_global_confirm(NULL, NULL);
576} 581}
577 582
578/* 583/*
@@ -634,7 +639,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
634 */ 639 */
635 640
636 timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */ 641 timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */
637 if (options.server_alive_interval > 0 && compat20) { 642 if (options.server_alive_interval > 0) {
638 timeout_secs = options.server_alive_interval; 643 timeout_secs = options.server_alive_interval;
639 server_alive_time = now + options.server_alive_interval; 644 server_alive_time = now + options.server_alive_interval;
640 } 645 }
diff --git a/ssh_config.5 b/ssh_config.5
index 8d806c701..89b25cdd5 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -1130,7 +1130,10 @@ If, for example,
1130.Cm ServerAliveCountMax 1130.Cm ServerAliveCountMax
1131is left at the default, if the server becomes unresponsive, 1131is left at the default, if the server becomes unresponsive,
1132ssh will disconnect after approximately 45 seconds. 1132ssh will disconnect after approximately 45 seconds.
1133This option applies to protocol version 2 only. 1133This option applies to protocol version 2 only; in protocol version
11341 there is no mechanism to request a response from the server to the
1135server alive messages, so disconnection is the responsibility of the TCP
1136stack.
1134.It Cm ServerAliveInterval 1137.It Cm ServerAliveInterval
1135Sets a timeout interval in seconds after which if no data has been received 1138Sets a timeout interval in seconds after which if no data has been received
1136from the server, 1139from the server,