aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_connection_manager.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-04-25 14:09:40 +0200
committerIngela Anderton Andin <[email protected]>2012-05-04 11:25:02 +0200
commit02fa402909ede20b75f1aa6e4c133d866ddc506b (patch)
treeb4ac39e49075f8564897e08c9756f31bef78ab71 /lib/ssh/src/ssh_connection_manager.erl
parentc5d6ce6a07478c5ac19fdf2df244c4b837888d08 (diff)
downloadotp-02fa402909ede20b75f1aa6e4c133d866ddc506b.tar.gz
otp-02fa402909ede20b75f1aa6e4c133d866ddc506b.tar.bz2
otp-02fa402909ede20b75f1aa6e4c133d866ddc506b.zip
The channel id in a channel failure message, sent to the peer, is now in all cases the remote channel id
Diffstat (limited to 'lib/ssh/src/ssh_connection_manager.erl')
-rw-r--r--lib/ssh/src/ssh_connection_manager.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 8c1f88e572..a0ea04a2c2 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -267,7 +267,7 @@ handle_call({ssh_msg, Pid, Msg}, From,
disconnect_fun(Reason, SSHOpts),
{stop, {shutdown, normal}, State#state{connection_state = Connection}}
catch
- _:Reason ->
+ _:Error ->
{disconnect, Reason, {{replies, Replies}, Connection}} =
ssh_connection:handle_msg(
#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
@@ -277,7 +277,7 @@ handle_call({ssh_msg, Pid, Msg}, From,
lists:foreach(fun send_msg/1, Replies),
SSHOpts = proplists:get_value(ssh_opts, Opts),
disconnect_fun(Reason, SSHOpts),
- {stop, {shutdown, Reason}, State#state{connection_state = Connection}}
+ {stop, {shutdown, Error}, State#state{connection_state = Connection}}
end;
handle_call({global_request, Pid, _, _, _} = Request, From,