diff options
| author | Sverker Eriksson <[email protected]> | 2019-04-08 17:59:40 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-04-12 18:28:29 +0200 |
| commit | 46aa940b9d771c4806aacaf065c2f637474e9815 (patch) | |
| tree | c86b53eb31475a5887e2576e164d85b955834949 /lib/erl_interface/src | |
| parent | ef92738bd1725ec43f58f78ac8d9f271dcb99c8a (diff) | |
| download | otp-46aa940b9d771c4806aacaf065c2f637474e9815.tar.gz otp-46aa940b9d771c4806aacaf065c2f637474e9815.tar.bz2 otp-46aa940b9d771c4806aacaf065c2f637474e9815.zip | |
erl_interface: Remove old r9 pid and port compatibility
Diffstat (limited to 'lib/erl_interface/src')
| -rw-r--r-- | lib/erl_interface/src/connect/ei_connect.c | 6 | ||||
| -rw-r--r-- | lib/erl_interface/src/legacy/erl_eterm.c | 14 | ||||
| -rw-r--r-- | lib/erl_interface/src/misc/ei_compat.c | 5 | ||||
| -rw-r--r-- | lib/erl_interface/src/misc/ei_internal.h | 2 |
4 files changed, 4 insertions, 23 deletions
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c index 7a304e6d4f..e75c4aadb5 100644 --- a/lib/erl_interface/src/connect/ei_connect.c +++ b/lib/erl_interface/src/connect/ei_connect.c @@ -1941,8 +1941,7 @@ static int recv_challenge(ei_socket_callbacks *cbs, void *ctx, goto error; } - if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS) - && !ei_internal_use_r9_pids_ports()) { + if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)) { EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE peer cannot " "handle extended pids and ports"); erl_errno = EIO; @@ -2236,8 +2235,7 @@ static int recv_name(ei_socket_callbacks *cbs, void *ctx, goto error; } - if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS) - && !ei_internal_use_r9_pids_ports()) { + if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)) { EI_TRACE_ERR0("recv_name","<- RECV_NAME peer cannot " "handle extended pids and ports"); erl_errno = EIO; diff --git a/lib/erl_interface/src/legacy/erl_eterm.c b/lib/erl_interface/src/legacy/erl_eterm.c index 7ed2bdbc93..7ecea83b1a 100644 --- a/lib/erl_interface/src/legacy/erl_eterm.c +++ b/lib/erl_interface/src/legacy/erl_eterm.c @@ -299,12 +299,7 @@ void erl_mk_pid_helper(ETERM *ep, unsigned int number, unsigned int serial, unsigned int creation) { ERL_PID_NUMBER(ep) = number & 0x7fff; /* 15 bits */ - if (ei_internal_use_r9_pids_ports()) { - ERL_PID_SERIAL(ep) = serial & 0x07; /* 3 bits */ - } - else { - ERL_PID_SERIAL(ep) = serial & 0x1fff; /* 13 bits */ - } + ERL_PID_SERIAL(ep) = serial & 0x1fff; /* 13 bits */ ERL_PID_CREATION(ep) = creation; /* 32 bits */ } @@ -334,12 +329,7 @@ ETERM *erl_mk_port(const char *node, void erl_mk_port_helper(ETERM* ep, unsigned number, unsigned int creation) { - if (ei_internal_use_r9_pids_ports()) { - ERL_PORT_NUMBER(ep) = number & 0x3ffff; /* 18 bits */ - } - else { - ERL_PORT_NUMBER(ep) = number & 0x0fffffff; /* 18 bits */ - } + ERL_PORT_NUMBER(ep) = number & 0x0fffffff; /* 18 bits */ ERL_PORT_CREATION(ep) = creation; /* 32 bits */ } diff --git a/lib/erl_interface/src/misc/ei_compat.c b/lib/erl_interface/src/misc/ei_compat.c index 93d7dbfb83..ff94e144ee 100644 --- a/lib/erl_interface/src/misc/ei_compat.c +++ b/lib/erl_interface/src/misc/ei_compat.c @@ -33,8 +33,3 @@ ei_set_compat_rel(unsigned rel) compat_rel = rel; } -int -ei_internal_use_r9_pids_ports(void) -{ - return compat_rel < 10; -} diff --git a/lib/erl_interface/src/misc/ei_internal.h b/lib/erl_interface/src/misc/ei_internal.h index f28dd6d668..17abe6cf90 100644 --- a/lib/erl_interface/src/misc/ei_internal.h +++ b/lib/erl_interface/src/misc/ei_internal.h @@ -157,8 +157,6 @@ int ei_init_connect(void); void ei_trace_printf(const char *name, int level, const char *format, ...); -int ei_internal_use_r9_pids_ports(void); - int ei_get_cbs_ctx__(ei_socket_callbacks **cbs, void **ctx, int fd); #endif /* _EI_INTERNAL_H */ |