aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-05-14 17:15:19 +0200
committerSverker Eriksson <[email protected]>2019-05-14 20:32:16 +0200
commit08008bde0369973d7d57cbff35249cc7de8b8c37 (patch)
tree20cf991da281595c40e2fafa1c949de997566472 /lib/kernel/src
parentcf1d6c1bffe86b7a6997e9fb43ff6fdeec1e23be (diff)
downloadotp-08008bde0369973d7d57cbff35249cc7de8b8c37.tar.gz
otp-08008bde0369973d7d57cbff35249cc7de8b8c37.tar.bz2
otp-08008bde0369973d7d57cbff35249cc7de8b8c37.zip
epmd: Support 32-bit creation values in local node
This reverts revert-commit d293c3ff700c1a0992a32dc3da9ae18964893c23.
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/erl_epmd.erl11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index 7a14e2635c..f31a1722ce 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, 4370).
+-define(epmd_dist_high, 6).
-endif.
-ifndef(epmd_dist_low).
--define(epmd_dist_low, 4370).
+-define(epmd_dist_low, 5).
-endif.
%% External exports
@@ -342,6 +342,13 @@ 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 ->