diff options
| author | Sverker Eriksson <[email protected]> | 2019-07-01 16:42:28 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-07-01 16:42:28 +0200 |
| commit | 0de9ecd561bdc964f1c6436d240729b3952cdf3a (patch) | |
| tree | 5ed6c91c89850e347ea49ad99246b7c9a32791c4 /lib/kernel/src | |
| parent | 05c50231aa68243347f6186f90662812787d1b88 (diff) | |
| parent | ac568ebbe879e74e8d3a1d052f0f2fc3117051f0 (diff) | |
| download | otp-0de9ecd561bdc964f1c6436d240729b3952cdf3a.tar.gz otp-0de9ecd561bdc964f1c6436d240729b3952cdf3a.tar.bz2 otp-0de9ecd561bdc964f1c6436d240729b3952cdf3a.zip | |
Merge branch 'sverker/re-enable-big-creation/OTP-15603'
* sverker/re-enable-big-creation/OTP-15603:
doc: Add links between dist flags and external tags (DTD updated)
erts: Fix docs for new pid,port,ref external tags
erts: Document new EPMD response ALIVE2_X_RESP
erl_interface: Support 32-bit creation local cnode
jinterface: Remove old encoding of pid,port,refs
epmd: Support 32-bit creation values in local node
erl_interface: Remove old encoding of pid,port,refs
erts: Remove old encoding of pids, ports and refs
erts: Make DFLAG_BIG_CREATION mandatory
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/erl_epmd.erl | 11 |
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 -> |