[socket-nif] Add support for socket (level ipv6) option multicast_if

Added support for the IPv6 socket option MULTICAST_IF.

OTP-14831.

5 files changed, 63 insertions, 7 deletions

diff --git a/erts/doc/src/socket_usage.xml b/erts/doc/src/socket_usage.xml
index 4f18471eb3..f9e094b11a 100644
--- a/erts/doc/src/socket_usage.xml
+++ b/erts/doc/src/socket_usage.xml
@@ -454,6 +454,13 @@
 	<cell>none</cell>
       </row>
       <row>
+	<cell>multicast_if</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw</cell>
+      </row>
+      <row>
 	<cell>v6only</cell>
 	<cell>boolean()</cell>
 	<cell>yes</cell>
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index 5ac190b3ec..632b3469fa 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -541,6 +541,7 @@ typedef union {
 #define SOCKET_OPT_IPV6_MTU                  17
 #define SOCKET_OPT_IPV6_MTU_DISCOVER         18
 #define SOCKET_OPT_IPV6_MULTICAST_HOPS       19
+#define SOCKET_OPT_IPV6_MULTICAST_IF         20
 #define SOCKET_OPT_IPV6_V6ONLY               33
 
 #define SOCKET_OPT_TCP_CONGESTION   1
@@ -1222,6 +1223,11 @@ static ERL_NIF_TERM nsetopt_lvl_ipv6_multicast_hops(ErlNifEnv*        env,
                                                     SocketDescriptor* descP,
                                                     ERL_NIF_TERM      eVal);
 #endif
+#if defined(IPV6_MULTICAST_IF)
+static ERL_NIF_TERM nsetopt_lvl_ipv6_multicast_if(ErlNifEnv*        env,
+                                                  SocketDescriptor* descP,
+                                                  ERL_NIF_TERM      eVal);
+#endif
 #if defined(IPV6_V6ONLY)
 static ERL_NIF_TERM nsetopt_lvl_ipv6_v6only(ErlNifEnv*        env,
                                             SocketDescriptor* descP,
@@ -1515,6 +1521,10 @@ static ERL_NIF_TERM ngetopt_lvl_ipv6_mtu_discover(ErlNifEnv*        env,
 static ERL_NIF_TERM ngetopt_lvl_ipv6_multicast_hops(ErlNifEnv*        env,
                                                     SocketDescriptor* descP);
 #endif
+#if defined(IPV6_MULTICAST_IF)
+static ERL_NIF_TERM ngetopt_lvl_ipv6_multicast_if(ErlNifEnv*        env,
+                                                  SocketDescriptor* descP);
+#endif
 #if defined(IPV6_V6ONLY)
 static ERL_NIF_TERM ngetopt_lvl_ipv6_v6only(ErlNifEnv*        env,
                                             SocketDescriptor* descP);
@@ -5524,6 +5534,12 @@ ERL_NIF_TERM nsetopt_lvl_ipv6(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IPV6_MULTICAST_IF)
+    case SOCKET_OPT_IPV6_MULTICAST_IF:
+        result = nsetopt_lvl_ipv6_multicast_if(env, descP, eVal);
+        break;
+#endif
+
 #if defined(IPV6_V6ONLY)
     case SOCKET_OPT_IPV6_V6ONLY:
         result = nsetopt_lvl_ipv6_v6only(env, descP, eVal);
@@ -5633,6 +5649,18 @@ ERL_NIF_TERM nsetopt_lvl_ipv6_multicast_hops(ErlNifEnv*        env,
 
 
 
+#if defined(IPV6_MULTICAST_IF)
+static
+ERL_NIF_TERM nsetopt_lvl_ipv6_multicast_if(ErlNifEnv*        env,
+                                           SocketDescriptor* descP,
+                                           ERL_NIF_TERM      eVal)
+{
+    return nsetopt_int_opt(env, descP, SOL_IPV6, IPV6_MULTICAST_IF, eVal);
+}
+#endif
+
+
+
 #if defined(IPV6_V6ONLY)
 static
 ERL_NIF_TERM nsetopt_lvl_ipv6_v6only(ErlNifEnv*        env,
@@ -7984,6 +8012,12 @@ ERL_NIF_TERM ngetopt_lvl_ipv6(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IPV6_MULTICAST_IF)
+    case SOCKET_OPT_IPV6_MULTICAST_IF:
+        result = ngetopt_lvl_ipv6_multicast_if(env, descP);
+        break;
+#endif
+
 #if defined(IPV6_V6ONLY)
     case SOCKET_OPT_IPV6_V6ONLY:
         result = ngetopt_lvl_ipv6_v6only(env, descP);
@@ -8063,6 +8097,16 @@ ERL_NIF_TERM ngetopt_lvl_ipv6_multicast_hops(ErlNifEnv*        env,
 #endif
 
 
+#if defined(IPV6_MULTICAST_IF)
+static
+ERL_NIF_TERM ngetopt_lvl_ipv6_multicast_if(ErlNifEnv*        env,
+                                           SocketDescriptor* descP)
+{
+    return ngetopt_int_opt(env, descP, SOL_IPV6, IPV6_MULTICAST_IF);
+}
+#endif
+
+
 #if defined(IPV6_V6ONLY)
 static
 ERL_NIF_TERM ngetopt_lvl_ipv6_v6only(ErlNifEnv*        env,
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index 0b16eb23e0..f5652bff1e 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 fd273951bd..02232ebd68 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -650,7 +650,7 @@
 -define(SOCKET_OPT_IPV6_MTU,               17).
 -define(SOCKET_OPT_IPV6_MTU_DISCOVER,      18).
 -define(SOCKET_OPT_IPV6_MULTICAST_HOPS,    19).
-%% -define(SOCKET_OPT_IPV6_MULTICAST_IF,      20).
+-define(SOCKET_OPT_IPV6_MULTICAST_IF,      20).
 %% -define(SOCKET_OPT_IPV6_MULTICAST_LOOP,    21).
 %% -define(SOCKET_OPT_IPV6_PORTRANGE,         22).
 %% -define(SOCKET_OPT_IPV6_PKTINFO,           23).
@@ -2274,6 +2274,9 @@ enc_setopt_value(ipv6, multicast_hops, V, _D, _T, _P)
 enc_setopt_value(ipv6, multicast_hops, V, _D, _T, _P)
   when is_integer(V) andalso (V >= 0) andalso (V =< 255) ->
     V;
+enc_setopt_value(ipv6, multicast_if, V, _D, _T, _P)
+  when is_integer(V) ->
+    V;
 enc_setopt_value(ipv6, v6only, V, _D, _T, _P) when is_boolean(V) ->
     V;
 enc_setopt_value(ipv6 = L, Opt, V, _D, _T, _P) ->
@@ -2700,9 +2703,9 @@ enc_sockopt_key(ipv6 = _L, mtu_discover = _Opt, _Dir, _D, _T, _P) ->
     ?SOCKET_OPT_IPV6_MTU_DISCOVER;
 enc_sockopt_key(ipv6 = _L, multicast_hops = _Opt, _Dir, _D, _T, _P) ->
     ?SOCKET_OPT_IPV6_MULTICAST_HOPS;
-enc_sockopt_key(ipv6 = L, multicast_if = Opt, _Dir, _D, T, _P) 
+enc_sockopt_key(ipv6 = _L, multicast_if = _Opt, _Dir, _D, T, _P) 
   when (T =:= dgram) orelse (T =:= raw) ->
-    not_supported({L, Opt});
+    ?SOCKET_OPT_IPV6_MULTICAST_IF;
 enc_sockopt_key(ipv6 = L, multicast_loop = Opt, _Dir, _D, _T, _P) ->
     not_supported({L, Opt});
 enc_sockopt_key(ipv6 = L, portrange = Opt, _Dir, _D, _T, _P) ->
diff --git a/lib/kernel/test/socket_server.erl b/lib/kernel/test/socket_server.erl
index 28e21c3b8b..cf13620997 100644
--- a/lib/kernel/test/socket_server.erl
+++ b/lib/kernel/test/socket_server.erl
@@ -609,7 +609,7 @@ handler_init(Manager, ID, Peek, Sock) ->
             MTU          = GIP4(mtu),
             MTUDisc      = GIP4(mtu_discover),
             MALL         = GIP4(multicast_all),
-            MIF          = GIP4(multicast_if),
+            MIF4         = GIP4(multicast_if),
             MLoop        = GIP4(multicast_loop),
             MTTL         = GIP4(multicast_ttl),
             NF           = GIP4(nodefrag), % raw only
@@ -618,6 +618,7 @@ handler_init(Manager, ID, Peek, Sock) ->
             RecvTOS      = GIP4(recvtos),
             RecvTTL      = GIP4(recvttl),  % not stream
             MHops        = GIP6(multicast_hops),
+            MIF6         = GIP6(multicast_if), % Only dgram and raw
             i("got continue when: "
               "~n   (socket) Domain:         ~p"
               "~n   (socket) Type:           ~p"
@@ -646,14 +647,15 @@ handler_init(Manager, ID, Peek, Sock) ->
               "~n   (ip)     Recv OPTS:      ~s"
               "~n   (ip)     Recv TOS:       ~s"
               "~n   (ip)     Recv TTL:       ~s"
-              "~n   (ipv6)   Multicast Hops: ~s",
+              "~n   (ipv6)   Multicast Hops: ~s"
+              "~n   (ipv6)   Multicast IF:   ~s",
               [Domain, Type, Proto,
                RA, RP, B2D, OOBI,
                RcvBuf, RcvLW, RcvTO, SndBuf, SndLW, SndTO,
                Linger, Timestamp,
-               FreeBind, MTU, MTUDisc, MALL, MIF, MLoop, MTTL,
+               FreeBind, MTU, MTUDisc, MALL, MIF4, MLoop, MTTL,
                NF, RecvIF, RecvOPTS, RecvTOS, RecvTTL,
-               MHops]),
+               MHops, MIF6]),
 
             handler_loop(#handler{peek    = Peek,
                                   manager = Manager,