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

Fixes a problem that the last code change apparently didn't fix. Verified

Browse Source 
that this works correctly with another user.
This commit is contained in:
Paul Thomas 2008-11-09 17:54:23 +00:00
parent 85b953d0dd
commit 95b73812e7
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/channel.c
View File

@ -1492,10 +1492,8 @@ libssh2_channel_read_ex(LIBSSH2_CHANNEL * channel, int stream_id, char *buf,
return rc;
}
channel->read_bytes_read = 0;
channel->read_block = 0;
channel->read_packet = session->packets.head;
channel->read_state = libssh2_NB_state_created;
}
@ -1509,25 +1507,33 @@ libssh2_channel_read_ex(LIBSSH2_CHANNEL * channel, int stream_id, char *buf,
}
rc = 0;
channel->read_block = 0;
do {
if (channel->read_block) {
/* in the second lap and onwards, do this */
rc = libssh2_packet_read(session);
channel->read_packet = session->packets.head;
}
/* We didn't read any data from the socket and
* no packets are waiting to be read
* -or-
* 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;
/* in the second lap and onwards, do this...
* If we haven't yet filled our buffer, try to read more
* data. */
if ( channel->read_bytes_read < (int) buflen) {
rc = libssh2_packet_read(session);
/* If we didn't find any more data to read */
if (rc < 0) {
if ( channel->read_bytes_read > 0){
break; /* finish processing and return */
}
/* no packets available, no data read. */
channel->read_state = libssh2_NB_state_idle;
return rc;
}
/* We read more data, restart our processing at
* the beginning of our packet list. */
channel->read_packet = session->packets.head;
}
else { /* The read buffer is full, finish processing and return */
break;
}
/* no packets available */
return rc;
}
while (channel->read_packet