Let candidate peers be passed to diameter:call/4

To solve the problem of being able to send messages to a peer that
hasn't advertised support for the application in question, as discussed
in the parent commit. diameter:call/4 can be passed 'peer' options to
identify candidates, and the only requirement is that an appropriate
dictionary be configured for encode. Filters are applied as if
candidates had been selected by advertised application.

1 files changed, 92 insertions, 21 deletions

diff --git a/lib/diameter/test/diameter_dpr_SUITE.erl b/lib/diameter/test/diameter_dpr_SUITE.erl
index 55702fbf78..779b919d3c 100644
--- a/lib/diameter/test/diameter_dpr_SUITE.erl
+++ b/lib/diameter/test/diameter_dpr_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@
 -export([suite/0,
          all/0,
          groups/0,
+         init_per_suite/1,
+         end_per_suite/1,
          init_per_group/2,
          end_per_group/2]).
 
@@ -56,16 +58,12 @@
 
 %% Config for diameter:start_service/2.
 -define(SERVICE(Host),
-        [{'Origin-Host', Host},
+        [{'Origin-Host', Host ++ ".erlang.org"},
          {'Origin-Realm', "erlang.org"},
          {'Host-IP-Address', [?ADDR]},
          {'Vendor-Id', hd(Host)},  %% match this in disconnect/5
          {'Product-Name', "OTP/diameter"},
-         {'Acct-Application-Id', [0]},
-         {restrict_connections, false},
-         {application, [{dictionary, diameter_gen_base_rfc6733},
-                        {alias, common},
-                        {module, #diameter_callback{_ = false}}]}]).
+         {restrict_connections, false}]).
 
 %% Disconnect reasons that diameter passes as the first argument of a
 %% function configured as disconnect_cb.
@@ -89,13 +87,19 @@ suite() ->
     [{timetrap, {seconds, 60}}].
 
 all() ->
-    [start, send_dpr, stop | [{group, R} || R <- ?REASONS]].
+    [{group, R} || R <- [client, server, uncommon | ?REASONS]].
 
 %% The group determines how transports are terminated: by remove_transport,
 %% stop_service or application stop.
 groups() ->
-    Ts = tc(),
-    [{R, [], Ts} || R <- ?REASONS].
+    [{R, [], [start, send_dpr, stop]} || R <- [client, server, uncommon]]
+        ++ [{R, [], Ts} || Ts <- [tc()], R <- ?REASONS].
+
+init_per_suite(Config) ->  %% not need, but a useful place to enable trace
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
 
 init_per_group(Name, Config) ->
     [{group, Name} | Config].
@@ -107,29 +111,86 @@ tc() ->
     [start, connect, remove_transport, stop_service, check, stop].
 
 %% ===========================================================================
-%% start/stop testcases
 
-start(_Config) ->
-    ok = diameter:start(),
-    ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER)),
-    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT)).
+%% start/1
 
-send_dpr(_Config) ->
+start(Config)
+  when is_list(Config) ->
+    Grp = group(Config),
+    ok = diameter:start(),
+    ok = diameter:start_service(?SERVER, service(?SERVER, Grp)),
+    ok = diameter:start_service(?CLIENT, service(?CLIENT, Grp)).
+
+service(?SERVER = Svc, _) ->
+    ?SERVICE(Svc)
+        ++ [{'Acct-Application-Id', [0,3]},
+            {application, [{dictionary, diameter_gen_base_rfc6733},
+                           {alias, common},
+                           {module, #diameter_callback{_ = false}}]},
+            {application, [{dictionary, diameter_gen_acct_rfc6733},
+                           {alias, acct},
+                           {module, #diameter_callback{_ = false}}]}];
+
+%% Client that receives a server DPR despite no explicit support for
+%% Diameter common messages.
+service(?CLIENT = Svc, server) ->
+    ?SERVICE(Svc)
+        ++ [{'Acct-Application-Id', [3]},
+            {application, [{dictionary, diameter_gen_acct_rfc6733},
+                           {alias, acct},
+                           {module, #diameter_callback{_ = false}}]}];
+
+%% Client that sends DPR despite advertised only the accounting
+%% application. The dictionary is required for encode.
+service(?CLIENT = Svc, uncommon) ->
+    ?SERVICE(Svc)
+        ++ [{'Acct-Application-Id', [3]},
+            {application, [{dictionary, diameter_gen_base_rfc6733},
+                           {alias, common},
+                           {module, #diameter_callback{_ = false}}]},
+            {application, [{dictionary, diameter_gen_acct_rfc6733},
+                           {alias, acct},
+                           {module, #diameter_callback{_ = false}}]}];
+
+service(?CLIENT = Svc, _) ->
+    ?SERVICE(Svc)
+        ++ [{'Auth-Application-Id', [0]},
+            {application, [{dictionary, diameter_gen_base_rfc6733},
+                           {alias, common},
+                           {module, #diameter_callback{_ = false}}]}].
+
+%% send_dpr/1
+
+send_dpr(Config) ->
     LRef = ?util:listen(?SERVER, tcp),
     Ref = ?util:connect(?CLIENT, tcp, LRef, [{dpa_timeout, 10000}]),
+    Svc = sender(group(Config)),
+    [Info] = diameter:service_info(Svc, connections),
+    {_, {TPid, _}} = lists:keyfind(peer, 1, Info),
     #diameter_base_DPA{'Result-Code' = 2001}
-        = diameter:call(?CLIENT,
+        = diameter:call(Svc,
                         common,
-                        ['DPR', {'Origin-Host', "CLIENT.erlang.org"},
-                                {'Origin-Realm', "erlang.org"},
-                                {'Disconnect-Cause', 0}]),
-    ok =  receive  %% endure the transport dies on DPA
+                        ['DPR', {'Origin-Host', Svc ++ ".erlang.org"},
+                         {'Origin-Realm', "erlang.org"},
+                         {'Disconnect-Cause', 0}],
+                        [{peer, TPid}]),
+    ok =  receive  %% ensure the transport dies on DPA
               #diameter_event{service = ?CLIENT, info = {down, Ref, _, _}} ->
                   ok
           after 5000 ->
                   erlang:process_info(self(), messages)
           end.
 
+%% sender/1
+
+sender(server) ->
+    ?SERVER;
+
+sender(_) ->
+    ?CLIENT.
+
+%% connect/1
+
 connect(Config) ->
     Pid = spawn(fun init/0),  %% process for disconnect_cb to bang
     Grp = group(Config),
@@ -138,16 +199,22 @@ connect(Config) ->
             || RCs <- ?RETURNS],
     ?util:write_priv(Config, config, [Pid | Refs]).
 
+%% remove_transport/1
+
 %% Remove all the client transports only in the transport group.
 remove_transport(Config) ->
     transport == group(Config)
         andalso (ok = diameter:remove_transport(?CLIENT, true)).
 
+%% stop_service/1
+
 %% Stop the service only in the service group.
 stop_service(Config) ->
     service == group(Config)
         andalso (ok = diameter:stop_service(?CLIENT)).
 
+%% check/1
+
 %% Check for callbacks before diameter:stop/0, not the other way around
 %% for the timing reason explained below.
 check(Config) ->
@@ -157,9 +224,13 @@ check(Config) ->
     Dict = receive {Pid, D} -> D end,  %% get it
     check(Refs, ?RETURNS, Grp, Dict).  %% check for callbacks
 
+%% stop/1
+
 stop(_Config) ->
     ok = diameter:stop().
 
+%% ===========================================================================
+
 %% Whether or not there are callbacks after diameter:stop() depends on
 %% timing as long as the server runs on the same node: a server
 %% transport could close the connection before the client has chance