summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/serverloop.c b/serverloop.c
index 124d86c6e..bf3f9c9f0 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.147 2008/01/23 01:56:54 dtucker Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.148 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
@@ -104,7 +104,6 @@ static int connection_in; /* Connection to client (input). */
104static int connection_out; /* Connection to client (output). */ 104static int connection_out; /* Connection to client (output). */
105static int connection_closed = 0; /* Connection to client closed. */ 105static int connection_closed = 0; /* Connection to client closed. */
106static u_int buffer_high; /* "Soft" max buffer size. */ 106static u_int buffer_high; /* "Soft" max buffer size. */
107static int client_alive_timeouts = 0;
108 107
109/* 108/*
110 * This SIGCHLD kludge is used to detect when the child exits. The server 109 * This SIGCHLD kludge is used to detect when the child exits. The server
@@ -248,7 +247,7 @@ client_alive_check(void)
248 int channel_id; 247 int channel_id;
249 248
250 /* timeout, check to see how many we have had */ 249 /* timeout, check to see how many we have had */
251 if (++client_alive_timeouts > options.client_alive_count_max) { 250 if (++keep_alive_timeouts > options.client_alive_count_max) {
252 logit("Timeout, client not responding."); 251 logit("Timeout, client not responding.");
253 cleanup_exit(255); 252 cleanup_exit(255);
254 } 253 }
@@ -887,7 +886,7 @@ server_input_keep_alive(int type, u_int32_t seq, void *ctxt)
887 * even if this was generated by something other than 886 * even if this was generated by something other than
888 * the bogus CHANNEL_REQUEST we send for keepalives. 887 * the bogus CHANNEL_REQUEST we send for keepalives.
889 */ 888 */
890 client_alive_timeouts = 0; 889 keep_alive_timeouts = 0;
891} 890}
892 891
893static void 892static void