Merge branch 'anders/diameter/loopback_any/OTP-14544' into maint

* anders/diameter/loopback_any/OTP-14544:
  Use loopback/any config in examples suite
  Handle loopback/any as local address in diameter_tcp/sctp

6 files changed, 111 insertions, 91 deletions

diff --git a/lib/diameter/doc/src/diameter_sctp.xml b/lib/diameter/doc/src/diameter_sctp.xml
index 9b6d629f79..c9b74a9ec5 100644
--- a/lib/diameter/doc/src/diameter_sctp.xml
+++ b/lib/diameter/doc/src/diameter_sctp.xml
@@ -16,7 +16,7 @@
 <header>
 <copyright>
 <year>2011</year>
-<year>2016</year>
+<year>2017</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -116,7 +116,6 @@ and port respectively.</p>
 Multiple <c>ip</c> options can be specified for a multihomed peer.
 If none are specified then the values of <c>Host-IP-Address</c>
 in the <c>diameter_service</c> record are used.
-(In particular, one of these must be specified.)
 Option <c>port</c> defaults to 3868 for a listening transport and 0 for a
 connecting transport.</p>
 
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml
index 6ca280c52b..1d65d14257 100644
--- a/lib/diameter/doc/src/diameter_tcp.xml
+++ b/lib/diameter/doc/src/diameter_tcp.xml
@@ -170,14 +170,11 @@ that will not be forthcoming, which will eventually cause the RFC 3539
 watchdog to take down the connection.</p>
 
 <p>
-If an <c>ip</c> option is not specified then the first element of a
-non-empty <c>Host-IP-Address</c> list in <c>Svc</c> provides the local
-IP address.
-If neither is specified then the default address selected by &gen_tcp;
-is used.
-In all cases, the selected address is either returned from
-&start; or passed in a <c>connected</c> message over the transport
-interface.</p>
+The first element of a non-empty <c>Host-IP-Address</c> list in
+<c>Svc</c> provides the local IP address if an <c>ip</c> option is not
+specified.
+The local address is either returned from&start; or passed in a
+<c>connected</c> message over the transport interface.</p>
 </desc>
 </func>
 
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index a0104fac6e..e30d7f5cd7 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -156,12 +156,7 @@ start(T, Svc, Opts)
         = Svc,
     diameter_sctp_sup:start(),  %% start supervisors on demand
     Addrs = Caps#diameter_caps.host_ip_address,
-    s(T, Addrs, Pid, lists:map(fun ip/1, Opts)).
-
-ip({ifaddr, A}) ->
-    {ip, A};
-ip(T) ->
-    T.
+    s(T, Addrs, Pid, Opts).
 
 %% A listener spawns transports either as a consequence of this call
 %% when there is not yet an association to assign it, or at comm_up on
@@ -354,23 +349,35 @@ l([], Ref, T) ->
 %% open/3
 
 open(Addrs, Opts, PortNr) ->
-    {LAs, Os} = addrs(Addrs, Opts),
-    {LAs, case gen_sctp:open(gen_opts(portnr(Os, PortNr))) of
-              {ok, Sock} ->
-                  Sock;
-              {error, Reason} ->
-                  x({open, Reason})
-          end}.
+    case gen_sctp:open(gen_opts(portnr(addrs(Addrs, Opts), PortNr))) of
+        {ok, Sock} ->
+            {addrs(Sock), Sock};
+        {error, Reason} ->
+            x({open, Reason})
+    end.
 
 addrs(Addrs, Opts) ->
-    case proplists:split(Opts, [ip]) of
-        {[[]], _} ->
-            {Addrs, Opts ++ [{ip, A} || A <- Addrs]};
-        {[As], Os} ->
-            LAs = [diameter_lib:ipaddr(A) || {ip, A} <- As],
-            {LAs, Os ++ [{ip, A} || A <- LAs]}
+    case lists:mapfoldl(fun ipaddr/2, false, Opts) of
+        {Os, true} ->
+            Os;
+        {_, false} ->
+            Opts ++ [{ip, A} || A <- Addrs]
     end.
 
+ipaddr({K,A}, _)
+  when K == ifaddr;
+       K == ip ->
+    {{ip, ipaddr(A)}, true};
+ipaddr(T, B) ->
+    {T, B}.
+
+ipaddr(A)
+  when A == loopback;
+       A == any ->
+    A;
+ipaddr(A) ->
+    diameter_lib:ipaddr(A).
+
 portnr(Opts, PortNr) ->
     case proplists:get_value(port, Opts) of
         undefined ->
@@ -379,6 +386,14 @@ portnr(Opts, PortNr) ->
             Opts
     end.
 
+addrs(Sock) ->
+    case inet:socknames(Sock) of
+        {ok, As} ->
+            [A || {A,_} <- As];
+        {error, Reason} ->
+            x({socknames, Reason})
+    end.
+
 %% x/1
 
 x(Reason) ->
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 5d7bca059a..2b7371df22 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -142,8 +142,7 @@
    -> {ok, pid(), [inet:ip_address()]}
  when Ref :: diameter:transport_ref();
            ({connect, Ref}, #diameter_service{}, [connect_option()])
-   -> {ok, pid(), [inet:ip_address()]}
-    | {ok, pid()}
+   -> {ok, pid()}
  when Ref :: diameter:transport_ref().
 
 start({T, Ref}, Svc, Opts) ->
@@ -258,22 +257,14 @@ i(#monitor{parent = Pid, transport = TPid} = S) ->
 
 i({listen, Ref, {Mod, Opts, Addrs}}) ->
     [_] = diameter_config:subscribe(Ref, transport), %% assert existence
-    {[LA, LP], Rest} = proplists:split(Opts, [ip, port]),
-    LAddrOpt = get_addr(LA, Addrs),
-    LPort = get_port(LP),
-    {ok, LSock} = Mod:listen(LPort, gen_opts(LAddrOpt, Rest)),
-    LAddr = laddr(LAddrOpt, Mod, LSock),
+    {[LP], Rest} = proplists:split(Opts, [port]),
+    {ok, LSock} = Mod:listen(get_port(LP), gen_opts(Addrs, Rest)),
+    {ok, {LAddr, _}} = sockname(Mod, LSock),
     true = diameter_reg:add_new({?MODULE, listener, {Ref, {LAddr, LSock}}}),
     proc_lib:init_ack({ok, self(), {LAddr, LSock}}),
     #listener{socket = LSock,
               module = Mod}.
 
-laddr([], Mod, Sock) ->
-    {ok, {Addr, _Port}} = sockname(Mod, Sock),
-    Addr;
-laddr([{ip, Addr}], _, _) ->
-    Addr.
-
 ssl_opts([]) ->
     false;
 ssl_opts([{ssl_options, true}]) ->
@@ -308,24 +299,16 @@ init(accept = T, Ref, Mod, Pid, Opts, Addrs, SvcPid) ->
     Sock;
 
 init(connect = T, Ref, Mod, Pid, Opts, Addrs, _SvcPid) ->
-    {[LA, RA, RP], Rest} = proplists:split(Opts, [ip, raddr, rport]),
-    LAddrOpt = get_addr(LA, Addrs),
+    {[RA, RP], Rest} = proplists:split(Opts, [raddr, rport]),
     RAddr = get_addr(RA),
     RPort = get_port(RP),
-    proc_lib:init_ack(init_rc(LAddrOpt)),
-    Sock = ok(connect(Mod, RAddr, RPort, gen_opts(LAddrOpt, Rest))),
+    proc_lib:init_ack({ok, self()}),
+    Sock = ok(connect(Mod, RAddr, RPort, gen_opts(Addrs, Rest))),
     publish(Mod, T, Ref, Sock),
-    up(Pid, {RAddr, RPort}, LAddrOpt, Mod, Sock),
+    up(Pid, {RAddr, RPort}, Mod, Sock),
     Sock.
 
-init_rc([{ip, Addr}]) ->
-    {ok, self(), [Addr]};
-init_rc([]) ->
-    {ok, self()}.
-
-up(Pid, Remote, [{ip, _Addr}], _, _) ->
-    diameter_peer:up(Pid, Remote);
-up(Pid, Remote, [], Mod, Sock) ->
+up(Pid, Remote, Mod, Sock) ->
     {Addr, _Port} = ok(sockname(Mod, Sock)),
     diameter_peer:up(Pid, Remote, [Addr]).
 
@@ -382,25 +365,41 @@ l([{{?MODULE, listener, {_, AS}}, LPid}], _, _) ->
 l([], Ref, T) ->
     diameter_tcp_sup:start_child({listen, Ref, T}).
 
-%% get_addr/1
+%% addrs/2
+%%
+%% Take the first address from the service if several are specified
+%% and not address is configured.
+
+addrs(Addrs, Opts) ->
+    case lists:mapfoldr(fun ipaddr/2, [], Opts) of
+        {Os, [_]} ->
+            Os;
+        {_, []} ->
+            Opts ++ [{ip, A} || [A|_] <- [Addrs]];
+        {_, As} ->
+            ?ERROR({invalid_addrs, As, Addrs})
+    end.
 
-get_addr(As) ->
-    diameter_lib:ipaddr(addr(As, [])).
+ipaddr({K,A}, As)
+  when K == ifaddr;
+       K == ip ->
+    {{ip, ipaddr(A)}, [A | As]};
+ipaddr(T, B) ->
+    {T, B}.
 
-%% get_addr/2
+ipaddr(A)
+  when A == loopback;
+       A == any ->
+    A;
+ipaddr(A) ->
+    diameter_lib:ipaddr(A).
 
-get_addr([], []) ->
-    [];
-get_addr(As, Def) ->
-    [{ip, diameter_lib:ipaddr(addr(As, Def))}].
+%% get_addr/1
 
-%% Take the first address from the service if several are unspecified.
-addr([], [Addr | _]) ->
-    Addr;
-addr([{_, Addr}], _) ->
-    Addr;
-addr(As, Addrs) ->
-    ?ERROR({invalid_addrs, As, Addrs}).
+get_addr([{_, Addr}]) ->
+    diameter_lib:ipaddr(Addr);
+get_addr(Addrs) ->
+    ?ERROR({invalid_addrs, Addrs}).
 
 %% get_port/1
 
@@ -413,10 +412,15 @@ get_port(Ps) ->
 
 %% gen_opts/2
 
-gen_opts(LAddrOpt, Opts) ->
+gen_opts(Addrs, Opts) ->
+    gen_opts(addrs(Addrs, Opts)).
+
+%% gen_opts/1
+
+gen_opts(Opts) ->
     {L,_} = proplists:split(Opts, [binary, packet, active]),
     [[],[],[]] == L orelse ?ERROR({reserved_options, Opts}),
-    [binary, {packet, 0}, {active, false}] ++ LAddrOpt ++ Opts.
+    [binary, {packet, 0}, {active, false} | Opts].
 
 %% ---------------------------------------------------------------------------
 %% # ports/1
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
index eb99f10fe6..ee44ed8dc9 100644
--- a/lib/diameter/test/diameter_examples_SUITE.erl
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -344,7 +344,7 @@ top(Dir, LibDir) ->
 start({server, Prot}) ->
     ok = diameter:start(),
     ok = server:start(),
-    {ok, Ref} = server:listen(Prot),
+    {ok, Ref} = server:listen({Prot, any, 3868}),
     [_] = ?util:lport(Prot, Ref),
     ok;
 
@@ -352,7 +352,7 @@ start({client = Svc, Prot}) ->
     ok = diameter:start(),
     true = diameter:subscribe(Svc),
     ok = client:start(),
-    {ok, Ref} = client:connect(Prot),
+    {ok, Ref} = client:connect({Prot, loopback, loopback, 3868}),
     receive #diameter_event{info = {up, Ref, _, _, _}} -> ok end;
 
 start(Config) ->
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 9d981d0a2b..284d2b9566 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -349,35 +349,40 @@ rand_bytes(N) ->
 %% start_connect/3
 
 start_connect(Prot, PortNr, Ref) ->
-    {ok, TPid, [?ADDR]} = start_connect(Prot,
-                                        {connect, Ref},
-                                        ?SVC([]),
-                                        [{raddr, ?ADDR},
-                                         {rport, PortNr},
-                                         {ip, ?ADDR},
-                                         {port, 0}]),
-    ?RECV(?TMSG({TPid, connected, _})),
+    {ok, TPid} = start_connect(Prot,
+                               {connect, Ref},
+                               ?SVC([]),
+                               [{raddr, ?ADDR},
+                                {rport, PortNr},
+                                {ip, ?ADDR},
+                                {port, 0}]),
+    connected(Prot, TPid),
     TPid.
 
+connected(sctp, TPid) ->
+    ?RECV(?TMSG({TPid, connected, _}));
+connected(tcp, TPid) ->
+    ?RECV(?TMSG({TPid, connected, _, [?ADDR]})).
+
 start_connect(sctp, T, Svc, Opts) ->
-    diameter_sctp:start(T, Svc, [{sctp_initmsg, ?SCTP_INIT} | Opts]);
+    {ok, TPid, [?ADDR]}
+        = diameter_sctp:start(T, Svc, [{sctp_initmsg, ?SCTP_INIT} | Opts]),
+    {ok, TPid};
 start_connect(tcp, T, Svc, Opts) ->
     diameter_tcp:start(T, Svc, Opts).
 
 %% start_accept/2
 
 start_accept(Prot, Ref) ->
-    {Mod, Opts} = tmod(Prot),
-    {ok, TPid, [?ADDR]} = Mod:start({accept, Ref},
-                                    ?SVC([?ADDR]),
-                                    [{port, 0} | Opts]),
+    {ok, TPid, [?ADDR]}
+        = start_accept(Prot, {accept, Ref}, ?SVC([?ADDR]), [{port, 0}]),
     ?RECV(?TMSG({TPid, connected})),
     TPid.
 
-tmod(sctp) ->
-    {diameter_sctp, [{sctp_initmsg, ?SCTP_INIT}]};
-tmod(tcp) ->
-    {diameter_tcp, []}.
+start_accept(sctp, T, Svc, Opts) ->
+    diameter_sctp:start(T, Svc, [{sctp_initmsg, ?SCTP_INIT} | Opts]);
+start_accept(tcp, T, Svc, Opts) ->
+    diameter_tcp:start(T, Svc, Opts).
 
 %% ===========================================================================