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 /erts/emulator/beam/dist.c | |
| 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 'erts/emulator/beam/dist.c')
| -rw-r--r-- | erts/emulator/beam/dist.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index ff5f766de7..a1da1addf9 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -3764,12 +3764,10 @@ int distribution_info(fmtfn_t to, void *arg) /* Called by break handler */ BIF_RETTYPE setnode_2(BIF_ALIST_2) { Process *net_kernel; - Uint creation; + Uint32 creation; /* valid creation ? */ - if(!term_to_Uint(BIF_ARG_2, &creation)) - goto error; - if(creation > 3) + if(!term_to_Uint32(BIF_ARG_2, &creation)) goto error; /* valid node name ? */ @@ -3813,7 +3811,7 @@ BIF_RETTYPE setnode_2(BIF_ALIST_2) erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN); erts_thr_progress_block(); inc_no_nodes(); - erts_set_this_node(BIF_ARG_1, (Uint32) creation); + erts_set_this_node(BIF_ARG_1, creation); erts_is_alive = 1; send_nodes_mon_msgs(NULL, am_nodeup, BIF_ARG_1, am_visible, NIL); erts_thr_progress_unblock(); |