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 | |
| 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | clientloop.c | 8 | ||||
| -rw-r--r-- | serverloop.c | 8 |
3 files changed, 16 insertions, 7 deletions
@@ -17,6 +17,11 @@ [sshconnect.c] sleep before retrying (not after) since sleep changes errno; fixes pr 5250; rad@twig.com; ok dtucker djm + - 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 20061018 - (dtucker) OpenBSD CVS Sync @@ -2558,4 +2563,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4576 2006/10/23 17:02:23 djm Exp $ +$Id: ChangeLog,v 1.4577 2006/10/23 17:02:41 djm Exp $ diff --git a/clientloop.c b/clientloop.c index 88dfb1f3..4c510819 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.175 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: clientloop.c,v 1.176 2006/10/11 12:38:03 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -464,8 +464,10 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt) static void server_alive_check(void) { - if (++server_alive_timeouts > options.server_alive_count_max) - packet_disconnect("Timeout, server not responding."); + if (++server_alive_timeouts > options.server_alive_count_max) { + logit("Timeout, server not responding."); + cleanup_exit(255); + } packet_start(SSH2_MSG_GLOBAL_REQUEST); packet_put_cstring("keepalive@openssh.com"); packet_put_char(1); /* boolean: want reply */ diff --git a/serverloop.c b/serverloop.c index 6e5fdc2d..69304b5f 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.144 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: serverloop.c,v 1.145 2006/10/11 12:38:03 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -248,8 +248,10 @@ client_alive_check(void) int channel_id; /* timeout, check to see how many we have had */ - if (++client_alive_timeouts > options.client_alive_count_max) - packet_disconnect("Timeout, your session not responding."); + if (++client_alive_timeouts > options.client_alive_count_max) { + logit("Timeout, client not responding."); + cleanup_exit(255); + } /* * send a bogus global/channel request with "wantreply", |