tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/01/10 11:13:29 

[serverloop.c]
     skip client_alive_check until there are channels; ok beck@
This commit is contained in:
Damien Miller 2002-01-22 23:21:39 +11:00
parent 76765c0b1a
commit 056cf73d35
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -110,6 +110,9 @@
[channels.c nchan.c] [channels.c nchan.c]
replace buffer_consume(b, buffer_len(b)) with buffer_clear(b); replace buffer_consume(b, buffer_len(b)) with buffer_clear(b);
ok provos@ ok provos@
- markus@cvs.openbsd.org 2002/01/10 11:13:29
[serverloop.c]
skip client_alive_check until there are channels; ok beck@
20020121 20020121
@ -7258,4 +7261,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1754 2002/01/22 12:21:15 djm Exp $ $Id: ChangeLog,v 1.1755 2002/01/22 12:21:39 djm Exp $

14
serverloop.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: serverloop.c,v 1.93 2001/12/28 15:06:00 markus Exp $"); RCSID("$OpenBSD: serverloop.c,v 1.94 2002/01/10 11:13:29 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
@ -209,15 +209,21 @@ make_packets_from_stdout_data(void)
static void static void
client_alive_check(void) client_alive_check(void)
{ {
static int had_channel = 0;
int id; int id;
id = channel_find_open();
if (id == -1) {
if (!had_channel)
return;
packet_disconnect("No open channels after timeout!");
}
had_channel = 1;
/* timeout, check to see how many we have had */ /* timeout, check to see how many we have had */
if (++client_alive_timeouts > options.client_alive_count_max) if (++client_alive_timeouts > options.client_alive_count_max)
packet_disconnect("Timeout, your session not responding."); packet_disconnect("Timeout, your session not responding.");
id = channel_find_open();
if (id == -1)
packet_disconnect("No open channels after timeout!");
/* /*
* send a bogus channel request with "wantreply", * send a bogus channel request with "wantreply",
* we should get back a failure * we should get back a failure