octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-15 17:57:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

SSH2: Keep track of client -> server window size

Browse Source
This commit is contained in:
terrafrost 2013-07-07 15:57:15 -05:00
parent 23d48c4fc5
commit 327a3b8bc8
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpseclib/Net/SSH2.php
View File

@ -542,7 +542,7 @@ class Net_SSH2 {
var $window_size = 0x7FFFFFFF; var $window_size = 0x7FFFFFFF;
/** /**
* Window size * Window size, server to client
* *
* Window size indexed by channel * Window size indexed by channel
* *
@ -552,6 +552,17 @@ class Net_SSH2 {
*/ */
var $window_size_server_to_client = array(); var $window_size_server_to_client = array();
/**
* Window size, client to server
*
* Window size indexed by channel
*
* @see Net_SSH2::_get_channel_packet()
* @var Array
* @access private
*/
var $window_size_client_to_server = array();
/** /**
* Server signature * Server signature
* *
@ -2536,6 +2547,11 @@ class Net_SSH2 {
$payload = $this->_get_binary_packet(); $payload = $this->_get_binary_packet();
break; break;
case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST: case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
$this->_string_shift($payload, 1);
extract(unpack('Nchannel', $this->_string_shift($payload, 4)));
extract(unpack('Nwindow_size', $this->_string_shift($payload, 4)));
$this->window_size_client_to_server[$channel] = $window_size;
$payload = $this->_get_binary_packet(); $payload = $this->_get_binary_packet();
} }
} }
@ -2651,7 +2667,8 @@ class Net_SSH2 {
case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION: case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
extract(unpack('Nserver_channel', $this->_string_shift($response, 4))); extract(unpack('Nserver_channel', $this->_string_shift($response, 4)));
$this->server_channels[$channel] = $server_channel; $this->server_channels[$channel] = $server_channel;
$this->_string_shift($response, 4); // skip over (server) window size extract(unpack('Nwindow_size', $this->_string_shift($response, 4)));
$this->window_size_client_to_server[$channel] = $window_size;
$temp = unpack('Npacket_size_client_to_server', $this->_string_shift($response, 4)); $temp = unpack('Npacket_size_client_to_server', $this->_string_shift($response, 4));
$this->packet_size_client_to_server[$channel] = $temp['packet_size_client_to_server']; $this->packet_size_client_to_server[$channel] = $temp['packet_size_client_to_server'];
return $client_channel == $channel ? true : $this->_get_channel_packet($client_channel, $skip_extended); return $client_channel == $channel ? true : $this->_get_channel_packet($client_channel, $skip_extended);
@ -2924,6 +2941,8 @@ class Net_SSH2 {
} }
} }
$this->window_size_client_to_server[$client_channel]-= strlen($data);
return $this->_send_binary_packet(pack('CN2a*', return $this->_send_binary_packet(pack('CN2a*',
NET_SSH2_MSG_CHANNEL_DATA, NET_SSH2_MSG_CHANNEL_DATA,
$this->server_channels[$client_channel], $this->server_channels[$client_channel],