diff options
Diffstat (limited to '0008-_libssh2_channel_read-fix-data-drop-when-out-of-wind.patch')
| -rw-r--r-- | 0008-_libssh2_channel_read-fix-data-drop-when-out-of-wind.patch | 140 |
1 files changed, 0 insertions, 140 deletions
diff --git a/0008-_libssh2_channel_read-fix-data-drop-when-out-of-wind.patch b/0008-_libssh2_channel_read-fix-data-drop-when-out-of-wind.patch deleted file mode 100644 index f06b7ad..0000000 --- a/0008-_libssh2_channel_read-fix-data-drop-when-out-of-wind.patch +++ /dev/null @@ -1,140 +0,0 @@ -From cae2385ba898f71038ed4dd00ddae02f85e588e7 Mon Sep 17 00:00:00 2001 -From: Salvador <sfandino@yahoo.com> -Date: Tue, 15 Oct 2013 11:45:10 +0200 -Subject: [PATCH 08/11] _libssh2_channel_read: fix data drop when out of window - -After filling the read buffer with data from the read queue, when the -window size was too small, "libssh2_channel_receive_window_adjust" was -called to increase it. In non-blocking mode that function could return -EAGAIN and, in that case, the EAGAIN was propagated upwards and the data -already read on the buffer lost. - -The function was also moving between the two read states -"libssh2_NB_state_idle" and "libssh2_NB_state_created" both of which -behave in the same way (excepting a debug statment). - -This commit modifies "_libssh2_channel_read" so that the -"libssh2_channel_receive_window_adjust" call is performed first (when -required) and if everything goes well, then it reads the data from the -queued packets into the read buffer. - -It also removes the useless "libssh2_NB_state_created" read state. - -Some rotted comments have also been updated. - -Signed-off-by: Salvador <sfandino@yahoo.com> - -[upstream commit 27f9ac2549b7721cf9d857022c0e7a311830b367] -Signed-off-by: Kamil Dudka <kdudka@redhat.com> ---- - src/channel.c | 75 +++++++++++++++++++-------------------------------------- - 1 files changed, 25 insertions(+), 50 deletions(-) - -diff --git a/src/channel.c b/src/channel.c -index 499d815..82f6980 100644 ---- a/src/channel.c -+++ b/src/channel.c -@@ -1751,31 +1751,33 @@ ssize_t _libssh2_channel_read(LIBSSH2_CHANNEL *channel, int stream_id, - LIBSSH2_PACKET *read_packet; - LIBSSH2_PACKET *read_next; - -- if (channel->read_state == libssh2_NB_state_idle) { -- _libssh2_debug(session, LIBSSH2_TRACE_CONN, -- "channel_read() wants %d bytes from channel %lu/%lu " -- "stream #%d", -- (int) buflen, channel->local.id, channel->remote.id, -- stream_id); -- channel->read_state = libssh2_NB_state_created; -- } -+ _libssh2_debug(session, LIBSSH2_TRACE_CONN, -+ "channel_read() wants %d bytes from channel %lu/%lu " -+ "stream #%d", -+ (int) buflen, channel->local.id, channel->remote.id, -+ stream_id); - -- /* -- * =============================== NOTE =============================== -- * I know this is very ugly and not a really good use of "goto", but -- * this case statement would be even uglier to do it any other way -- */ -- if (channel->read_state == libssh2_NB_state_jump1) { -- goto channel_read_window_adjust; -- } -+ /* expand the receiving window first if it has become too narrow */ -+ if((channel->read_state == libssh2_NB_state_jump1) || -+ (channel->remote.window_size < (LIBSSH2_CHANNEL_WINDOW_DEFAULT*30))) { -+ -+ /* the actual window adjusting may not finish so we need to deal with -+ this special state here */ -+ channel->read_state = libssh2_NB_state_jump1; -+ rc = _libssh2_channel_receive_window_adjust(channel, -+ (LIBSSH2_CHANNEL_WINDOW_DEFAULT*60), -+ 0, NULL); -+ if (rc) -+ return rc; - -- rc = 1; /* set to >0 to let the while loop start */ -+ channel->read_state = libssh2_NB_state_idle; -+ } - -- /* Process all pending incoming packets in all states in order to "even -- out" the network readings. Tests prove that this way produces faster -- transfers. */ -- while (rc > 0) -+ /* Process all pending incoming packets. Tests prove that this way -+ produces faster transfers. */ -+ do { - rc = _libssh2_transport_read(session); -+ } while (rc > 0); - - if ((rc < 0) && (rc != LIBSSH2_ERROR_EAGAIN)) - return _libssh2_error(session, rc, "transport read"); -@@ -1857,8 +1859,6 @@ ssize_t _libssh2_channel_read(LIBSSH2_CHANNEL *channel, int stream_id, - } - - if (!bytes_read) { -- channel->read_state = libssh2_NB_state_idle; -- - /* If the channel is already at EOF or even closed, we need to signal - that back. We may have gotten that info while draining the incoming - transport layer until EAGAIN so we must not be fooled by that -@@ -1871,34 +1871,9 @@ ssize_t _libssh2_channel_read(LIBSSH2_CHANNEL *channel, int stream_id, - /* if the transport layer said EAGAIN then we say so as well */ - return _libssh2_error(session, rc, "would block"); - } -- else { -- channel->read_avail -= bytes_read; -- channel->remote.window_size -= bytes_read; -- /* make sure we remain in the created state to focus on emptying the -- data we already have in the packet brigade before we try to read -- more off the network again */ -- channel->read_state = libssh2_NB_state_created; -- } -- -- if(channel->remote.window_size < (LIBSSH2_CHANNEL_WINDOW_DEFAULT*30)) { -- /* the window is getting too narrow, expand it! */ -- -- channel_read_window_adjust: -- channel->read_state = libssh2_NB_state_jump1; -- /* the actual window adjusting may not finish so we need to deal with -- this special state here */ -- rc = _libssh2_channel_receive_window_adjust(channel, -- (LIBSSH2_CHANNEL_WINDOW_DEFAULT*60), 0, NULL); -- if (rc) -- return rc; - -- _libssh2_debug(session, LIBSSH2_TRACE_CONN, -- "channel_read() filled %d adjusted %d", -- bytes_read, buflen); -- /* continue in 'created' state to drain the already read packages -- first before starting to empty the socket further */ -- channel->read_state = libssh2_NB_state_created; -- } -+ channel->read_avail -= bytes_read; -+ channel->remote.window_size -= bytes_read; - - return bytes_read; - } --- -1.7.1 - |