Drop SSH1 keepalive patch. Now that SSH1 is disabled at compile-time, it's been rejected upstream and there isn't much point carrying it any more.

1 files changed, 10 insertions, 15 deletions

diff --git a/clientloop.c b/clientloop.c
index 5c2b7217f..5653cc489 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -578,21 +578,16 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
 static void
 server_alive_check(void)
 {
-        if (compat20) {
-                if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
-                        logit("Timeout, server %s not responding.", host);
-                        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();
+        if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
+                logit("Timeout, server %s not responding.", host);
+                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);
 }
 
 /*
@@ -654,7 +649,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
          */
 
         timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */
-        if (options.server_alive_interval > 0) {
+        if (options.server_alive_interval > 0 && compat20) {
                 timeout_secs = options.server_alive_interval;
                 server_alive_time = now + options.server_alive_interval;
         }