File 1144-Keep-error-reasons-for-some-common-distrib... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1144-Keep-error-reasons-for-some-common-distribution-erro.patch of Package erlang (Revision 142cba3d0e0962ac8996e69e9d0f9e63)

Currently displaying revision 142cba3d0e0962ac8996e69e9d0f9e63 , Show latest

From d6f07d89603bb19db38536239e1feec3dcdd4688 Mon Sep 17 00:00:00 2001
From: Diana Corbacho <diana.corbacho@erlang-solutions.com>
Date: Tue, 23 Feb 2016 14:46:48 +0000
Subject: [PATCH] Keep error reasons for some common distribution errors

These error reasons can be seen in the logs after calling net_kernel:verbose(1).
---
 lib/kernel/src/dist_util.erl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index c9fc26d..e3817fc 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -196,7 +196,7 @@ check_dflag_xnc(#hs_data{other_node = Node,
 	    error_msg("** ~w: Connection attempt ~s node ~w ~s "
 		      "since it cannot handle extended ~s. "
 		      "**~n", [node(), Dir, Node, How, What]),
-	    ?shutdown(Node)
+	    ?shutdown2(Node, {check_dflag_xnc_failed, What})
     end.
 
 
@@ -576,13 +576,13 @@ recv_challenge(#hs_data{socket=Socket,other_node=Node,
 			   [Node, Challenge,Version]),
 		    {Flags,Challenge};
 		_ ->
-		    ?shutdown(no_node)
+		    ?shutdown2(no_node, {recv_challenge_failed, no_node, Ns})
 	    catch
 		error:badarg ->
-		    ?shutdown(no_node)
+		    ?shutdown2(no_node, {recv_challenge_failed, no_node, Ns})
 	    end;
-	_ ->
-	    ?shutdown(no_node)	    
+	Other ->
+	    ?shutdown2(no_node, {recv_challenge_failed, Other})
     end.
 
 
@@ -626,10 +626,10 @@ recv_challenge_ack(#hs_data{socket = Socket, f_recv = FRecv,
 		_ ->
 		    error_msg("** Connection attempt to "
 			      "disallowed node ~w ** ~n", [NodeB]),
-		    ?shutdown(NodeB)
+		    ?shutdown2(NodeB, {recv_challenge_ack_failed, bad_cookie})
 	    end;
-	_ ->
-	    ?shutdown(NodeB)
+	Other ->
+	    ?shutdown2(NodeB, {recv_challenge_ack_failed, Other})
     end.
 
 recv_status(#hs_data{kernel_pid = Kernel, socket = Socket, 
@@ -639,7 +639,7 @@ recv_status(#hs_data{kernel_pid = Kernel, socket = Socket,
 	    Stat = list_to_atom(StrStat),
 	    ?debug({dist_util,self(),recv_status, Node, Stat}),
 	    case Stat of
-		not_allowed -> ?shutdown(Node);
+		not_allowed -> ?shutdown2(Node, {recv_status_failed, not_allowed});
 		nok  -> 
 		    %% wait to be killed by net_kernel
 		    receive
@@ -656,10 +656,10 @@ recv_status(#hs_data{kernel_pid = Kernel, socket = Socket,
 		    end;
 		_ -> Stat
 	    end;
-	_Error ->
+	Error ->
 	    ?debug({dist_util,self(),recv_status_error, 
-		Node, _Error}),
-	    ?shutdown(Node)
+		Node, Error}),
+	    ?shutdown2(Node, {recv_status_failed, Error})
     end.
 
 
@@ -758,7 +758,7 @@ setup_timer(Pid, Timeout) ->
 	    setup_timer(Pid, Timeout)
     after Timeout ->
 	    ?trace("Timer expires ~p, ~p~n",[Pid, Timeout]),
-	    ?shutdown(timer)
+	    ?shutdown2(timer, setup_timer_timeout)
     end.
 
 reset_timer(Timer) ->
-- 
2.1.4

Places

File 1144-Keep-error-reasons-for-some-common-distribution-erro.patch of Package erlang (Revision 142cba3d0e0962ac8996e69e9d0f9e63)

Places