summaryrefslogtreecommitdiffstats
path: root/packet.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-08 04:49:30 +0200
committerDarren Tucker <dtucker@zip.com.au>2008-06-08 04:49:30 +0200
commit136e56f68967fd39e8868769f3af316f1cca0559 (patch)
treef04ab513590c91265c80a849e89d75a95a48ba57 /packet.c
parent - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c] Do n... (diff)
downloadopenssh-136e56f68967fd39e8868769f3af316f1cca0559.tar.xz
openssh-136e56f68967fd39e8868769f3af316f1cca0559.zip
- djm@cvs.openbsd.org 2008/05/19 06:14:02
[packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@
Diffstat (limited to '')
-rw-r--r--packet.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/packet.c b/packet.c
index a34c040d6..c0e91b2d6 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.152 2008/05/08 06:59:01 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.153 2008/05/19 06:14:02 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1194,9 +1194,10 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
for (;;) {
if (compat20) {
type = packet_read_poll2(seqnr_p);
- keep_alive_timeouts = 0;
- if (type)
+ if (type) {
+ keep_alive_timeouts = 0;
DBG(debug("received packet type %d", type));
+ }
switch (type) {
case SSH2_MSG_IGNORE:
debug3("Received SSH2_MSG_IGNORE");