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

Make libssh2_channel_receive_window_adjust() properly support non-blocking

Browse Source
This commit is contained in:
James Housley 2007-06-17 23:35:07 +00:00
parent 019cd1abc0
commit ba728148a9
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/channel.c
View File

@ -1090,12 +1090,12 @@ LIBSSH2_API int libssh2_channel_get_exit_status(LIBSSH2_CHANNEL* channel)
LIBSSH2_API unsigned long LIBSSH2_API unsigned long
libssh2_channel_receive_window_adjust(LIBSSH2_CHANNEL *channel, unsigned long adjustment, unsigned char force) libssh2_channel_receive_window_adjust(LIBSSH2_CHANNEL *channel, unsigned long adjustment, unsigned char force)
{ {
unsigned char adjust[9]; /* packet_type(1) + channel(4) + adjustment(4) */
int rc; int rc;
if (!force && if (channel->adjust_state == libssh2_NB_state_idle) {
(adjustment + channel->adjust_queue < LIBSSH2_CHANNEL_MINADJUST)) { if (!force && (adjustment + channel->adjust_queue < LIBSSH2_CHANNEL_MINADJUST)) {
_libssh2_debug(channel->session, LIBSSH2_DBG_CONN, "Queueing %lu bytes for receive window adjustment for channel %lu/%lu", _libssh2_debug(channel->session, LIBSSH2_DBG_CONN,
"Queueing %lu bytes for receive window adjustment for channel %lu/%lu",
adjustment, channel->local.id, channel->remote.id); adjustment, channel->local.id, channel->remote.id);
channel->adjust_queue += adjustment; channel->adjust_queue += adjustment;
return channel->remote.window_size; return channel->remote.window_size;
@ -1110,13 +1110,16 @@ libssh2_channel_receive_window_adjust(LIBSSH2_CHANNEL *channel, unsigned long ad
/* Adjust the window based on the block we just freed */ /* Adjust the window based on the block we just freed */
adjust[0] = SSH_MSG_CHANNEL_WINDOW_ADJUST; channel->adjust_adjust[0] = SSH_MSG_CHANNEL_WINDOW_ADJUST;
libssh2_htonu32(adjust + 1, channel->remote.id); libssh2_htonu32(channel->adjust_adjust + 1, channel->remote.id);
libssh2_htonu32(adjust + 5, adjustment); libssh2_htonu32(channel->adjust_adjust + 5, adjustment);
_libssh2_debug(channel->session, LIBSSH2_DBG_CONN, "Adjusting window %lu bytes for data flushed from channel %lu/%lu", _libssh2_debug(channel->session, LIBSSH2_DBG_CONN, "Adjusting window %lu bytes for data flushed from channel %lu/%lu",
adjustment, channel->local.id, channel->remote.id); adjustment, channel->local.id, channel->remote.id);
rc = libssh2_packet_write(channel->session, adjust, 9); channel->adjust_state = libssh2_NB_state_created;
}
rc = libssh2_packet_write(channel->session, channel->adjust_adjust, 9);
if (rc == PACKET_EAGAIN) { if (rc == PACKET_EAGAIN) {
return PACKET_EAGAIN; return PACKET_EAGAIN;
} }

4
src/libssh2_priv.h
View File

@ -316,6 +316,10 @@ struct _LIBSSH2_CHANNEL {
unsigned long flush_refund_bytes; unsigned long flush_refund_bytes;
unsigned long flush_flush_bytes; unsigned long flush_flush_bytes;
/* State variables used in libssh2_channel_receive_window_adjust() */
libssh2_nonblocking_states adjust_state;
unsigned char adjust_adjust[9]; /* packet_type(1) + channel(4) + adjustment(4) */
/* State variables used in libssh2_channel_read_ex() */ /* State variables used in libssh2_channel_read_ex() */
libssh2_nonblocking_states read_state; libssh2_nonblocking_states read_state;
LIBSSH2_PACKET *read_packet; LIBSSH2_PACKET *read_packet;