diff options
author | Damien Miller <djm@mindrot.org> | 2006-10-24 03:02:41 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-10-24 03:02:41 +1000 |
commit | 985a4485f57af55cd8f097ab437fdf87c365ea96 (patch) | |
tree | 4b92d3258e969d0742120e1315f5b18a028e25f8 /serverloop.c | |
parent | f4bcd10c4c9b53e7c0c2821825addaf3a13d7c1a (diff) |
- markus@cvs.openbsd.org 2006/10/11 12:38:03
[clientloop.c serverloop.c]
exit instead of doing a blocking tcp send if we detect a client/server
timeout, since the tcp sendqueue might be already full (of alive
requests); ok dtucker, report mpf
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index 6e5fdc2d8..69304b5fa 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: serverloop.c,v 1.144 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.145 2006/10/11 12:38:03 markus 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 |
@@ -248,8 +248,10 @@ client_alive_check(void) | |||
248 | int channel_id; | 248 | int channel_id; |
249 | 249 | ||
250 | /* timeout, check to see how many we have had */ | 250 | /* timeout, check to see how many we have had */ |
251 | if (++client_alive_timeouts > options.client_alive_count_max) | 251 | if (++client_alive_timeouts > options.client_alive_count_max) { |
252 | packet_disconnect("Timeout, your session not responding."); | 252 | logit("Timeout, client not responding."); |
253 | cleanup_exit(255); | ||
254 | } | ||
253 | 255 | ||
254 | /* | 256 | /* |
255 | * send a bogus global/channel request with "wantreply", | 257 | * send a bogus global/channel request with "wantreply", |