aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-12-20 16:52:15 +0100
committerSiri Hansen <[email protected]>2012-12-20 16:52:15 +0100
commit28512aab97941282d24100b23d48eccaa75d7ea1 (patch)
tree156fc7970cc56d40d3c85a87dc84dc6a46a85273
parentc4fe662ab43d82be5fd036cec752ee175f2252b1 (diff)
parent251298cb6a1eae8cc6e9fa71becdce2a4e934f94 (diff)
downloadotp-28512aab97941282d24100b23d48eccaa75d7ea1.tar.gz
otp-28512aab97941282d24100b23d48eccaa75d7ea1.tar.bz2
otp-28512aab97941282d24100b23d48eccaa75d7ea1.zip
Merge branch 'siri/common_test/ct_netconfc-adjust_window/OTP-10646'
* siri/common_test/ct_netconfc-adjust_window/OTP-10646: [common_test] Adjust window after netconf client receives data
-rw-r--r--lib/common_test/src/ct_netconfc.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 11c8235040..1ccbc86d8f 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1073,7 +1073,8 @@ handle_msg({get_event_streams=Op,Streams,Timeout}, From, State) ->
SimpleXml = encode_rpc_operation(get,[Filter]),
do_send_rpc(Op, SimpleXml, Timeout, From, State).
-handle_msg({ssh_cm, _CM, {data, _Ch, _Type, Data}}, State) ->
+handle_msg({ssh_cm, CM, {data, Ch, _Type, Data}}, State) ->
+ ssh_connection:adjust_window(CM,Ch,size(Data)),
handle_data(Data, State);
handle_msg({ssh_cm, _CM, _SshCloseMsg}, State) ->
%% _SshCloseMsg can probably be one of
@@ -1805,7 +1806,8 @@ get_tag([]) ->
%%% SSH stuff
ssh_receive_data() ->
receive
- {ssh_cm, _CM, {data, _Ch, _Type, Data}} ->
+ {ssh_cm, CM, {data, Ch, _Type, Data}} ->
+ ssh_connection:adjust_window(CM,Ch,size(Data)),
{ok, Data};
{ssh_cm, _CM, {Closed, _Ch}} = X when Closed == closed; Closed == eof ->
{error,X};