Introduce udp send ancillary data argument down to inet_drv

5 files changed, 116 insertions, 29 deletions

diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index d6e8652e77..247ebc50f3 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -20,7 +20,7 @@
 -module(gen_udp).
 
 -export([open/1, open/2, close/1]).
--export([send/2, send/4, recv/2, recv/3, connect/3]).
+-export([send/2, send/3, send/4, send/5, recv/2, recv/3, connect/3]).
 -export([controlling_process/2]).
 -export([fdopen/2]).
 
@@ -125,20 +125,80 @@ open(Port, Opts0) ->
 close(S) ->
     inet:udp_close(S).
 
--spec send(Socket, Address, Port, Packet) -> ok | {error, Reason} when
+-spec send(Socket, Destination, Packet) -> ok | {error, Reason} when
       Socket :: socket(),
-      Address :: inet:socket_address() | inet:hostname(),
-      Port :: inet:port_number(),
+      Destination :: {inet:ip_address(), inet:port_number()} |
+                     inet:family_address(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix().
+%%%
+send(Socket, Destination, Packet) ->
+    send(Socket, Destination, [], Packet).
+
+-spec send(Socket, Host, Port, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Host :: inet:hostname() | inet:ip_address(),
+      Port :: inet:port_number() | atom(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix();
+%%%
+          (Socket, Destination, AncData, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Destination :: {inet:ip_address(), inet:port_number()} |
+                     inet:family_address(),
+      AncData :: inet:ancillary_data(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix();
+%%%
+          (Socket, Destination, PortZero, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Destination :: {inet:ip_address(), inet:port_number()} |
+                     inet:family_address(),
+      PortZero :: inet:port_number(),
       Packet :: iodata(),
       Reason :: not_owner | inet:posix().
+%%%
+send(S, {_,_} = Destination, PortZero = AncData, Packet) when is_port(S) ->
+    %% Destination is {Family,Addr} | {IP,Port},
+    %% so it is complete - argument PortZero is redundant
+    if
+        PortZero =:= 0 ->
+            case inet_db:lookup_socket(S) of
+                {ok, Mod} ->
+                    Mod:send(S, Destination, [], Packet);
+                Error ->
+                    Error
+            end;
+        is_integer(PortZero) ->
+            %% Redundant PortZero; must be 0
+            {error, einval};
+        is_list(AncData) ->
+            case inet_db:lookup_socket(S) of
+                {ok, Mod} ->
+                    Mod:send(S, Destination, AncData, Packet);
+                Error ->
+                    Error
+            end
+    end;
+send(S, Host, Port, Packet) when is_port(S) ->
+    send(S, Host, Port, [], Packet).
 
-send(S, Address, Port, Packet) when is_port(S) ->
+-spec send(Socket, Host, Port, AncData, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Host :: inet:hostname() | inet:ip_address() | inet:local_address(),
+      Port :: inet:port_number() | atom(),
+      AncData :: inet:ancillary_data(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix().
+%%%
+send(S, Host, Port, AncData, Packet)
+  when is_port(S), is_list(AncData) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
-	    case Mod:getaddr(Address) of
+	    case Mod:getaddr(Host) of
 		{ok,IP} ->
 		    case Mod:getserv(Port) of
-			{ok,UP} -> Mod:send(S, IP, UP, Packet);
+			{ok,P} -> Mod:send(S, {IP,P}, AncData, Packet);
 			{error,einval} -> exit(badarg);
 			Error -> Error
 		    end;
@@ -149,6 +209,7 @@ send(S, Address, Port, Packet) when is_port(S) ->
 	    Error
     end.
 
+%% Connected send
 send(S, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 9f22eb6aaa..7940903658 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -75,7 +75,8 @@
 
 -export_type([address_family/0, socket_protocol/0, hostent/0, hostname/0, ip4_address/0,
               ip6_address/0, ip_address/0, port_number/0,
-	      local_address/0, socket_address/0, returned_non_ip_address/0,
+	      family_address/0, local_address/0,
+              socket_address/0, returned_non_ip_address/0,
 	      socket_setopt/0, socket_getopt/0, ancillary_data/0,
 	      posix/0, socket/0, stat_option/0]).
 %% imports
@@ -100,11 +101,16 @@
 			0..65535,0..65535,0..65535,0..65535}.
 -type ip_address() :: ip4_address() | ip6_address().
 -type port_number() :: 0..65535.
--type local_address() :: {local, File :: binary() | string()}.
+-type family_address() :: inet_address() | inet6_address() | local_address().
+-type inet_address() ::
+        {'inet', {ip4_address() | 'any' | 'loopback', port_number()}}.
+-type inet6_address() ::
+        {'inet6', {ip6_address() | 'any' | 'loopback', port_number()}}.
+-type local_address() :: {'local', File :: binary() | string()}.
 -type returned_non_ip_address() ::
-	{local, binary()} |
-	{unspec, <<>>} |
-	{undefined, any()}.
+	{'local', binary()} |
+	{'unspec', <<>>} |
+	{'undefined', any()}.
 -type posix() ::
         'eaddrinuse' | 'eaddrnotavail' | 'eafnosupport' | 'ealready' |
         'econnaborted' | 'econnrefused' | 'econnreset' |
diff --git a/lib/kernel/src/inet6_udp.erl b/lib/kernel/src/inet6_udp.erl
index 71db0357cd..cb95a69798 100644
--- a/lib/kernel/src/inet6_udp.erl
+++ b/lib/kernel/src/inet6_udp.erl
@@ -65,16 +65,25 @@ open(Port, Opts) ->
 	{ok, _} -> exit(badarg)
     end.
 
-send(S, Addr = {A,B,C,D,E,F,G,H}, P, Data)
-  when ?ip6(A,B,C,D,E,F,G,H), ?port(P) ->
-    prim_inet:sendto(S, Addr, P, Data).
+send(S, {A,B,C,D,E,F,G,H} = IP, Port, Data)
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port) ->
+    prim_inet:sendto(S, {IP, Port}, [], Data);
+send(S, {{A,B,C,D,E,F,G,H}, Port} = Addr, AncData, Data)
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Addr, AncData, Data);
+send(S, {?FAMILY, {{A,B,C,D,E,F,G,H}, Port}} = Address, AncData, Data)
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data);
+send(S, {?FAMILY, {loopback, Port}} = Address, AncData, Data)
+  when ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data).
 
 send(S, Data) ->
-    prim_inet:sendto(S, {0,0,0,0,0,0,0,0}, 0, Data).
+    prim_inet:sendto(S, {any, 0}, [], Data).
     
-connect(S, Addr = {A,B,C,D,E,F,G,H}, P) 
-  when ?ip6(A,B,C,D,E,F,G,H), ?port(P) ->
-    prim_inet:connect(S, Addr, P).
+connect(S, Addr = {A,B,C,D,E,F,G,H}, Port) 
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port) ->
+    prim_inet:connect(S, Addr, Port).
 
 recv(S, Len) ->
     prim_inet:recvfrom(S, Len).
diff --git a/lib/kernel/src/inet_udp.erl b/lib/kernel/src/inet_udp.erl
index 1e624b9e90..083059a2dc 100644
--- a/lib/kernel/src/inet_udp.erl
+++ b/lib/kernel/src/inet_udp.erl
@@ -66,16 +66,25 @@ open(Port, Opts) ->
 	{ok, _} -> exit(badarg)
     end.
 
-send(S, {A,B,C,D} = Addr, P, Data)
-  when ?ip(A,B,C,D), ?port(P) ->
-    prim_inet:sendto(S, Addr, P, Data).
+send(S, {A,B,C,D} = IP, Port, Data)
+  when ?ip(A,B,C,D), ?port(Port) ->
+    prim_inet:sendto(S, {IP, Port}, [], Data);
+send(S, {{A,B,C,D}, Port} = Addr, AncData, Data)
+  when ?ip(A,B,C,D), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Addr, AncData, Data);
+send(S, {?FAMILY, {{A,B,C,D}, Port}} = Address, AncData, Data)
+  when ?ip(A,B,C,D), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data);
+send(S, {?FAMILY, {loopback, Port}} = Address, AncData, Data)
+  when ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data).
 
 send(S, Data) ->
-    prim_inet:sendto(S, {0,0,0,0}, 0, Data).
+    prim_inet:sendto(S, {any, 0}, [], Data).
     
-connect(S, Addr = {A,B,C,D}, P)
-  when ?ip(A,B,C,D), ?port(P) ->
-    prim_inet:connect(S, Addr, P).
+connect(S, Addr = {A,B,C,D}, Port)
+  when ?ip(A,B,C,D), ?port(Port) ->
+    prim_inet:connect(S, Addr, Port).
 
 recv(S, Len) ->
     prim_inet:recvfrom(S, Len).
diff --git a/lib/kernel/src/local_udp.erl b/lib/kernel/src/local_udp.erl
index 481a8c4910..933e56228b 100644
--- a/lib/kernel/src/local_udp.erl
+++ b/lib/kernel/src/local_udp.erl
@@ -70,11 +70,13 @@ open(0, Opts) ->
 	{ok, _} -> exit(badarg)
     end.
 
-send(S, Addr = {?FAMILY,_}, 0, Data) ->
-    prim_inet:sendto(S, Addr, 0, Data).
+send(S, {?FAMILY,_} = Addr, 0, Data) ->
+    prim_inet:sendto(S, Addr, [], Data);
+send(S, {?FAMILY,_} = Addr, AncData, Data) when is_list(AncData) ->
+    prim_inet:sendto(S, Addr, AncData, Data).
 %%
 send(S, Data) ->
-    prim_inet:sendto(S, {?FAMILY,<<>>}, 0, Data).
+    prim_inet:sendto(S, {?FAMILY,<<>>}, [], Data).
 
 connect(S, Addr = {?FAMILY,_}, 0) ->
     prim_inet:connect(S, Addr, 0).