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

Update the window *after* effective read

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-10-01 18:56:57 +02:00
parent 5675fbe73e
commit 9f7e2c3252
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/channels.c
View File

@@ -2142,6 +2142,12 @@ int ssh_channel_read(ssh_channel channel, void *dest, uint32_t count, int is_std
ssh_handle_packets(session,-1); ssh_handle_packets(session,-1);
} }
len = buffer_get_rest_len(stdbuf);
/* Read count bytes if len is greater, everything otherwise */
len = (len > count ? count : len);
memcpy(dest, buffer_get_rest(stdbuf), len);
buffer_pass_bytes(stdbuf,len);
/* Authorize some buffering while userapp is busy */ /* Authorize some buffering while userapp is busy */
if (channel->local_window < WINDOWLIMIT) { if (channel->local_window < WINDOWLIMIT) {
if (grow_window(session, channel, 0) < 0) { if (grow_window(session, channel, 0) < 0) {
@@ -2150,12 +2156,6 @@ int ssh_channel_read(ssh_channel channel, void *dest, uint32_t count, int is_std
} }
} }
len = buffer_get_rest_len(stdbuf);
/* Read count bytes if len is greater, everything otherwise */
len = (len > count ? count : len);
memcpy(dest, buffer_get_rest(stdbuf), len);
buffer_pass_bytes(stdbuf,len);
leave_function(); leave_function();
return len; return len;
} }