[socket-nif] Add support for socket (level ip) option retopts

Added support for ip level socket option RETOPTS.

OTP-14831

4 files changed, 72 insertions, 3 deletions

diff --git a/erts/doc/src/socket_usage.xml b/erts/doc/src/socket_usage.xml
index b1fe22b231..79cafa0162 100644
--- a/erts/doc/src/socket_usage.xml
+++ b/erts/doc/src/socket_usage.xml
@@ -401,6 +401,13 @@
 	<cell>type =/= stream</cell>
       </row>
       <row>
+	<cell>retopts</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type =/= stream</cell>
+      </row>
+      <row>
 	<cell>router_alert</cell>
 	<cell>integer()</cell>
 	<cell>yes</cell>
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index 9e9ac333e7..288188d2dd 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -536,6 +536,7 @@ typedef union {
 #define SOCKET_OPT_IP_RECVOPTS               23
 #define SOCKET_OPT_IP_RECVTOS                25
 #define SOCKET_OPT_IP_RECVTTL                26
+#define SOCKET_OPT_IP_RETOPTS                27
 #define SOCKET_OPT_IP_ROUTER_ALERT           28
 #define SOCKET_OPT_IP_TOS                    30
 #define SOCKET_OPT_IP_TRANSPARENT            31
@@ -1195,6 +1196,11 @@ static ERL_NIF_TERM nsetopt_lvl_ip_recvttl(ErlNifEnv*        env,
                                            SocketDescriptor* descP,
                                            ERL_NIF_TERM      eVal);
 #endif
+#if defined(IP_RETOPTS)
+static ERL_NIF_TERM nsetopt_lvl_ip_retopts(ErlNifEnv*        env,
+                                           SocketDescriptor* descP,
+                                           ERL_NIF_TERM      eVal);
+#endif
 #if defined(IP_ROUTER_ALERT)
 static ERL_NIF_TERM nsetopt_lvl_ip_router_alert(ErlNifEnv*        env,
                                                 SocketDescriptor* descP,
@@ -1606,6 +1612,10 @@ static ERL_NIF_TERM ngetopt_lvl_ip_recvtos(ErlNifEnv*        env,
 static ERL_NIF_TERM ngetopt_lvl_ip_recvttl(ErlNifEnv*        env,
                                            SocketDescriptor* descP);
 #endif
+#if defined(IP_RETOPTS)
+static ERL_NIF_TERM ngetopt_lvl_ip_retopts(ErlNifEnv*        env,
+                                           SocketDescriptor* descP);
+#endif
 #if defined(IP_ROUTER_ALERT)
 static ERL_NIF_TERM ngetopt_lvl_ip_router_alert(ErlNifEnv*        env,
                                                 SocketDescriptor* descP);
@@ -5071,6 +5081,12 @@ ERL_NIF_TERM nsetopt_lvl_ip(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IP_RETOPTS)
+    case SOCKET_OPT_IP_RETOPTS:
+        result = nsetopt_lvl_ip_retopts(env, descP, eVal);
+        break;
+#endif
+
 #if defined(IP_ROUTER_ALERT)
     case SOCKET_OPT_IP_ROUTER_ALERT:
         result = nsetopt_lvl_ip_router_alert(env, descP, eVal);
@@ -5684,6 +5700,25 @@ ERL_NIF_TERM nsetopt_lvl_ip_recvttl(ErlNifEnv*        env,
 #endif
 
 
+/* nsetopt_lvl_ip_retopts - Level IP RETOPTS option
+ */
+#if defined(IP_RETOPTS)
+static
+ERL_NIF_TERM nsetopt_lvl_ip_retopts(ErlNifEnv*        env,
+                                    SocketDescriptor* descP,
+                                    ERL_NIF_TERM      eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return nsetopt_bool_opt(env, descP, level, IP_RETOPTS, eVal);
+}
+#endif
+
+
 /* nsetopt_lvl_ip_router_alert - Level IP ROUTER_ALERT option
  */
 #if defined(IP_ROUTER_ALERT)
@@ -8289,6 +8324,12 @@ ERL_NIF_TERM ngetopt_lvl_ip(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IP_RETOPTS)
+    case SOCKET_OPT_IP_RETOPTS:
+        result = ngetopt_lvl_ip_retopts(env, descP);
+        break;
+#endif
+
 #if defined(IP_ROUTER_ALERT)
     case SOCKET_OPT_IP_ROUTER_ALERT:
         result = ngetopt_lvl_ip_router_alert(env, descP);
@@ -8651,6 +8692,24 @@ ERL_NIF_TERM ngetopt_lvl_ip_recvttl(ErlNifEnv*        env,
 #endif
 
 
+/* ngetopt_lvl_ip_retopts - Level IP RETOPTS option
+ */
+#if defined(IP_RETOPTS)
+static
+ERL_NIF_TERM ngetopt_lvl_ip_retopts(ErlNifEnv*        env,
+                                    SocketDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return ngetopt_bool_opt(env, descP, level, IP_RETOPTS);
+}
+#endif
+
+
 /* ngetopt_lvl_ip_router_alert - Level IP ROUTER_ALERT option
  */
 #if defined(IP_ROUTER_ALERT)
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index 960a465fb6..93b224391b 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 c7589cbd48..e7438cd856 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -640,7 +640,7 @@
 %% -define(SOCKET_OPT_IP_RECVORIGDSTADDR,       24).
 -define(SOCKET_OPT_IP_RECVTOS,               25).
 -define(SOCKET_OPT_IP_RECVTTL,               26).
-%% -define(SOCKET_OPT_IP_RETOPTS,               27).
+-define(SOCKET_OPT_IP_RETOPTS,               27).
 -define(SOCKET_OPT_IP_ROUTER_ALERT,          28).
 %% -define(SOCKET_OPT_IP_SNDSRCADDR,            29).
 -define(SOCKET_OPT_IP_TOS,                   30).
@@ -2264,6 +2264,9 @@ enc_setopt_value(ip, recvtos, V, _D, _T, _P)
 enc_setopt_value(ip, recvttl, V, _D, _T, _P)
   when is_boolean(V) ->
     V;
+enc_setopt_value(ip, retopts, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
 enc_setopt_value(ip, router_alert, V, _D, _T, _P)
   when is_integer(V) ->
     V;
@@ -2725,8 +2728,8 @@ enc_sockopt_key(ip, recvtos = _Opt, _Dir, _D, _T, _P) ->
     ?SOCKET_OPT_IP_RECVTOS;
 enc_sockopt_key(ip = _L, recvttl = _Opt, _Dir, _D, T, _P) when (T =/= stream) ->
     ?SOCKET_OPT_IP_RECVTTL;
-enc_sockopt_key(ip = L, retopts = Opt, _Dir, _D, _T, _P) ->
-    not_supported({L, Opt});
+enc_sockopt_key(ip = _L, retopts = _Opt, _Dir, _D, T, _P) when (T =/= stream) ->
+    ?SOCKET_OPT_IP_RETOPTS;
 enc_sockopt_key(ip, router_alert = _Opt, _Dir, _D, raw = _T, _P) ->
     ?SOCKET_OPT_IP_ROUTER_ALERT;
 %% On FreeBSD it specifies that this option is only valid