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

Limit the size of packets in ssh_channel_write*

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-08-28 23:59:18 +02:00
parent c1efcd28f5
commit bf9a82ad9a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libssh/channels.c
View File

@@ -922,7 +922,10 @@ int channel_write_common(ssh_channel channel, const void *data,
uint32_t len, int is_stderr) { uint32_t len, int is_stderr) {
ssh_session session = channel->session; ssh_session session = channel->session;
int origlen = len; int origlen = len;
int effectivelen; size_t effectivelen;
/* handle the max packet len from remote side, be nice */
/* 10 bytes for the headers */
size_t maxpacketlen = channel->remote_maxpacket - 10;
enter_function(); enter_function();
@@ -969,7 +972,7 @@ int channel_write_common(ssh_channel channel, const void *data,
} else { } else {
effectivelen = len; effectivelen = len;
} }
effectivelen = effectivelen > maxpacketlen ? maxpacketlen : effectivelen;
if (buffer_add_u8(session->out_buffer, is_stderr ? if (buffer_add_u8(session->out_buffer, is_stderr ?
SSH2_MSG_CHANNEL_EXTENDED_DATA : SSH2_MSG_CHANNEL_DATA) < 0 || SSH2_MSG_CHANNEL_EXTENDED_DATA : SSH2_MSG_CHANNEL_DATA) < 0 ||
buffer_add_u32(session->out_buffer, buffer_add_u32(session->out_buffer,
@@ -985,7 +988,7 @@ int channel_write_common(ssh_channel channel, const void *data,
} }
ssh_log(session, SSH_LOG_RARE, ssh_log(session, SSH_LOG_RARE,
"channel_write wrote %d bytes", effectivelen); "channel_write wrote %ld bytes", effectivelen);
channel->remote_window -= effectivelen; channel->remote_window -= effectivelen;
len -= effectivelen; len -= effectivelen;