diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-14 23:08:36 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-14 23:08:36 +0000 |
| commit | d334b2768b80640d3b9aa229332482ae572d08ad (patch) | |
| tree | 8395a8661e55575721b040bdf3b570fe398ffc1c | |
| parent | da5d9b12256275411e34824a880f8ff471acd0e2 (diff) | |
- markus@cvs.openbsd.org 2001/04/14 16:17:14
[channels.c]
remove some channels that are not appropriate for keepalive.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | channels.c | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -3,6 +3,9 @@ - deraadt@cvs.openbsd.org 2001/04/14 04:31:01 [ssh-add.c] do not double free + - markus@cvs.openbsd.org 2001/04/14 16:17:14 + [channels.c] + remove some channels that are not appropriate for keepalive. 20010414 - Sync with OpenBSD glob.c, strlcat.c and vis.c changes @@ -5069,4 +5072,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1111 2001/04/14 23:07:16 mouring Exp $ +$Id: ChangeLog,v 1.1112 2001/04/14 23:08:36 mouring Exp $ @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.107 2001/04/13 22:46:52 beck Exp $"); +RCSID("$OpenBSD: channels.c,v 1.108 2001/04/14 16:17:14 markus Exp $"); #include <openssl/rsa.h> #include <openssl/dsa.h> @@ -1852,16 +1852,16 @@ channel_find_open() for (i = 0; i < channels_alloc; i++) switch (channels[i].type) { case SSH_CHANNEL_CLOSED: - continue; - case SSH_CHANNEL_LARVAL: case SSH_CHANNEL_DYNAMIC: - case SSH_CHANNEL_AUTH_SOCKET: - case SSH_CHANNEL_CONNECTING: /* XXX ??? */ case SSH_CHANNEL_FREE: case SSH_CHANNEL_X11_LISTENER: case SSH_CHANNEL_PORT_LISTENER: case SSH_CHANNEL_RPORT_LISTENER: case SSH_CHANNEL_OPENING: + continue; + case SSH_CHANNEL_LARVAL: + case SSH_CHANNEL_AUTH_SOCKET: + case SSH_CHANNEL_CONNECTING: /* XXX ??? */ case SSH_CHANNEL_OPEN: case SSH_CHANNEL_X11_OPEN: return i; |