diff options
| author | Sverker Eriksson <[email protected]> | 2016-04-12 18:54:23 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-04-12 18:54:23 +0200 |
| commit | 0f8f4e96ff8479018e5e921775654adc15f5e771 (patch) | |
| tree | 33554de3cf013e6df61977bb5af4cd409197583f /lib/erl_interface/src/encode/encode_port.c | |
| parent | 5b31b2196bbb13ba650207f4ef94b2e1fa8f6121 (diff) | |
| parent | e4b8b9be39601b1c79dfd5d8e807ae4c404b6935 (diff) | |
| download | otp-0f8f4e96ff8479018e5e921775654adc15f5e771.tar.gz otp-0f8f4e96ff8479018e5e921775654adc15f5e771.tar.bz2 otp-0f8f4e96ff8479018e5e921775654adc15f5e771.zip | |
Merge branch 'sverk/big-external-creations.OTP-13488'
Diffstat (limited to 'lib/erl_interface/src/encode/encode_port.c')
| -rw-r--r-- | lib/erl_interface/src/encode/encode_port.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/erl_interface/src/encode/encode_port.c b/lib/erl_interface/src/encode/encode_port.c index a7468e5917..a6e7d3541a 100644 --- a/lib/erl_interface/src/encode/encode_port.c +++ b/lib/erl_interface/src/encode/encode_port.c @@ -25,6 +25,7 @@ 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, @@ -32,16 +33,19 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p) return -1; } if (buf) { - put8(s,ERL_PORT_EXT); + put8(s, tag); s = buf + *index; /* now the integers */ put32be(s,p->id & 0x0fffffff /* 28 bits */); - put8(s,(p->creation & 0x03)); + if (tag == ERL_PORT_EXT) { + put8(s,(p->creation & 0x03)); + } else { + put32be(s, p->creation); + } } - - *index += 4 + 1; + *index += 4 + (tag == ERL_PORT_EXT ? 1 : 4); return 0; } |