Mercurial > dropbear
diff common-channel.c @ 1074:10f198d4a308
Make main socket nonblocking. Limit writequeue size.
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 20 Mar 2015 23:36:42 +0800 |
parents | 686cd3e8e13e |
children | cc6116cc0b5c |
line wrap: on
line diff
--- a/common-channel.c Fri Mar 20 23:33:45 2015 +0800 +++ b/common-channel.c Fri Mar 20 23:36:42 2015 +0800 @@ -531,7 +531,7 @@ /* Set the file descriptors for the main select in session.c * This avoid channels which don't have any window available, are closed, etc*/ -void setchannelfds(fd_set *readfds, fd_set *writefds) { +void setchannelfds(fd_set *readfds, fd_set *writefds, int allow_reads) { unsigned int i; struct Channel * channel; @@ -549,7 +549,7 @@ FD if there's the possibility of "~."" to kill an interactive session (the read_mangler) */ if (channel->transwindow > 0 - && (ses.dataallowed || channel->read_mangler)) { + && ((ses.dataallowed && allow_reads) || channel->read_mangler)) { if (channel->readfd >= 0) { FD_SET(channel->readfd, readfds);