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

fix transfer stall bug with non-blocking transfers, by Gavrie Philipson

Browse Source
This commit is contained in:
Daniel Stenberg 2007-11-08 13:46:54 +00:00
parent 2d773f9322
commit 371a795443
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/channel.c
View File

@ -1651,11 +1651,30 @@ libssh2_channel_write_ex(LIBSSH2_CHANNEL * channel, int stream_id,
0); 0);
} }
#if 0
/*
The following chunk of code is #ifdef'ed out, since I wanted it to
remain here with the given explanation why having the code in here
is not a good idea. The text is taken from the email Gavrie
Philipson wrote to libssh2-devel on Nov 8 2007.
The logic behind this is that in nonblocking mode, if the local
window size has shrunk to zero, there's no point in trying to send
anything more. However, exiting the function at that point does not
allow any adjusts from the remote side to be received, since
libssh2_packet_read (that is called further on in this function) is
never called in this case.
Removing this bit of code fixes the problem. This should not cause
busy waiting, since after the libssh2_packet_read, the function
correctly returns PACKET_EAGAIN if the window size was not adjusted.
*/
if (!channel->session->socket_block && if (!channel->session->socket_block &&
(channel->local.window_size <= 0)) { (channel->local.window_size <= 0)) {
/* Can't write anything */ /* Can't write anything */
return 0; return 0;
} }
#endif
/* [13] 9 = packet_type(1) + channelno(4) [ + streamid(4) ] + buflen(4) */ /* [13] 9 = packet_type(1) + channelno(4) [ + streamid(4) ] + buflen(4) */
channel->write_packet_len = buflen + (stream_id ? 13 : 9); channel->write_packet_len = buflen + (stream_id ? 13 : 9);