diff options
| author | djm <djm> | 2006-10-23 17:02:41 +0000 |
|---|---|---|
| committer | djm <djm> | 2006-10-23 17:02:41 +0000 |
| commit | 517ec116bcb505b7bbb3aff268a83db93c5b1375 (patch) | |
| tree | 674902bd5658eddf6a1006c33575c59812b71ea8 /clientloop.c | |
| parent | 61e2f4099ec61df938b596f4798f29a889550642 (diff) | |
| download | openssh-517ec116bcb505b7bbb3aff268a83db93c5b1375.tar.gz | |
- 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 'clientloop.c')
| -rw-r--r-- | clientloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 */ |