diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-02-13 15:06:17 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-02-15 11:35:17 +0100 |
| commit | c0891cdfe9aaae96f95cc45b9a07271ad9a5a07c (patch) | |
| tree | a551f20dd31ec30c8a309fac647474541783ea7c | |
| parent | 0cb74d672f5f1046460aef1ea662c7f539889594 (diff) | |
| download | otp-c0891cdfe9aaae96f95cc45b9a07271ad9a5a07c.tar.gz otp-c0891cdfe9aaae96f95cc45b9a07271ad9a5a07c.tar.bz2 otp-c0891cdfe9aaae96f95cc45b9a07271ad9a5a07c.zip | |
Added event/3 and clarified error message
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl index 45b95495f1..9536eb9dec 100644 --- a/lib/ssh/src/ssh_connection_manager.erl +++ b/lib/ssh/src/ssh_connection_manager.erl @@ -40,7 +40,7 @@ close/2, stop/1, send/5, send_eof/2]). --export([open_channel/6, reply_request/3, request/6, request/7, global_request/4, event/2,cast/2]). +-export([open_channel/6, reply_request/3, request/6, request/7, global_request/4, event/2, event/3, cast/2]). %% Internal application API and spawn -export([send_msg/1, ssh_channel_info_handler/3]). diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 0eb971a44c..a47a55b707 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -361,13 +361,7 @@ handle_kexdh_reply(#ssh_msg_kexdh_reply{public_host_key = HostKey, f = F, code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED, description = "Key exchange failed", language = "en"}, - ErrorMsg = case Error of - {_, What} -> - {What, []}; - Else -> - {Else, []} - end, - throw({ErrorMsg, Disconnect}) + throw({Error, Disconnect}) end. handle_kex_dh_gex_request(#ssh_msg_kex_dh_gex_request{min = _Min, |