summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c7
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). */
157static int connection_out; /* Connection to server (output). */ 157static int connection_out; /* Connection to server (output). */
158static int need_rekeying; /* Set to non-zero if rekeying is requested. */ 158static int need_rekeying; /* Set to non-zero if rekeying is requested. */
159static int session_closed = 0; /* In SSH2: login session closed. */ 159static int session_closed = 0; /* In SSH2: login session closed. */
160static int server_alive_timeouts = 0;
161 160
162static void client_init_dispatch(void); 161static void client_init_dispatch(void);
163int session_ident = -1; 162int session_ident = -1;
@@ -467,14 +466,14 @@ client_check_window_change(void)
467static void 466static void
468client_global_request_reply(int type, u_int32_t seq, void *ctxt) 467client_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
474static void 473static void
475server_alive_check(void) 474server_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 }