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 | |
| 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
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 13 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 46f0c7e688..c46f799b6d 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -720,12 +720,17 @@ handle_msg(#ssh_msg_channel_request{request_type = "env"}, handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId, request_type = _Other, - want_reply = WantReply}, Connection, + want_reply = WantReply}, #connection{channel_cache = Cache} = Connection, ConnectionPid, _) -> if WantReply == true -> - FailMsg = channel_failure_msg(ChannelId), - {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, - Connection}; + case ssh_channel:cache_lookup(Cache, ChannelId) of + #channel{remote_id = RemoteId} -> + FailMsg = channel_failure_msg(RemoteId), + {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, + Connection}; + undefined -> %% Chanel has been closed + {noreply, Connection} + end; true -> {noreply, Connection} end; 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, |