- andreas@cvs.openbsd.org 2009/05/27 06:31:25

     [canohost.h canohost.c]
     Add clear_cached_addr(), needed for upcoming changes allowing the peer
     address to change.
     ok markus@

1 files changed, 3 insertions, 3 deletions

diff --git a/serverloop.c b/serverloop.c
index 81cafe6ad..53cb67d7b 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.157 2009/02/12 03:16:01 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.158 2009/05/25 06:48:01 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -249,7 +249,7 @@ client_alive_check(void)
         int channel_id;
 
         /* timeout, check to see how many we have had */
-        if (++keep_alive_timeouts > options.client_alive_count_max) {
+        if (packet_inc_alive_timeouts() > options.client_alive_count_max) {
                 logit("Timeout, client not responding.");
                 cleanup_exit(255);
         }
@@ -890,7 +890,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.
          */
-        keep_alive_timeouts = 0;
+        packet_set_alive_timeouts(0);
 }
 
 static void