diff options
author | Damien Miller <djm@mindrot.org> | 2008-03-07 18:33:30 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-03-07 18:33:30 +1100 |
commit | 58226f60680753c55766f2ba637c9bced175c65a (patch) | |
tree | ccb1d64ef2adaba717a08a8616289e8a566f6c15 /clientloop.c | |
parent | 7cb2b56b1c7e5d0824edc507b01cd78a01019590 (diff) |
- dtucker@cvs.openbsd.org 2008/02/22 20:44:02
[clientloop.c packet.c packet.h serverloop.c]
Allow all SSH2 packet types, including UNIMPLEMENTED to reset the
keepalive timer (bz #1307). ok markus@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index d3fdc2bf..8a40bc71 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.187 2008/01/23 01:56:54 dtucker Exp $ */ +/* $OpenBSD: clientloop.c,v 1.188 2008/02/22 20:44:02 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -157,7 +157,6 @@ static int connection_in; /* Connection to server (input). */ static int connection_out; /* Connection to server (output). */ static int need_rekeying; /* Set to non-zero if rekeying is requested. */ static int session_closed = 0; /* In SSH2: login session closed. */ -static int server_alive_timeouts = 0; static void client_init_dispatch(void); int session_ident = -1; @@ -467,14 +466,14 @@ client_check_window_change(void) static void client_global_request_reply(int type, u_int32_t seq, void *ctxt) { - server_alive_timeouts = 0; + keep_alive_timeouts = 0; client_global_request_reply_fwd(type, seq, ctxt); } static void server_alive_check(void) { - if (++server_alive_timeouts > options.server_alive_count_max) { + if (++keep_alive_timeouts > options.server_alive_count_max) { logit("Timeout, server not responding."); cleanup_exit(255); } |