shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-07 18:50:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

[channels] Added ssh_channel_window_size() and avoided reentrancy in channel_write_common()

Browse Source 
(cherry picked from commit 27313334578f4acb7ccf0687bba7f76b2febd569)
This commit is contained in:
milo
2011-04-20 02:06:43 +02:00
parent 3ae01ff9f5
commit 7ba0938846
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/channels.c
View File

@@ -1173,15 +1173,12 @@ int channel_write_common(ssh_channel channel, const void *data,
"Remote window is %d bytes. going to write %d bytes",
channel->remote_window,
len);
ssh_log(session, SSH_LOG_PROTOCOL,
"Waiting for a growing window message...");
/* What happens when the channel window is zero? */
while(channel->remote_window == 0) {
/* parse every incoming packet */
if (ssh_handle_packets(session,-1) == SSH_ERROR) {
leave_function();
return SSH_ERROR;
}
if(channel->remote_window == 0) {
/* nothing can be written */
ssh_log(session, SSH_LOG_PROTOCOL,
"Wait for a growing window message...");
return 0;
}
effectivelen = len > channel->remote_window ? channel->remote_window : len;
} else {
@@ -1230,6 +1227,10 @@ error:
return SSH_ERROR;
}
uint32_t ssh_channel_window_size(ssh_channel channel) {
return channel->remote_window;
}
/**
* @brief Blocking write on a channel.
*