- markus@cvs.openbsd.org 2001/10/04 15:05:40

     [channels.c serverloop.c]
     comment out bogus conditions for selecting on connection_in

diff --git a/ChangeLog b/ChangeLog
index 44fa7eb5a83b455905737c2c70b5b5e2db6c5ae3..a13ee8f1c1f5b03460c74cb348a5de72203c0d7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - markus@cvs.openbsd.org 2001/10/04 14:34:16
      [key.c]
      call OPENSSL_free() for memory allocated by openssl; from chombier@mac.com
+   - markus@cvs.openbsd.org 2001/10/04 15:05:40
+     [channels.c serverloop.c]
+     comment out bogus conditions for selecting on connection_in
 
 20011007
  - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys.

diff --git a/channels.c b/channels.c
index 12affdc341467b969084e8c0f8008166baa91abc..758ea506da0691b1bb706488c2e229be46683325 100644 (file)
--- a/channels.c
+++ b/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/serverloop.c b/serverloop.c
index d6089d82263ee690ad72e03a2b2d90bc777468f9..049ea4e463f6ba0be629f8ee34f69bde76a90d1b 100644 (file)
--- a/serverloop.c
+++ b/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