aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-06-01 10:49:06 +0200
committerHans Nilsson <[email protected]>2018-06-01 10:49:06 +0200
commit3aa6e3ab1d67ae7c409a179240e8456e63d44dec (patch)
tree3ae490b194e04d20a2ae5afb17872510bb302675
parent554b0b0bcb6c85fdc3b2435ec7115a540e3ffce5 (diff)
parentddc64c79318a8550c896e551385af039ae02d5e5 (diff)
downloadotp-3aa6e3ab1d67ae7c409a179240e8456e63d44dec.tar.gz
otp-3aa6e3ab1d67ae7c409a179240e8456e63d44dec.tar.bz2
otp-3aa6e3ab1d67ae7c409a179240e8456e63d44dec.zip
Merge branch 'hans/ssh/rm_depr'
* hans/ssh/rm_depr: ssh: Change get_stacktrace
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index f1ff3a70e2..3e224fe13f 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1345,11 +1345,11 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock,
{next_event, internal, Msg}
]}
catch
- C:E ->
+ C:E:ST ->
{Shutdown, D} =
?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
io_lib:format("Bad packet: Decrypted, but can't decode~n~p:~p~n~p",
- [C,E,erlang:get_stacktrace()]),
+ [C,E,ST]),
StateName, D1),
{stop, Shutdown, D}
end;
@@ -1378,10 +1378,10 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock,
StateName, D0),
{stop, Shutdown, D}
catch
- C:E ->
+ C:E:ST ->
{Shutdown, D} =
?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
- io_lib:format("Bad packet: Couldn't decrypt~n~p:~p~n~p",[C,E,erlang:get_stacktrace()]),
+ io_lib:format("Bad packet: Couldn't decrypt~n~p:~p~n~p",[C,E,ST]),
StateName, D0),
{stop, Shutdown, D}
end;