- dtucker@cvs.openbsd.org 2008/02/22 20:44:02

     [clientloop.c packet.c packet.h serverloop.c]
     Allow all SSH2 packet types, including UNIMPLEMENTED to reset the
     keepalive timer (bz #1307).  ok markus@

1 files changed, 3 insertions, 4 deletions

diff --git a/serverloop.c b/serverloop.c
index 124d86c6e..bf3f9c9f0 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.147 2008/01/23 01:56:54 dtucker Exp $ */
+/* $OpenBSD: serverloop.c,v 1.148 2008/02/22 20:44:02 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -104,7 +104,6 @@ static int connection_in;	/* Connection to client (input). */
 static int connection_out;      /* Connection to client (output). */
 static int connection_closed = 0;       /* Connection to client closed. */
 static u_int buffer_high;       /* "Soft" max buffer size. */
-static int client_alive_timeouts = 0;
 
 /*
  * This SIGCHLD kludge is used to detect when the child exits.  The server
@@ -248,7 +247,7 @@ client_alive_check(void)
         int channel_id;
 
         /* timeout, check to see how many we have had */
-        if (++client_alive_timeouts > options.client_alive_count_max) {
+        if (++keep_alive_timeouts > options.client_alive_count_max) {
                 logit("Timeout, client not responding.");
                 cleanup_exit(255);
         }
@@ -887,7 +886,7 @@ server_input_keep_alive(int type, u_int32_t seq, void *ctxt)
          * even if this was generated by something other than
          * the bogus CHANNEL_REQUEST we send for keepalives.
          */
-        client_alive_timeouts = 0;
+        keep_alive_timeouts = 0;
 }
 
 static void