summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-21 13:23:52 +1100
committerDamien Miller <djm@mindrot.org>1999-11-21 13:23:52 +1100
commit6162d1215bbff30cf0c4c19368dc85ae570d44ca (patch)
treef82956b4429cad04a2296a1ede65e147bafb92f4 /channels.c
parentf58db38f8d396ee5ea42975d9409a644e01cede8 (diff)
- OpenBSD CVS Changes
- [channels.c] make this compile, bad markus - [log.c readconf.c servconf.c ssh.h] bugfix: loglevels are per host in clientconfig, factor out common log-level parsing code. - [servconf.c] remove unused index (-Wall) - [ssh-agent.c] only one 'extern char *__progname' - [sshd.8] document SIGHUP, -Q to synopsis - [sshconnect.c serverloop.c sshd.c packet.c packet.h] [channels.c clientloop.c] SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@ [hope this time my ISP stays alive during commit]
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/channels.c b/channels.c
index c5ec1fc8..3e3b5f36 100644
--- a/channels.c
+++ b/channels.c
@@ -16,7 +16,7 @@ arbitrary tcp/ip connections, and the authentication agent connection.
*/
#include "includes.h"
-RCSID("$Id: channels.c,v 1.5 1999/11/12 04:19:27 damien Exp $");
+RCSID("$Id: channels.c,v 1.6 1999/11/21 02:23:53 damien Exp $");
#include "ssh.h"
#include "packet.h"
@@ -208,7 +208,7 @@ void channel_prepare_select(fd_set *readset, fd_set *writeset)
case SSH_CHANNEL_OPEN:
if(compat13){
- if (buffer_len(&ch->input) < 32768)
+ if (buffer_len(&ch->input) < packet_get_maxsize())
FD_SET(ch->sock, readset);
if (buffer_len(&ch->output) > 0)
FD_SET(ch->sock, writeset);
@@ -216,7 +216,7 @@ void channel_prepare_select(fd_set *readset, fd_set *writeset)
}
/* test whether sockets are 'alive' for read/write */
if (ch->istate == CHAN_INPUT_OPEN)
- if (buffer_len(&ch->input) < 32768)
+ if (buffer_len(&ch->input) < packet_get_maxsize())
FD_SET(ch->sock, readset);
if (ch->ostate == CHAN_OUTPUT_OPEN || ch->ostate == CHAN_OUTPUT_WAIT_DRAIN){
if (buffer_len(&ch->output) > 0){
@@ -611,9 +611,9 @@ int channel_not_very_much_buffered_data()
case SSH_CHANNEL_AUTH_SOCKET:
continue;
case SSH_CHANNEL_OPEN:
- if (buffer_len(&ch->input) > 32768)
+ if (buffer_len(&ch->input) > packet_get_maxsize())
return 0;
- if (buffer_len(&ch->output) > 32768)
+ if (buffer_len(&ch->output) > packet_get_maxsize())
return 0;
continue;
case SSH_CHANNEL_INPUT_DRAINING: