Merge branch 'sverker/revert-big-creation'

* sverker/revert-big-creation:
  Revert "erts: Make DFLAG_BIG_CREATION mandatory"
  Revert "erts: Remove old encoding of pids, ports and refs"
  Revert "erl_interface: Remove old encoding of pid,port,refs"
  Revert "epmd: Support 32-bit creation values in local node"
  Revert "jinterface: Remove old encoding of pid,port,refs"
  Revert "erl_interface: Support 32-bit creation local cnode"
  Revert "erts: Document new EPMD response ALIVE2_X_RESP"

2 files changed, 24 insertions, 45 deletions

diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index f31a1722ce..7a14e2635c 100644
--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
@@ -33,10 +33,10 @@
 -define(erlang_daemon_port, 4369).
 -endif.
 -ifndef(epmd_dist_high).
--define(epmd_dist_high, 6).
+-define(epmd_dist_high, 4370).
 -endif.
 -ifndef(epmd_dist_low).
--define(epmd_dist_low, 5).
+-define(epmd_dist_low, 4370).
 -endif.
 
 %% External exports
@@ -342,13 +342,6 @@ wait_for_reg_reply(Socket, SoFar) ->
     receive
 	{tcp, Socket, Data0} ->
 	    case SoFar ++ Data0 of
-		[$v, Result, A, B, C, D] ->
-		    case Result of
-			0 ->
-			    {alive, Socket, ?u32(A, B, C, D)};
-			_ ->
-			    {error, duplicate_name}
-		    end;
 		[$y, Result, A, B] ->
 		    case Result of
 			0 ->
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index f3db6705a2..8256444bdc 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -47,9 +47,6 @@
 	        R
         end).
 
--define(EPMD_DIST_HIGH, 6).
--define(EPMD_DIST_LOW, 5).
-
 -define(DFLAG_PUBLISHED,1).
 -define(DFLAG_ATOM_CACHE,2).
 -define(DFLAG_EXTENDED_REFERENCES,4).
@@ -60,18 +57,15 @@
 -define(DFLAG_NEW_FUN_TAGS,16#80).
 -define(DFLAG_EXTENDED_PIDS_PORTS,16#100).
 -define(DFLAG_UTF8_ATOMS, 16#10000).
--define(DFLAG_BIG_CREATION, 16#40000).
 
 %% From R9 and forward extended references is compulsory
 %% From R10 and forward extended pids and ports are compulsory
 %% From R20 and forward UTF8 atoms are compulsory
 %% From R21 and forward NEW_FUN_TAGS is compulsory (no more tuple fallback {fun, ...})
-%% From R22 and forward BIG_CREATION is compulsory
 -define(COMPULSORY_DFLAGS, (?DFLAG_EXTENDED_REFERENCES bor
                             ?DFLAG_EXTENDED_PIDS_PORTS bor
                             ?DFLAG_UTF8_ATOMS bor
-                            ?DFLAG_NEW_FUN_TAGS bor
-                            ?DFLAG_BIG_CREATION)).
+                            ?DFLAG_NEW_FUN_TAGS)).
 
 -define(PASS_THROUGH, $p).
 
@@ -214,9 +208,9 @@ pending_up_md5(Node,OurName,Cookie) ->
     {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
 				    [{active,false},
 				     {packet,2}]),
-    send_name(SocketA,OurName, ?EPMD_DIST_HIGH),
+    send_name(SocketA,OurName,5),
     ok = recv_status(SocketA),
-    {hidden,Node,?EPMD_DIST_HIGH,HisChallengeA} = recv_challenge(SocketA), % See 1)
+    {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
     OurChallengeA = gen_challenge(),
     OurDigestA = gen_digest(HisChallengeA, Cookie),
     send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
@@ -230,11 +224,11 @@ pending_up_md5(Node,OurName,Cookie) ->
     {ok, SocketB} = gen_tcp:connect(atom_to_list(NB),PortNo,
 				    [{active,false},
 				     {packet,2}]),
-    send_name(SocketB,OurName, ?EPMD_DIST_HIGH),
+    send_name(SocketB,OurName,5),
     alive = recv_status(SocketB),
     send_status(SocketB, true),
     gen_tcp:close(SocketA),
-    {hidden,Node,?EPMD_DIST_HIGH,HisChallengeB} = recv_challenge(SocketB), % See 1)
+    {hidden,Node,5,HisChallengeB} = recv_challenge(SocketB), % See 1)
     OurChallengeB = gen_challenge(),
     OurDigestB = gen_digest(HisChallengeB, Cookie),
     send_challenge_reply(SocketB, OurChallengeB, OurDigestB),
@@ -260,7 +254,7 @@ simultaneous_md5(Node, OurName, Cookie) when OurName < Node ->
 		  Else ->
 		      exit(Else)
 	      end,
-    EpmdSocket = register_node(OurName, LSocket, ?EPMD_DIST_LOW, ?EPMD_DIST_HIGH),
+    EpmdSocket = register(OurName, LSocket, 1, 5),
     {NA, NB} = split(Node),
     rpc:cast(Node, net_adm, ping, [OurName]),
     receive after 1000 -> ok end,
@@ -268,7 +262,7 @@ simultaneous_md5(Node, OurName, Cookie) when OurName < Node ->
     {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
 				    [{active,false},
 				     {packet,2}]),
-    send_name(SocketA,OurName, ?EPMD_DIST_HIGH),
+    send_name(SocketA,OurName,5),
     %% We are still not marked up on the other side, as our first message 
     %% is not sent.
     SocketB = case gen_tcp:accept(LSocket) of
@@ -281,11 +275,11 @@ simultaneous_md5(Node, OurName, Cookie) when OurName < Node ->
     %% Now we are expected to close A
     gen_tcp:close(SocketA),
     %% But still Socket B will continue
-    {normal,Node,?EPMD_DIST_HIGH} = recv_name(SocketB),  % See 1)
+    {normal,Node,5} = recv_name(SocketB),  % See 1)
     send_status(SocketB, ok_simultaneous),
     MyChallengeB = gen_challenge(),
-    send_challenge(SocketB, OurName, MyChallengeB, ?EPMD_DIST_HIGH),
-    {ok,HisChallengeB} = recv_challenge_reply(SocketB, MyChallengeB, Cookie),
+    send_challenge(SocketB, OurName, MyChallengeB,5),
+    HisChallengeB = recv_challenge_reply(SocketB, MyChallengeB, Cookie),
     DigestB = gen_digest(HisChallengeB,Cookie),
     send_challenge_ack(SocketB, DigestB),
     inet:setopts(SocketB, [{active, false},
@@ -307,8 +301,7 @@ simultaneous_md5(Node, OurName, Cookie) when OurName > Node ->
 		  Else ->
 		      exit(Else)
 	      end,
-    EpmdSocket = register_node(OurName, LSocket,
-                               ?EPMD_DIST_LOW, ?EPMD_DIST_HIGH),
+    EpmdSocket = register(OurName, LSocket, 1, 5),
     {NA, NB} = split(Node),
     rpc:cast(Node, net_adm, ping, [OurName]),
     receive after 1000 -> ok end,
@@ -322,16 +315,16 @@ simultaneous_md5(Node, OurName, Cookie) when OurName > Node ->
 		  Else2 ->
 		      exit(Else2)
 	      end,
-    send_name(SocketA,OurName, ?EPMD_DIST_HIGH),
+    send_name(SocketA,OurName,5),
     ok_simultaneous = recv_status(SocketA),
     %% Socket B should die during this
     case catch begin
-		   {normal,Node,?EPMD_DIST_HIGH} = recv_name(SocketB),  % See 1)
+		   {normal,Node,5} = recv_name(SocketB),  % See 1)
 		   send_status(SocketB, ok_simultaneous),
 		   MyChallengeB = gen_challenge(),
 		   send_challenge(SocketB, OurName, MyChallengeB,
 				  5),
-		   {ok,HisChallengeB} = recv_challenge_reply(
+		   HisChallengeB = recv_challenge_reply(
 				     SocketB,
 				     MyChallengeB,
 				     Cookie),
@@ -353,7 +346,7 @@ simultaneous_md5(Node, OurName, Cookie) when OurName > Node ->
     end,
     gen_tcp:close(SocketB),
     %% But still Socket A will continue
-    {hidden,Node,?EPMD_DIST_HIGH,HisChallengeA} = recv_challenge(SocketA), % See 1)
+    {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
     OurChallengeA = gen_challenge(),
     OurDigestA = gen_digest(HisChallengeA, Cookie),
     send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
@@ -379,7 +372,7 @@ missing_compulsory_dflags(Config) when is_list(Config) ->
 				    [{active,false},
 				     {packet,2}]),
     BadNode = list_to_atom(atom_to_list(Name2)++"@"++atom_to_list(NB)),
-    send_name(SocketA,BadNode, ?EPMD_DIST_HIGH, 0),
+    send_name(SocketA,BadNode,5,0),
     not_allowed = recv_status(SocketA),
     gen_tcp:close(SocketA),
     stop_node(Node),
@@ -523,16 +516,16 @@ send_challenge_reply(Socket, Challenge, Digest) ->
 
 recv_challenge_reply(Socket, ChallengeA, Cookie) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok,[$r,CB3,CB2,CB1,CB0 | SumB]=Data} when length(SumB) == 16 ->
+	{ok,[$r,CB3,CB2,CB1,CB0 | SumB]} when length(SumB) == 16 ->
 	    SumA = gen_digest(ChallengeA, Cookie),
 	    ChallengeB = ?u32(CB3,CB2,CB1,CB0),
 	    if SumB == SumA ->
-		    {ok,ChallengeB};
+		    ChallengeB;
 	       true ->
-		    {error,Data}
+		    ?shutdown(bad_challenge_reply)
 	    end;
-	Err ->
-            {error,Err}
+	_ ->
+	    ?shutdown(no_node)
     end.
 
 send_challenge_ack(Socket, Digest) ->
@@ -627,13 +620,6 @@ wait_for_reg_reply(Socket, SoFar) ->
     receive
 	{tcp, Socket, Data0} ->
 	    case SoFar ++ Data0 of
-		[$v, Result, A, B, C, D] ->
-		    case Result of
-			0 ->
-			    {alive, Socket, ?u32(A, B, C, D)};
-			_ ->
-			    {error, duplicate_name}
-		    end;
 		[$y, Result, A, B] ->
 		    case Result of
 			0 ->
@@ -654,7 +640,7 @@ wait_for_reg_reply(Socket, SoFar) ->
     end.
 
 
-register_node(NodeName, ListenSocket, VLow, VHigh) ->
+register(NodeName, ListenSocket, VLow, VHigh) ->
     {ok,{_,TcpPort}} = inet:sockname(ListenSocket),
     case do_register_node(NodeName, TcpPort, VLow, VHigh) of
 	{alive, Socket, _Creation} ->