diff options
| author | Sverker Eriksson <[email protected]> | 2019-03-22 19:41:17 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-03-22 19:41:17 +0100 |
| commit | 167c5ef4d804ab84979284ef4f572a69d6d9ddf8 (patch) | |
| tree | a24d699beea5868374d9e86828336be2918e8ba3 /lib/kernel/src | |
| parent | 6f01f562418c26e37233c2f1ca1dc62c53418ca8 (diff) | |
| parent | bd8f6106d44a58c261920eef72842bb3bc5a4968 (diff) | |
| download | otp-167c5ef4d804ab84979284ef4f572a69d6d9ddf8.tar.gz otp-167c5ef4d804ab84979284ef4f572a69d6d9ddf8.tar.bz2 otp-167c5ef4d804ab84979284ef4f572a69d6d9ddf8.zip | |
Merge branch 'sverker/enable-big-creation/OTP-15603'
* sverker/enable-big-creation/OTP-15603:
epmd: Support 32-bit creation values in local node
erts: Robustify epmd reply function
erts: Reject decoded local refs with too large first word
erts: Fix bug in list_to_ref
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 -> |