aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZandra <[email protected]>2016-05-04 09:58:24 +0200
committerZandra <[email protected]>2016-05-04 09:58:24 +0200
commitf9721867e680a82731e62cdd9fddaf21d58fa347 (patch)
treebe97bf180f6b62040044835179b681391a73077c /lib
parent5127e472cb142b2fb6ff2ffd8bec8257da3ace6a (diff)
parenta178332b6c0a17b94f2c348501da669bfc13feeb (diff)
downloadotp-f9721867e680a82731e62cdd9fddaf21d58fa347.tar.gz
otp-f9721867e680a82731e62cdd9fddaf21d58fa347.tar.bz2
otp-f9721867e680a82731e62cdd9fddaf21d58fa347.zip
Merge branch 'legoscia/dist-shutdown-reasons/PR-1028/OTP-13458'
* legoscia/dist-shutdown-reasons/PR-1028/OTP-13458: Error reasons for more distribution errors
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/src/dist_util.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index 580a896357..47d0c1b861 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -156,7 +156,7 @@ is_allowed(#hs_data{other_node = Node,
send_status(HSData, not_allowed),
error_msg("** Connection attempt from "
"disallowed node ~w ** ~n", [Node]),
- ?shutdown(Node);
+ ?shutdown2(Node, {is_allowed, not_allowed});
_ -> true
end.
@@ -607,10 +607,10 @@ recv_challenge_reply(#hs_data{socket = Socket,
_ ->
error_msg("** Connection attempt from "
"disallowed node ~w ** ~n", [NodeB]),
- ?shutdown(NodeB)
+ ?shutdown2(NodeB, {recv_challenge_reply_failed, bad_cookie})
end;
- _ ->
- ?shutdown(no_node)
+ Other ->
+ ?shutdown2(no_node, {recv_challenge_reply_failed, Other})
end.
recv_challenge_ack(#hs_data{socket = Socket, f_recv = FRecv,