aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-08-24 17:20:52 +0200
committerSiri Hansen <[email protected]>2012-08-24 17:20:52 +0200
commita03b01444641aedfe6f6730d38ff890e33d3a8ea (patch)
tree339e5cfd22a665079556c0344eecae6271a06d23 /lib
parent05e866fef530622a79f2e39b39b70d2d46c7c485 (diff)
parent9dfedc025906ad3f56ae130fec3e9de7ee380a1e (diff)
downloadotp-a03b01444641aedfe6f6730d38ff890e33d3a8ea.tar.gz
otp-a03b01444641aedfe6f6730d38ff890e33d3a8ea.tar.bz2
otp-a03b01444641aedfe6f6730d38ff890e33d3a8ea.zip
Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maint
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Handle all ssh_cm messages in ct_netconfc:handle_msg/2
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct_netconfc.erl14
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index d9c4a962dc..5f8bae89fa 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1074,12 +1074,18 @@ handle_msg({get_event_streams=Op,Streams,Timeout}, From, State) ->
handle_msg({ssh_cm, _CM, {data, _Ch, _Type, Data}}, State) ->
handle_data(Data, State);
-handle_msg({ssh_cm, _CM, {closed,_Ch}}, State) ->
- %% This will happen if the server terminates the connection, as in
- %% kill-session (or if ssh:close is called from somewhere
+handle_msg({ssh_cm, _CM, _SshCloseMsg}, State) ->
+ %% _SshCloseMsg can probably be one of
+ %% {eof,Ch}
+ %% {exit_status,Ch,Status}
+ %% {exit_signal,Ch,ExitSignal,ErrorMsg,LanguageString}
+ %% {signal,Ch,Signal}
+
+ %% This might e.g. happen if the server terminates the connection,
+ %% as in kill-session (or if ssh:close is called from somewhere
%% unexpected).
- %%! Log this?? - i.e. as server closing the connection
+ %%! Log this??
%%! Currently the log will say that the client closed the
%%! connection - due to terminate/2