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/erl_interface/src/encode/encode_port.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 'lib/erl_interface/src/encode/encode_port.c')
-rw-r--r-- | lib/erl_interface/src/encode/encode_port.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/erl_interface/src/encode/encode_port.c b/lib/erl_interface/src/encode/encode_port.c index eb464380c0..0fb4018db1 100644 --- a/lib/erl_interface/src/encode/encode_port.c +++ b/lib/erl_interface/src/encode/encode_port.c @@ -25,7 +25,6 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p) { char *s = buf + *index; - const char tag = p->creation > 3 ? ERL_NEW_PORT_EXT : ERL_PORT_EXT; ++(*index); /* skip ERL_PORT_EXT */ if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node), ERLANG_UTF8, @@ -33,19 +32,15 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p) return -1; } if (buf) { - put8(s, tag); + put8(s, ERL_NEW_PORT_EXT); s = buf + *index; /* now the integers */ put32be(s,p->id & 0x0fffffff /* 28 bits */); - if (tag == ERL_PORT_EXT) { - put8(s,(p->creation & 0x03)); - } else { - put32be(s, p->creation); - } + put32be(s, p->creation); } - *index += 4 + (tag == ERL_PORT_EXT ? 1 : 4); + *index += 4 + 4; return 0; } |