diff options
| author | Sverker Eriksson <[email protected]> | 2019-01-31 19:43:23 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-01-31 19:43:23 +0100 |
| commit | 5ab76d9263e4a81ccac2fc5591c520dbce6927de (patch) | |
| tree | 270c1724d0be6ae3f9ec62ab7303f368b6887cf2 /erts/preloaded | |
| parent | 10b400a0433cf2ebcffe9ca702a26690123df81f (diff) | |
| parent | 14fe4c3ccf93c023f851512e573e2bac7d00b232 (diff) | |
| download | otp-5ab76d9263e4a81ccac2fc5591c520dbce6927de.tar.gz otp-5ab76d9263e4a81ccac2fc5591c520dbce6927de.tar.bz2 otp-5ab76d9263e4a81ccac2fc5591c520dbce6927de.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 81144 -> 81176 bytes | |||
| -rw-r--r-- | erts/preloaded/src/prim_inet.erl | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex 1e6eb3a37f..f211971529 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index cc2711b540..4fe570ec53 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -2679,12 +2679,13 @@ get_ip6([X1,X2,X3,X4,X5,X6,X7,X8,X9,X10,X11,X12,X13,X14,X15,X16 | T]) -> ?u16(X9,X10),?u16(X11,X12),?u16(X13,X14),?u16(X15,X16)}, T }. +-define(ERTS_INET_DRV_CONTROL_MAGIC_NUMBER, 16#03f1a300). %% Control command ctl_cmd(Port, Cmd, Args) -> ?DBG_FORMAT("prim_inet:ctl_cmd(~p, ~p, ~p)~n", [Port,Cmd,Args]), Result = - try erlang:port_control(Port, Cmd, Args) of + try erlang:port_control(Port, Cmd+?ERTS_INET_DRV_CONTROL_MAGIC_NUMBER, Args) of [?INET_REP_OK|Reply] -> {ok,Reply}; [?INET_REP] -> inet_reply; [?INET_REP_ERROR|Err] -> {error,list_to_atom(Err)} |