Merge branch 'anders/diameter/address_config/OTP-10986' into maint

* anders/diameter/address_config/OTP-10986:
  Comment fix
  More robust listening port lookup in test suites
  Update example client to allow default local address
  Make explicit local address to diameter_tcp:start/3 optional
  Add transport interface 'connected' message with local address list

7 files changed, 22 insertions, 51 deletions

diff --git a/lib/diameter/test/diameter_capx_SUITE.erl b/lib/diameter/test/diameter_capx_SUITE.erl
index 9e6619ecdd..8c9bb67e61 100644
--- a/lib/diameter/test/diameter_capx_SUITE.erl
+++ b/lib/diameter/test/diameter_capx_SUITE.erl
@@ -444,7 +444,7 @@ connect(Config, T, Opts) ->
     {CRef, LRef}.
 
 connect(LRef, Opts) ->
-    [PortNr] = ?util:lport(tcp, LRef, 20),
+    [PortNr] = ?util:lport(tcp, LRef),
     {ok, CRef} = diameter:add_transport(?CLIENT,
                                         {connect, opts(PortNr, Opts)}),
     CRef.
diff --git a/lib/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl
index 18bdcb1f54..94b4967921 100644
--- a/lib/diameter/test/diameter_event_SUITE.erl
+++ b/lib/diameter/test/diameter_event_SUITE.erl
@@ -100,7 +100,7 @@ start_server(Config) ->
     ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER, [?DICT_COMMON])),
     LRef = ?util:listen(?SERVER, tcp, [{capabilities_cb, fun capx_cb/2},
                                        {capx_timeout, ?SERVER_CAPX_TMO}]),
-    [PortNr] = ?util:lport(tcp, LRef, 20),
+    [PortNr] = ?util:lport(tcp, LRef),
     ?util:write_priv(Config, portnr, PortNr),
     start = event(?SERVER).
 
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
index 6d797f6911..585fc9d3b8 100644
--- a/lib/diameter/test/diameter_examples_SUITE.erl
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -283,7 +283,7 @@ start(server) ->
     ok = diameter:start(),
     ok = server:start(),
     {ok, Ref} = server:listen(tcp),
-    [_] = ?util:lport(tcp, Ref, 20),
+    [_] = ?util:lport(tcp, Ref),
     ok;
 
 start(client) ->
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl
index 77194a0f56..5a79c63d36 100644
--- a/lib/diameter/test/diameter_tls_SUITE.erl
+++ b/lib/diameter/test/diameter_tls_SUITE.erl
@@ -343,7 +343,7 @@ join(Strs) ->
 server(Host, {Caps, Opts}) ->
     ok = diameter:start_service(Host, ?SERVICE(Host, ?DICT_COMMON)),
     {ok, LRef} = diameter:add_transport(Host, ?LISTEN(Caps, Opts)),
-    {LRef, hd([_] = ?util:lport(tcp, LRef, 20))}.
+    {LRef, hd([_] = ?util:lport(tcp, LRef))}.
 
 sopts(?SERVER1, Dir) ->
     {inband_security([?TLS]),
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 893b7ba2f9..dab0bc4215 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -54,9 +54,6 @@
 -define(RECV(Pat, Ret), receive Pat -> Ret end).
 -define(RECV(Pat), ?RECV(Pat, now())).
 
-%% Or not.
--define(WAIT(Ms), receive after Ms -> now() end).
-
 %% Sockets are opened on the loopback address.
 -define(ADDR, {127,0,0,1}).
 
@@ -209,7 +206,7 @@ init(accept, {Prot, Ref}) ->
 
 init(gen_connect, {Prot, Ref}) ->
     %% Lookup the peer's listening socket.
-    [PortNr] = ?util:lport(Prot, Ref, 20),
+    [PortNr] = ?util:lport(Prot, Ref),
 
     %% Connect, send a message and receive it back.
     {ok, Sock} = gen_connect(Prot, PortNr),
@@ -230,7 +227,8 @@ init(gen_accept, {Prot, Ref}) ->
 
 init(connect, {Prot, Ref}) ->
     %% Lookup the peer's listening socket.
-    [{?TEST_LISTENER(_, PortNr), _}] = match(?TEST_LISTENER(Ref, '_')),
+    [{?TEST_LISTENER(_, PortNr), _}]
+        = diameter_reg:wait(?TEST_LISTENER(Ref, '_')),
 
     %% Start a connecting transport and receive notification of
     %% the connection.
@@ -246,18 +244,6 @@ init(connect, {Prot, Ref}) ->
     MRef = erlang:monitor(process, TPid),
     ?RECV({'DOWN', MRef, process, _, _}).
 
-match(Pat) ->
-    match(Pat, 20).
-
-match(Pat, T) ->
-    L = diameter_reg:match(Pat),
-    if [] /= L orelse 1 == T ->
-            L;
-       true ->
-            ?WAIT(50),
-            match(Pat, T-1)
-    end.
-
 bin(sctp, #diameter_packet{bin = Bin}) ->
     Bin;
 bin(tcp, Bin) ->
@@ -310,22 +296,18 @@ start_connect(tcp, T, Svc, Opts) ->
 %% start_accept/2
 %%
 %% Start transports sequentially by having each wait for a message
-%% from a job in a queue before commencing. Only one transport with
-%% a pending accept is started at a time since diameter_sctp currently
-%% assumes (and diameter currently implements) this.
+%% from a job in a queue before commencing. Only one transport with a
+%% pending accept is started at a time since diameter_{tcp,sctp}
+%% currently assume (and diameter currently implements) this.
 
 start_accept(Prot, Ref) ->
     Pid = sync(accept, Ref),
-
-    %% Configure the same port number for transports on the same
-    %% reference.
-    [PortNr | _] = ?util:lport(Prot, Ref) ++ [0],
     {Mod, Opts} = tmod(Prot),
 
     try
         {ok, TPid, [?ADDR]} = Mod:start({accept, Ref},
                                         ?SVC([?ADDR]),
-                                        [{port, PortNr} | Opts]),
+                                        [{port, 0} | Opts]),
         ?RECV(?TMSG({TPid, connected})),
         TPid
     after
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
index a9872f32e1..aa489fef5f 100644
--- a/lib/diameter/test/diameter_util.erl
+++ b/lib/diameter/test/diameter_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -33,7 +33,6 @@
 
 %% diameter-specific
 -export([lport/2,
-         lport/3,
          listen/2, listen/3,
          connect/3, connect/4,
          disconnect/4,
@@ -251,27 +250,17 @@ path(Config, Name) ->
     filename:join([Dir, Name]).
 
 %% ---------------------------------------------------------------------------
-%% lport/2-3
+%% lport/2
 %%
 %% Lookup the port number of a tcp/sctp listening transport.
 
-lport(M, Ref) ->
-    lport(M, Ref, 1).
+lport(M, {Node, Ref}) ->
+    rpc:call(Node, ?MODULE, lport, [M, Ref]);
 
-lport(M, {Node, Ref}, Tries) ->
-    rpc:call(Node, ?MODULE, lport, [M, Ref, Tries]);
-
-lport(M, Ref, Tries) ->
-    lp(tmod(M), Ref, Tries).
-
-lp(M, Ref, T) ->
-    L = [N || {listen, N, _} <- M:ports(Ref)],
-    if [] /= L orelse T =< 1 ->
-            L;
-       true ->
-            receive after 50 -> ok end,
-            lp(M, Ref, T-1)
-    end.
+lport(Prot, Ref) ->
+    Mod = tmod(Prot),
+    [_] = diameter_reg:wait({'_', listener, {Ref, '_'}}),
+    [N || {listen, N, _} <- Mod:ports(Ref)].
 
 %% ---------------------------------------------------------------------------
 %% listen/2-3
@@ -297,7 +286,7 @@ connect(Client, Prot, LRef) ->
     connect(Client, Prot, LRef, []).
 
 connect(Client, Prot, LRef, Opts) ->
-    [PortNr] = lport(Prot, LRef, 20),
+    [PortNr] = lport(Prot, LRef),
     Client = diameter:service_info(Client, name),  %% assert
     true = diameter:subscribe(Client),
     Ref = add_transport(Client, {connect, opts(Prot, PortNr) ++ Opts}),
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl
index 704bf110c7..b6e8730ec2 100644
--- a/lib/diameter/test/diameter_watchdog_SUITE.erl
+++ b/lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -524,7 +524,7 @@ cfg(listen, _) ->
 cfg(connect, Ref) ->
     [{{_, _, SvcName}, _Pid}] = diameter_reg:wait({listen, Ref, '_'}),
     [[{ref, LRef} | _]] = diameter:service_info(SvcName, transport),
-    [LP] = ?util:lport(tcp, LRef, 20),
+    [LP] = ?util:lport(tcp, LRef),
     [{raddr, ?ADDR}, {rport, LP}].
 
 %% ===========================================================================