diff options
author | Micael Karlberg <[email protected]> | 2018-07-10 14:01:00 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2018-09-18 14:50:18 +0200 |
commit | 59586c412340d24188f78730c5b2c45db772c8ca (patch) | |
tree | 43d483e4458269cd0dac5b28ab40c313da902a88 /erts/preloaded | |
parent | 8936b71f13b37559600afb5536ff7d7878b9ab0e (diff) | |
download | otp-59586c412340d24188f78730c5b2c45db772c8ca.tar.gz otp-59586c412340d24188f78730c5b2c45db772c8ca.tar.bz2 otp-59586c412340d24188f78730c5b2c45db772c8ca.zip |
[socket-nif] Add support for socket (level ip) option multicast_ttl
Added support for the IP option MULTICAST_TTL.
OTP-14831
Diffstat (limited to 'erts/preloaded')
-rw-r--r-- | erts/preloaded/ebin/socket.beam | bin | 43784 -> 43884 bytes | |||
-rw-r--r-- | erts/preloaded/src/socket.erl | 9 |
2 files changed, 6 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam Binary files differindex 0f49c421fa..4ffa22f70d 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 d2ed733b3c..f243559ceb 100644 --- a/erts/preloaded/src/socket.erl +++ b/erts/preloaded/src/socket.erl @@ -512,7 +512,7 @@ %% -define(SOCKET_OPT_IP_MULTICAST_ALL, 13). %% -define(SOCKET_OPT_IP_MULTICAST_IF, 14). -define(SOCKET_OPT_IP_MULTICAST_LOOP, 15). -%% -define(SOCKET_OPT_IP_MULTICAST_TTL, 16). +-define(SOCKET_OPT_IP_MULTICAST_TTL, 16). %% -define(SOCKET_OPT_IP_NODEFRAG, 17). %% -define(SOCKET_OPT_IP_OPTIONS, 18). %% -define(SOCKET_OPT_IP_PKTINFO, 19). @@ -1958,6 +1958,9 @@ enc_setopt_value(socket = L, Opt, V, _D, _T, _P) -> enc_setopt_value(ip, multicast_loop, V, _D, _T, _P) when is_boolean(V) -> V; +enc_setopt_value(ip, multicast_ttl, V, _D, _T, _P) + when is_integer(V) andalso (0 =< V) andalso (V =< 255) -> + V; enc_setopt_value(ip, recvtos, V, _D, _T, _P) when is_boolean(V) -> V; @@ -2252,8 +2255,8 @@ enc_sockopt_key(ip = L, multicast_if = Opt, _Dir, _D, _T, _P) -> not_supported({L, Opt}); enc_sockopt_key(ip = _L, multicast_loop = _Opt, _Dir, _D, _T, _P) -> ?SOCKET_OPT_IP_MULTICAST_LOOP; -enc_sockopt_key(ip = L, multicast_ttl = Opt, _Dir, _D, _T, _P) -> - not_supported({L, Opt}); +enc_sockopt_key(ip = _L, multicast_ttl = _Opt, _Dir, _D, _T, _P) -> + ?SOCKET_OPT_IP_MULTICAST_TTL; enc_sockopt_key(ip = L, nodefrag = Opt, _Dir, _D, raw = _T, _P) -> not_supported({L, Opt}); enc_sockopt_key(ip = L, options = Opt, _Dir, _D, _T, _P) -> |