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

EEK revert the part of the previous commit that was just my non-functional

Browse Source 
attempts to make things work with blocking sockets.
This commit is contained in:
Daniel Stenberg 2009-03-23 12:51:53 +00:00
parent 1936d167d1
commit d187a0fdb6
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/channel.c
View File

@ -1511,24 +1511,18 @@ libssh2_channel_read_ex(LIBSSH2_CHANNEL * channel, int stream_id, char *buf,
rc = 1; /* set to >0 to let the while loop start */ rc = 1; /* set to >0 to let the while loop start */
/* process all pending incoming packets */ /* process all pending incoming packets */
while (rc > 0) { while (rc > 0)
rc = _libssh2_packet_read(session); rc = _libssh2_packet_read(session);
if(channel->session->socket_block)
/* we can't loop in blocking mode as then we might get stuck
in recv() */
break;
}
if ((rc < 0) && (rc != PACKET_EAGAIN)) if ((rc < 0) && (rc != PACKET_EAGAIN))
return -1; return -1;
channel->read_state = libssh2_NB_state_created; channel->read_state = libssh2_NB_state_created;
} }
else if(!channel->session->socket_block) { else
/* We're not in the idle state, but in order to "even out" the network /* We're not in the idle state, but in order to "even out" the network
readings we do a single shot read here as well. Tests prove that readings we do a single shot read here as well. Tests prove that
this way produces faster transfers. But in blocking mode we can't this way produces faster transfers. */
do it. */
rc = _libssh2_packet_read(session); rc = _libssh2_packet_read(session);
/* ignore PACKET_EAGAIN but return failure for the rest */ /* ignore PACKET_EAGAIN but return failure for the rest */
@ -1664,15 +1658,9 @@ libssh2_channel_read_ex(LIBSSH2_CHANNEL * channel, int stream_id, char *buf,
_libssh2_debug(session, LIBSSH2_DBG_CONN, _libssh2_debug(session, LIBSSH2_DBG_CONN,
"channel_read() filled %d adjusted %d", "channel_read() filled %d adjusted %d",
bytes_read, buflen); bytes_read, buflen);
if(!channel->session->socket_block) /* continue in 'created' state to drain the already read packages
/* while not blocking, we can continue in 'created' state to drain first before starting to empty the socket further */
the already read packages first before starting to empty the
socket further */
channel->read_state = libssh2_NB_state_created; channel->read_state = libssh2_NB_state_created;
else
/* in blocking mode we don't know if there's more to read so we need
to make it more careful and go back to idle */
channel->read_state = libssh2_NB_state_idle;
} }
return bytes_read; return bytes_read;