aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2018-07-12 17:30:59 +0200
committerMicael Karlberg <[email protected]>2018-09-18 14:50:18 +0200
commit2151895b4eb4cb3172ba7597477fd83eb85b444a (patch)
tree6d61fa5da5fed2e5355692a0c8d17f31cbddb349 /erts/preloaded
parent31ed3b1d9cff6171432459bf2de2b761e987ac97 (diff)
downloadotp-2151895b4eb4cb3172ba7597477fd83eb85b444a.tar.gz
otp-2151895b4eb4cb3172ba7597477fd83eb85b444a.tar.bz2
otp-2151895b4eb4cb3172ba7597477fd83eb85b444a.zip
[socket-nif] Add support for socket (level ip) option minttl
Added support for the IP option MINTTL. OTP-14831
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/socket.beambin45720 -> 45756 bytes
-rw-r--r--erts/preloaded/src/socket.erl8
2 files changed, 5 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index 57a32cfbad..fd19efd516 100644
--- a/erts/preloaded/ebin/socket.beam
+++ b/erts/preloaded/ebin/socket.beam
Binary files differ
diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl
index f70c45b42e..c8238e9a1a 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -531,7 +531,7 @@
-define(SOCKET_OPT_IP_DROP_SOURCE_MEMBERSHIP, 6).
%% -define(SOCKET_OPT_IP_FREEBIND, 7).
%% -define(SOCKET_OPT_IP_HDRINCL, 8).
-%% -define(SOCKET_OPT_IP_MINTTL, 9).
+-define(SOCKET_OPT_IP_MINTTL, 9).
%% -define(SOCKET_OPT_IP_MSFILTER, 10).
-define(SOCKET_OPT_IP_MTU, 11).
-define(SOCKET_OPT_IP_MTU_DISCOVER, 12).
@@ -2014,6 +2014,8 @@ enc_setopt_value(ip, drop_source_membership, #{multiaddr := MA,
(is_tuple(IF) andalso (size(IF) =:= 4)) andalso
(is_tuple(SA) andalso (size(SA) =:= 4)) ->
V;
+enc_setopt_value(ip, minttl, V, _D, _T, _P) when is_integer(V) ->
+ V;
enc_setopt_value(ip, mtu_discover, V, _D, _T, _P)
when (V =:= want) orelse
(V =:= dont) orelse
@@ -2329,8 +2331,8 @@ enc_sockopt_key(ip = L, free_bind = Opt, _Dir, _D, _T, _P) ->
enc_sockopt_key(ip = L, hdrincl = Opt, _Dir, _D, raw = _T, _P) ->
not_supported({L, Opt});
%% FreeBSD only?
-enc_sockopt_key(ip = L, minttl = Opt, _Dir, _D, raw = _T, _P) ->
- not_supported({L, Opt});
+enc_sockopt_key(ip = _L, minttl = _Opt, _Dir, _D, raw = _T, _P) ->
+ ?SOCKET_OPT_IP_MINTTL;
enc_sockopt_key(ip = L, msfilter = Opt, _Dir, _D, _T, _P) ->
not_supported({L, Opt});
enc_sockopt_key(ip = _L, mtu = _Opt, get = _Dir, _D, _T, _P) ->