- dtucker@cvs.openbsd.org 2007/12/28 15:32:24

     [clientloop.c serverloop.c packet.c]
     Make SSH2_MSG_UNIMPLEMENTED and SSH2_MSG_IGNORE messages reset the
     ServerAlive and ClientAlive timers.  Prevents dropping a connection
     when these are enabled but the peer does not support our keepalives.
     bz #1307, ok djm@.

1 files changed, 3 insertions, 1 deletions

diff --git a/serverloop.c b/serverloop.c
index 7e373f01b..81888d0e5 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.145 2006/10/11 12:38:03 markus Exp $ */
+/* $OpenBSD: serverloop.c,v 1.146 2007/12/28 15:32:24 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1193,6 +1193,8 @@ server_init_dispatch_20(void)
         dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_keep_alive);
         dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive);
         dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive);
+        dispatch_set(SSH2_MSG_IGNORE, &server_input_keep_alive);
+        dispatch_set(SSH2_MSG_UNIMPLEMENTED, &server_input_keep_alive);
         /* rekeying */
         dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);
 }