From 04524794d5e1f80a33f48201e5c14de8c396c30e Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 11 Jul 2018 11:20:46 +0200
Subject: [socket-nif] Add support for socket (level ip) options
 [add|drop]_membership

Added support for the socket options (level ip) add_membership and
drop_membership.

OTP-14831
---
 erts/preloaded/ebin/socket.beam | Bin 44012 -> 44536 bytes
 erts/preloaded/src/socket.erl   |  37 +++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'erts/preloaded')

diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index 01db75c170..f64ea4103b 100644
Binary files a/erts/preloaded/ebin/socket.beam and b/erts/preloaded/ebin/socket.beam differ
diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl
index 997a4ac225..3e7679daa1 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -89,6 +89,7 @@
               sctp_socket_option/0,
 
               ip_tos_flag/0,
+              ip_mreq/0,
 
 
               msg_hdr/0
@@ -134,6 +135,20 @@
 %%
 %% </KOLLA>
 
+%% This type is used when requesting to become member of a multicast
+%% group with a call to setopt. Example: 
+%%
+%%     socket:setopt(Socket, ip, add_membership, #{multiaddr => Addr,
+%%                                                 interface => any}).
+%%
+%% Its also used when removing from a multicast group. Example:
+%%
+%%     socket:setopt(Socket, ip, drop_membership, #{multiaddr => Addr,
+%%                                                  interface => any}).
+%%
+-type ip_mreq() :: #{multiaddr := ip4_address(),
+                     interface := any | ip4_address()}.
+
 -type sockaddr_un()  :: #{family := local,
                           path   := binary() | string()}.
 -type sockaddr_in4() :: #{family := inet,
@@ -497,11 +512,11 @@
 %% -define(SOCKET_OPT_SOCK_TIMESTAMP,      31).
 -define(SOCKET_OPT_SOCK_TYPE,           32).
 
-%% -define(SOCKET_OPT_IP_ADD_MEMBERSHIP,         1).
+-define(SOCKET_OPT_IP_ADD_MEMBERSHIP,         1).
 %% -define(SOCKET_OPT_IP_ADD_SOURCE_MEMBERSHIP,  2).
 %% -define(SOCKET_OPT_IP_BLOCK_SOURCE,           3).
 %% -define(SOCKET_OPT_IP_DONT_FRAG,              4).
-%% -define(SOCKET_OPT_IP_DROP_MEMBERSHIP,        5).
+-define(SOCKET_OPT_IP_DROP_MEMBERSHIP,        5).
 %% -define(SOCKET_OPT_IP_DROP_SOURCE_MEMBERSHIP, 6).
 %% -define(SOCKET_OPT_IP_FREEBIND,               7).
 %% -define(SOCKET_OPT_IP_HDRINCL,                8).
@@ -1955,6 +1970,16 @@ enc_setopt_value(socket, sndbuf, V, _D, _T, _P) when is_integer(V) ->
 enc_setopt_value(socket = L, Opt, V, _D, _T, _P) ->
     not_supported({L, Opt, V});
 
+enc_setopt_value(ip, add_membership, #{multiaddr := M, 
+                                       interface := IF} = V, _D, _T, _P)
+  when (is_tuple(M) andalso (size(M) =:= 4)) andalso 
+       ((IF =:= any) orelse (is_tuple(IF) andalso (size(IF) =:= 4))) ->
+    V;
+enc_setopt_value(ip, drop_membership, #{multiaddr := M, 
+                                        interface := IF} = V, _D, _T, _P)
+  when (is_tuple(M) andalso (size(M) =:= 4)) andalso 
+       ((IF =:= any) orelse (is_tuple(IF) andalso (size(IF) =:= 4))) ->
+    V;
 enc_setopt_value(ip, multicast_if, V, _D, _T, _P)
   when (V =:= any) orelse (is_tuple(V) andalso (size(V) =:= 4)) ->
     V;
@@ -2224,8 +2249,8 @@ enc_sockopt_key(socket = L, UnknownOpt, _Dir, _D, _T, _P) ->
     unknown({L, UnknownOpt});
 
 %% +++ IP socket options +++
-enc_sockopt_key(ip = L, add_membership = Opt, set = _Dir, _D, _T, _P) ->
-    not_supported({L, Opt});
+enc_sockopt_key(ip = _L, add_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_ADD_MEMBERSHIP;
 enc_sockopt_key(ip = L, add_source_membership = Opt, set = _Dir, _D, _T, _P) ->
     not_supported({L, Opt});
 enc_sockopt_key(ip = L, block_source = Opt, set = _Dir, _D, _T, _P) ->
@@ -2234,8 +2259,8 @@ enc_sockopt_key(ip = L, block_source = Opt, set = _Dir, _D, _T, _P) ->
 %% Only respected on udp and raw ip (unless the hdrincl option has been set).
 enc_sockopt_key(ip = L, dontfrag = Opt, _Dir, _D, _T, _P) ->
     not_supported({L, Opt});
-enc_sockopt_key(ip = L, drop_membership = Opt, set = _Dir, _D, _T, _P) ->
-    not_supported({L, Opt});
+enc_sockopt_key(ip = _L, drop_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_DROP_MEMBERSHIP;
 enc_sockopt_key(ip = L, drop_source_membership = Opt, set = _Dir, _D, _T, _P) ->
     not_supported({L, Opt});
 %% Linux only?
-- 
cgit v1.2.3