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

Added support for the IP option MULTICAST_ALL.

OTP-14831

5 files changed, 72 insertions, 9 deletions

diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index 65e530adee..a2bebcd621 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -366,6 +366,7 @@ typedef union {
 #define SOCKET_OPT_IP_DROP_MEMBERSHIP  5
 #define SOCKET_OPT_IP_MTU             11
 #define SOCKET_OPT_IP_MTU_DISCOVER    12
+#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
@@ -872,6 +873,11 @@ static ERL_NIF_TERM nsetopt_lvl_ip_mtu_discover(ErlNifEnv*        env,
                                                 SocketDescriptor* descP,
                                                 ERL_NIF_TERM      eVal);
 #endif
+#if defined(IP_MULTICAST_ALL)
+static ERL_NIF_TERM nsetopt_lvl_ip_multicast_all(ErlNifEnv*        env,
+                                                 SocketDescriptor* descP,
+                                                 ERL_NIF_TERM      eVal);
+#endif
 #if defined(IP_MULTICAST_IF)
 static ERL_NIF_TERM nsetopt_lvl_ip_multicast_if(ErlNifEnv*        env,
                                                 SocketDescriptor* descP,
@@ -1063,6 +1069,10 @@ static ERL_NIF_TERM ngetopt_lvl_ip_mtu(ErlNifEnv*        env,
 static ERL_NIF_TERM ngetopt_lvl_ip_mtu_discover(ErlNifEnv*        env,
                                                 SocketDescriptor* descP);
 #endif
+#if defined(IP_MULTICAST_ALL)
+static ERL_NIF_TERM ngetopt_lvl_ip_multicast_all(ErlNifEnv*        env,
+                                                 SocketDescriptor* descP);
+#endif
 #if defined(IP_MULTICAST_IF)
 static ERL_NIF_TERM ngetopt_lvl_ip_multicast_if(ErlNifEnv*        env,
                                                 SocketDescriptor* descP);
@@ -4232,6 +4242,25 @@ ERL_NIF_TERM nsetopt_lvl_ip_mtu_discover(ErlNifEnv*        env,
 #endif
 
 
+/* nsetopt_lvl_ip_multicast_all - Level IP MULTICAST_ALL option
+ */
+#if defined(IP_MULTICAST_ALL)
+static
+ERL_NIF_TERM nsetopt_lvl_ip_multicast_all(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_MULTICAST_ALL, eVal);
+}
+#endif
+
+
 /* nsetopt_lvl_ip_multicast_if - Level IP MULTICAST_IF option
  *
  * The value is either the atom 'any' or a 4-tuple.
@@ -5550,6 +5579,12 @@ ERL_NIF_TERM ngetopt_lvl_ip(ErlNifEnv*        env,
         break;
 #endif
 
+#if defined(IP_MULTICAST_ALL)
+    case SOCKET_OPT_IP_MULTICAST_ALL:
+        result = ngetopt_lvl_ip_multicast_all(env, descP);
+        break;
+#endif
+
 #if defined(IP_MULTICAST_IF)
     case SOCKET_OPT_IP_MULTICAST_IF:
         result = ngetopt_lvl_ip_multicast_if(env, descP);
@@ -5653,6 +5688,24 @@ ERL_NIF_TERM ngetopt_lvl_ip_mtu_discover(ErlNifEnv*        env,
 #endif
 
 
+/* ngetopt_lvl_ip_multicast_all - Level IP MULTICAST_ALL option
+ */
+#if defined(IP_MULTICAST_ALL)
+static
+ERL_NIF_TERM ngetopt_lvl_ip_multicast_all(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_MULTICAST_ALL);
+}
+#endif
+
+
 /* ngetopt_lvl_ip_multicast_if - Level IP MULTICAST_IF option
  */
 #if defined(IP_MULTICAST_IF)
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index 7ca451b6c5..ca05529931 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 5338f0d988..643f59467b 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -527,7 +527,7 @@
 %% -define(SOCKET_OPT_IP_MSFILTER,              10).
 -define(SOCKET_OPT_IP_MTU,                   11).
 -define(SOCKET_OPT_IP_MTU_DISCOVER,          12).
-%% -define(SOCKET_OPT_IP_MULTICAST_ALL,         13).
+-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).
@@ -1992,6 +1992,9 @@ enc_setopt_value(ip, mtu_discover, V, _D, _T, _P)
        (V =:= probe) orelse
        is_integer(V) ->
     V;
+enc_setopt_value(ip, multicast_all, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
 enc_setopt_value(ip, multicast_if, V, _D, _T, _P)
   when (V =:= any) orelse (is_tuple(V) andalso (size(V) =:= 4)) ->
     V;
@@ -2289,8 +2292,8 @@ enc_sockopt_key(ip = _L, mtu = _Opt, get = _Dir, _D, _T, _P) ->
     ?SOCKET_OPT_IP_MTU;
 enc_sockopt_key(ip = _L, mtu_discover = _Opt, _Dir, _D, _T, _P) ->
     ?SOCKET_OPT_IP_MTU_DISCOVER;
-enc_sockopt_key(ip = L, multicast_all = Opt, _Dir, _D, _T, _P) ->
-    not_supported({L, Opt});
+enc_sockopt_key(ip = _L, multicast_all = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MULTICAST_ALL;
 enc_sockopt_key(ip = _L, multicast_if = _Opt, _Dir, _D, _T, _P) ->
     ?SOCKET_OPT_IP_MULTICAST_IF;
 enc_sockopt_key(ip = _L, multicast_loop = _Opt, _Dir, _D, _T, _P) ->
diff --git a/lib/kernel/test/socket_client.erl b/lib/kernel/test/socket_client.erl
index 6c6dc0444c..fa905de954 100644
--- a/lib/kernel/test/socket_client.erl
+++ b/lib/kernel/test/socket_client.erl
@@ -82,6 +82,7 @@ do_start(Domain, stream = Type, Proto, SA) ->
             {ok, Linger}  = socket:getopt(Sock, socket, linger),
             {ok, MTU}     = socket:getopt(Sock, ip,     mtu),
             {ok, MTUDisc} = socket:getopt(Sock, ip,     mtu_discover),
+            {ok, MALL}    = socket:getopt(Sock, ip,     multicast_all),
             {ok, MIF}     = socket:getopt(Sock, ip,     multicast_if),
             {ok, MLoop}   = socket:getopt(Sock, ip,     multicast_loop),
             {ok, MTTL}    = socket:getopt(Sock, ip,     multicast_ttl),
@@ -98,6 +99,7 @@ do_start(Domain, stream = Type, Proto, SA) ->
               "~n   (socket) Linger:         ~p"
               "~n   (ip)     MTU:            ~p"
               "~n   (ip)     MTU Discovery:  ~p"
+              "~n   (ip)     Multicast ALL:  ~p"
               "~n   (ip)     Multicast IF:   ~p"
               "~n   (ip)     Multicast Loop: ~p"
               "~n   (ip)     Multicast TTL:  ~p"
@@ -105,7 +107,7 @@ do_start(Domain, stream = Type, Proto, SA) ->
               [Name, Peer,
                Domain, Type, Proto,
                OOBI, SndBuf, RcvBuf, Linger,
-               MTU, MTUDisc, MIF, MLoop, MTTL]),
+               MTU, MTUDisc, MALL, MIF, MLoop, MTTL]),
             %% Give the server some time...
             ?LIB:sleep(5000),
             %% ok = socket:close(Sock),
@@ -127,6 +129,7 @@ do_start(Domain, dgram = Type, Proto, SA) ->
             {ok, SndBuf} = socket:getopt(Sock, socket, sndbuf),
             {ok, RcvBuf} = socket:getopt(Sock, socket, rcvbuf),
             {ok, Linger} = socket:getopt(Sock, socket, linger),
+            {ok, MALL}   = socket:getopt(Sock, ip,     multicast_all),
             {ok, MIF}    = socket:getopt(Sock, ip,     multicast_if),
             {ok, MLoop}  = socket:getopt(Sock, ip,     multicast_loop),
             {ok, MTTL}   = socket:getopt(Sock, ip,     multicast_ttl),
@@ -138,15 +141,17 @@ do_start(Domain, dgram = Type, Proto, SA) ->
               "~n   (socket) SndBuf:         ~p"
               "~n   (socket) RcvBuf:         ~p"
               "~n   (socket) Linger:         ~p"
+              "~n   (ip)     Multicast ALL:  ~p"
               "~n   (ip)     Multicast IF:   ~p"
               "~n   (ip)     Multicast Loop: ~p"
               "~n   (ip)     Multicast TTL:  ~p"
-              "~n   => wait some", 
-              [Domain, Type, Proto, 
-               OOBI, SndBuf, RcvBuf, Linger, MIF, MLoop, MTTL]),
+              "~n   => wait some",
+              [Domain, Type, Proto,
+               OOBI, SndBuf, RcvBuf, Linger,
+               MALL, MIF, MLoop, MTTL]),
             ?LIB:sleep(5000),
             %% ok = socket:close(Sock),
-            send_loop(#client{socket = Sock, 
+            send_loop(#client{socket = Sock,
                               type   = Type,
                               dest   = SA})
     catch
diff --git a/lib/kernel/test/socket_server.erl b/lib/kernel/test/socket_server.erl
index 68a6aebc50..f2d63c4dc1 100644
--- a/lib/kernel/test/socket_server.erl
+++ b/lib/kernel/test/socket_server.erl
@@ -451,6 +451,7 @@ handler_init(Manager, ID, Peek, Sock) ->
             {ok, Linger} = socket:getopt(Sock, socket, linger),
             MTU     = G(mtu),
             MTUDisc = G(mtu_discover),
+            {ok, MALL}   = socket:getopt(Sock, ip,     multicast_all),
             {ok, MIF}    = socket:getopt(Sock, ip,     multicast_if),
             {ok, MLoop}  = socket:getopt(Sock, ip,     multicast_loop),
             {ok, MTTL}   = socket:getopt(Sock, ip,     multicast_ttl),
@@ -464,12 +465,13 @@ handler_init(Manager, ID, Peek, Sock) ->
               "~n   (socket) Linger:         ~p"
               "~n   (ip)     MTU:            ~s"
               "~n   (ip)     MTU Discovery:  ~s"
+              "~n   (ip)     Multicast ALL:  ~p"
               "~n   (ip)     Multicast IF:   ~p"
               "~n   (ip)     Multicast Loop: ~p"
               "~n   (ip)     Multicast TTL:  ~p", 
               [Domain, Type, Proto,
                OOBI, SndBuf, RcvBuf, Linger,
-               MTU, MTUDisc, MIF, MLoop, MTTL]),
+               MTU, MTUDisc, MALL, MIF, MLoop, MTTL]),
             %% socket:setopt(Sock, otp, debug, true),
             handler_loop(#handler{peek    = Peek,
                                   manager = Manager,