===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/packet.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- src/usr.bin/ssh/packet.c	2007/06/07 19:37:34	1.148
+++ src/usr.bin/ssh/packet.c	2007/12/28 15:32:24	1.149
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.148 2007/06/07 19:37:34 pvalchev Exp $ */
+/* $OpenBSD: packet.c,v 1.149 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
@@ -959,9 +959,10 @@
  * packet_process_incoming.  If so, reads the packet; otherwise returns
  * SSH_MSG_NONE.  This does not wait for data from the connection.
  *
- * SSH_MSG_DISCONNECT is handled specially here.  Also,
- * SSH_MSG_IGNORE messages are skipped by this function and are never returned
- * to higher levels.
+ * SSH_MSG_DISCONNECT is handled specially here.  Also, SSH_MSG_IGNORE
+ * messages are skipped by this function and are never returned
+ * to higher levels, although SSH2_MSG_IGNORE are since they are needed
+ * for keepalives.
  */
 
 static int
@@ -1186,8 +1187,6 @@
 			if (type)
 				DBG(debug("received packet type %d", type));
 			switch (type) {
-			case SSH2_MSG_IGNORE:
-				break;
 			case SSH2_MSG_DEBUG:
 				packet_get_char();
 				msg = packet_get_string(NULL);
@@ -1208,7 +1207,7 @@
 				seqnr = packet_get_int();
 				debug("Received SSH2_MSG_UNIMPLEMENTED for %u",
 				    seqnr);
-				break;
+				/* FALLTHROUGH */
 			default:
 				return type;
 			}