aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-04-11 14:06:39 +0200
committerSverker Eriksson <[email protected]>2019-04-11 14:06:39 +0200
commit508738f4dcd3c8c83fffb55c2ad5c365f80dc7c4 (patch)
tree6617cc0ba929f7b736be2750dfbb4e0da4ffac09 /lib/kernel/src
parent0e635324b19dd203454f41b41df7a7bb799bc40a (diff)
parent1ba8bf12eddb363481b1b5856af7c4d7c3313e52 (diff)
downloadotp-508738f4dcd3c8c83fffb55c2ad5c365f80dc7c4.tar.gz
otp-508738f4dcd3c8c83fffb55c2ad5c365f80dc7c4.tar.bz2
otp-508738f4dcd3c8c83fffb55c2ad5c365f80dc7c4.zip
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"
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/erl_epmd.erl11
1 files changed, 2 insertions, 9 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 ->