generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed an issue with a patch that I submitted where the channel_read_ex()

Browse Source 
could get stuck in a busy read loop.
This commit is contained in:
Paul Thomas 2008-11-01 17:28:30 +00:00
parent c3447ea29f
commit 85b953d0dd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/channel.c
View File

@ -1518,9 +1518,12 @@ libssh2_channel_read_ex(LIBSSH2_CHANNEL * channel, int stream_id, char *buf,
} }
/* We didn't read any data from the socket and /* We didn't read any data from the socket and
* no packets are waiting to be read */ * no packets are waiting to be read
if ((rc < 0) && (! channel->read_packet)) { * -or-
if (rc != PACKET_EAGAIN) { * We have read our fill of data */
if ((rc < 0 && ! channel->read_packet) ||
channel->read_bytes_read >= (int) buflen) {
if (rc != PACKET_EAGAIN) {
channel->read_state = libssh2_NB_state_idle; channel->read_state = libssh2_NB_state_idle;
} }
/* no packets available */ /* no packets available */