diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/channels.c | 12 | ||||
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 6a8cec5fef1..8c089bc8595 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.135 2001/10/01 21:38:53 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.136 2001/10/04 15:05:40 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -429,14 +429,18 @@ channel_not_very_much_buffered_data() for (i = 0; i < channels_alloc; i++) { c = channels[i]; if (c != NULL && c->type == SSH_CHANNEL_OPEN) { - if (!compat20 && buffer_len(&c->input) > packet_get_maxsize()) { +#if 0 + if (!compat20 && + buffer_len(&c->input) > packet_get_maxsize()) { debug("channel %d: big input buffer %d", c->self, buffer_len(&c->input)); return 0; } +#endif if (buffer_len(&c->output) > packet_get_maxsize()) { - debug("channel %d: big output buffer %d", - c->self, buffer_len(&c->output)); + debug("channel %d: big output buffer %d > %d", + c->self, buffer_len(&c->output), + packet_get_maxsize()); return 0; } } diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index dbe5d21664a..3be1a4fdc05 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.77 2001/09/17 21:04:02 markus Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.78 2001/10/04 15:05:40 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -196,9 +196,11 @@ retry_select: channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, 0); if (compat20) { +#if 0 /* wrong: bad condition XXX */ if (channel_not_very_much_buffered_data()) - FD_SET(connection_in, *readsetp); +#endif + FD_SET(connection_in, *readsetp); } else { /* * Read packets from the client unless we have too much |