diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-05-11 10:13:23 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-05-11 10:13:23 +0200 |
| commit | 241eab82ad76d68dbef3efdb4066d14b82fd0234 (patch) | |
| tree | e3c7a8f2a6fbbf4fe8bcc3cb9c57fade2ff22f83 /lib/ssh/src/ssh_connection_manager.erl | |
| parent | 6653b819f8bad11e06b52c1c371264e3389737bf (diff) | |
| parent | 02fa402909ede20b75f1aa6e4c133d866ddc506b (diff) | |
| download | otp-241eab82ad76d68dbef3efdb4066d14b82fd0234.tar.gz otp-241eab82ad76d68dbef3efdb4066d14b82fd0234.tar.bz2 otp-241eab82ad76d68dbef3efdb4066d14b82fd0234.zip | |
Merge branch 'ia/ssh/remote-connetion-id/OTP-10062' into maint
* ia/ssh/remote-connetion-id/OTP-10062:
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.erl | 4 |
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, |