From a138f8420ed0386c6200899254190600bf121f97 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Tue, 25 Oct 2011 17:16:52 +0200
Subject: Use trivial capabilities callback in traffic suite

---
 lib/diameter/test/diameter_traffic_SUITE.erl |  6 +++++-
 lib/diameter/test/diameter_util.erl          | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 522b00e781..55c5fc7c54 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -246,7 +246,7 @@ start_services(_Config) ->
     ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT)).
 
 add_transports(Config) ->
-    LRef = ?util:listen(?SERVER, tcp),
+    LRef = ?util:listen(?SERVER, tcp, [{capabilities_cb, fun capx/2}]),
     CRef = ?util:connect(?CLIENT, tcp, LRef),
     ?util:write_priv(Config, "transport", {LRef, CRef}).
 
@@ -261,6 +261,10 @@ stop_services(_Config) ->
 stop(_Config) ->
     ok = diameter:stop().
 
+capx(_, #diameter_caps{origin_host = {OH,DH}}) ->
+    io:format("connection: ~p -> ~p~n", [DH,OH]),
+    ok.
+
 %% ===========================================================================
 
 %% Ensure that result codes have the expected values.
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
index 3fe8ea5363..6b1dc1f0c9 100644
--- a/lib/diameter/test/diameter_util.erl
+++ b/lib/diameter/test/diameter_util.erl
@@ -33,8 +33,8 @@
 %% diameter-specific
 -export([lport/2,
          lport/3,
-         listen/2,
-         connect/3,
+         listen/2, listen/3,
+         connect/3, connect/4,
          disconnect/4]).
 
 %% common_test-specific
@@ -254,22 +254,28 @@ lp(M, Ref, T) ->
     end.
 
 %% ---------------------------------------------------------------------------
-%% listen/2
+%% listen/2-3
 %%
 %% Add a listening transport on the loopback address and a free port.
 
 listen(SvcName, Prot) ->
-    add_transport(SvcName, {listen, opts(Prot, listen)}).
+    listen(SvcName, Prot, []).
+
+listen(SvcName, Prot, Opts) ->
+    add_transport(SvcName, {listen, opts(Prot, listen) ++ Opts}).
 
 %% ---------------------------------------------------------------------------
-%% connect/3
+%% connect/2-3
 %%
 %% Add a connecting transport on and connect to a listening transport
 %% with the specified reference.
 
 connect(Client, Prot, LRef) ->
+    connect(Client, Prot, LRef, []).
+
+connect(Client, Prot, LRef, Opts) ->
     [PortNr] = lport(Prot, LRef, 20),
-    Ref = add_transport(Client, {connect, opts(Prot, PortNr)}),
+    Ref = add_transport(Client, {connect, opts(Prot, PortNr) ++ Opts}),
     true = diameter:subscribe(Client),
     ok = receive
              {diameter_event, Client, {up, Ref, _, _, _}} -> ok
-- 
cgit v1.2.3