diff options
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 d3fdc2bfc..8a40bc71e 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.187 2008/01/23 01:56:54 dtucker Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.188 2008/02/22 20:44:02 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -157,7 +157,6 @@ static int connection_in; /* Connection to server (input). */ | |||
157 | static int connection_out; /* Connection to server (output). */ | 157 | static int connection_out; /* Connection to server (output). */ |
158 | static int need_rekeying; /* Set to non-zero if rekeying is requested. */ | 158 | static int need_rekeying; /* Set to non-zero if rekeying is requested. */ |
159 | static int session_closed = 0; /* In SSH2: login session closed. */ | 159 | static int session_closed = 0; /* In SSH2: login session closed. */ |
160 | static int server_alive_timeouts = 0; | ||
161 | 160 | ||
162 | static void client_init_dispatch(void); | 161 | static void client_init_dispatch(void); |
163 | int session_ident = -1; | 162 | int session_ident = -1; |
@@ -467,14 +466,14 @@ client_check_window_change(void) | |||
467 | static void | 466 | static void |
468 | client_global_request_reply(int type, u_int32_t seq, void *ctxt) | 467 | client_global_request_reply(int type, u_int32_t seq, void *ctxt) |
469 | { | 468 | { |
470 | server_alive_timeouts = 0; | 469 | keep_alive_timeouts = 0; |
471 | client_global_request_reply_fwd(type, seq, ctxt); | 470 | client_global_request_reply_fwd(type, seq, ctxt); |
472 | } | 471 | } |
473 | 472 | ||
474 | static void | 473 | static void |
475 | server_alive_check(void) | 474 | server_alive_check(void) |
476 | { | 475 | { |
477 | if (++server_alive_timeouts > options.server_alive_count_max) { | 476 | if (++keep_alive_timeouts > options.server_alive_count_max) { |
478 | logit("Timeout, server not responding."); | 477 | logit("Timeout, server not responding."); |
479 | cleanup_exit(255); | 478 | cleanup_exit(255); |
480 | } | 479 | } |