summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authordtucker <dtucker>2008-06-08 02:49:30 +0000
committerdtucker <dtucker>2008-06-08 02:49:30 +0000
commitb0a2e7ec4fe4aafec99ee725145e810f5baad708 (patch)
tree37318f8df9734d0c28b4535d2e7aa55c969941f8 /packet.c
parentb48d8570d69ba24b9874226af840cb344660da17 (diff)
downloadopenssh-b0a2e7ec4fe4aafec99ee725145e810f5baad708.tar.gz
- djm@cvs.openbsd.org 2008/05/19 06:14:02
[packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/packet.c b/packet.c
index a34c040d..c0e91b2d 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");