diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-05-19 06:14:03 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-05-19 06:14:03 +0000 |
| commit | c2e0e5058a57da18afda965b0d0cd3db18d69320 (patch) | |
| tree | 5d146e3e15e39d4d7c402649e447b42d907838a3 | |
| parent | f4fa28ecf1b9030a2ca2090832903e3f3ccebe20 (diff) | |
unbreak protocol keepalive timeouts bz#1465; ok dtucker@
| -rw-r--r-- | usr.bin/ssh/packet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index a6f5e79e816..b72e7a58d98 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/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 @@ -1185,9 +1185,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"); |