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

2 files changed, 24 insertions, 19 deletions

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).
 
 %% ===========================================================================