diff options
| author |   markus <markus@openbsd.org> | 2006-10-11 12:38:03 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2006-10-11 12:38:03 +0000 |
| commit | 06fed5d93b2dc6e4ab327f9f97feaeef0cc91d90 (patch) | |
| tree | 3b51486f1124352f60dafc4eff153505aa59d502 /usr.bin/ssh/serverloop.c | |
| parent | SIGCONT may be sent to any process with the same session ID as the caller, (diff) | |
| download | wireguard-openbsd-06fed5d93b2dc6e4ab327f9f97feaeef0cc91d90.tar.xz wireguard-openbsd-06fed5d93b2dc6e4ab327f9f97feaeef0cc91d90.zip | |
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 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 125a279250f..94a5fde7db0 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/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 @@ -242,8 +242,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", |