diff options
| author | Micael Karlberg <[email protected]> | 2018-07-25 12:00:34 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2018-09-18 14:50:18 +0200 |
| commit | 587d3a9a76b6ef2c88b850d007d39d34c37b5825 (patch) | |
| tree | 796aa8a07bd8fecc0bf8219ae130f07da3969c4f /erts/preloaded | |
| parent | 5d9de1cdc46c75117f15f1ab17f017cdb700eb4c (diff) | |
| download | otp-587d3a9a76b6ef2c88b850d007d39d34c37b5825.tar.gz otp-587d3a9a76b6ef2c88b850d007d39d34c37b5825.tar.bz2 otp-587d3a9a76b6ef2c88b850d007d39d34c37b5825.zip | |
[socket-nif] Add support for socket (level ip) option hdrincl
Added support for ip level socket option HDRINCL.
As this option is raw only, it has not yet been tested!
OTP-14831
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/socket.beam | bin | 59008 -> 59016 bytes | |||
| -rw-r--r-- | erts/preloaded/src/socket.erl | 11 |
2 files changed, 6 insertions, 5 deletions
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam Binary files differindex 14ee41257b..be5413e116 100644 --- a/erts/preloaded/ebin/socket.beam +++ b/erts/preloaded/ebin/socket.beam diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl index acda4e3811..4028fa9191 100644 --- a/erts/preloaded/src/socket.erl +++ b/erts/preloaded/src/socket.erl @@ -621,7 +621,7 @@ -define(SOCKET_OPT_IP_DROP_MEMBERSHIP, 5). -define(SOCKET_OPT_IP_DROP_SOURCE_MEMBERSHIP, 6). -define(SOCKET_OPT_IP_FREEBIND, 7). -%% -define(SOCKET_OPT_IP_HDRINCL, 8). +-define(SOCKET_OPT_IP_HDRINCL, 8). -define(SOCKET_OPT_IP_MINTTL, 9). -define(SOCKET_OPT_IP_MSFILTER, 10). -define(SOCKET_OPT_IP_MTU, 11). @@ -631,7 +631,7 @@ -define(SOCKET_OPT_IP_MULTICAST_LOOP, 15). -define(SOCKET_OPT_IP_MULTICAST_TTL, 16). -define(SOCKET_OPT_IP_NODEFRAG, 17). -%% -define(SOCKET_OPT_IP_OPTIONS, 18). +%% -define(SOCKET_OPT_IP_OPTIONS, 18). % FreeBSD %% -define(SOCKET_OPT_IP_PKTINFO, 19). -define(SOCKET_OPT_IP_RECVERR, 20). -define(SOCKET_OPT_IP_RECVIF, 21). @@ -2208,6 +2208,8 @@ enc_setopt_value(ip, drop_source_membership, #{multiaddr := MA, V; enc_setopt_value(ip, freebind, V, _D, _T, _P) when is_boolean(V) -> V; +enc_setopt_value(ip, hdrincl, V, _D, _T, _P) when is_boolean(V) -> + V; enc_setopt_value(ip, minttl, V, _D, _T, _P) when is_integer(V) -> V; enc_setopt_value(ip, msfilter, null = V, _D, _T, _P) -> @@ -2676,9 +2678,8 @@ enc_sockopt_key(ip = _L, drop_source_membership = _Opt, set = _Dir, _D, _T, _P) %% Linux only? enc_sockopt_key(ip = _L, freebind = _Opt, _Dir, _D, _T, _P) -> ?SOCKET_OPT_IP_FREEBIND; -enc_sockopt_key(ip = L, hdrincl = Opt, _Dir, _D, raw = _T, _P) -> - not_supported({L, Opt}); -%% FreeBSD only? +enc_sockopt_key(ip = _L, hdrincl = _Opt, _Dir, _D, raw = _T, _P) -> + ?SOCKET_OPT_IP_HDRINCL; enc_sockopt_key(ip = _L, minttl = _Opt, _Dir, _D, raw = _T, _P) -> ?SOCKET_OPT_IP_MINTTL; enc_sockopt_key(ip = _L, msfilter = _Opt, set = _Dir, _D, _T, _P) -> |