From 09b4d69fd706ee8aa7686828fe80590d6115bf64 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Sat, 7 Mar 2015 13:55:09 +0100
Subject: Add testcase for sending DPR with diameter:call/4

That currently fails when the resulting DPA is regarded as unsolicited
in diameter_peer_fsm, causing the request to timeout at the caller.
---
 lib/diameter/test/diameter_dpr_SUITE.erl | 38 +++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'lib/diameter/test/diameter_dpr_SUITE.erl')

diff --git a/lib/diameter/test/diameter_dpr_SUITE.erl b/lib/diameter/test/diameter_dpr_SUITE.erl
index f3f16b06e0..26e440d3d9 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-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2015. 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
@@ -32,6 +32,7 @@
 %% testcases
 -export([start/1,
          connect/1,
+         send_dpr/1,
          remove_transport/1,
          stop_service/1,
          check/1,
@@ -41,6 +42,7 @@
 -export([disconnect/5]).
 
 -include("diameter.hrl").
+-include("diameter_gen_base_rfc6733.hrl").
 
 %% ===========================================================================
 
@@ -51,9 +53,6 @@
 -define(CLIENT, "CLIENT").
 -define(SERVER, "SERVER").
 
--define(DICT_COMMON, ?DIAMETER_DICT_COMMON).
--define(APP_ID, ?DICT_COMMON:id()).
-
 %% Config for diameter:start_service/2.
 -define(SERVICE(Host),
         [{'Origin-Host', Host},
@@ -61,9 +60,10 @@
          {'Host-IP-Address', [?ADDR]},
          {'Vendor-Id', hd(Host)},  %% match this in disconnect/5
          {'Product-Name', "OTP/diameter"},
-         {'Acct-Application-Id', [?APP_ID]},
+         {'Acct-Application-Id', [0]},
          {restrict_connections, false},
-         {application, [{dictionary, ?DICT_COMMON},
+         {application, [{dictionary, diameter_gen_base_rfc6733},
+                        {alias, common},
                         {module, #diameter_callback{_ = false}}]}]).
 
 %% Disconnect reasons that diameter passes as the first argument of a
@@ -74,10 +74,12 @@
 -define(CAUSES, [0, rebooting, 1, busy, 2, goaway]).
 
 %% Establish one client connection for each element of this list,
-%% configured with disconnect/5 as disconnect_cb and returning the
-%% specified value.
+%% configured with disconnect/5, disconnect_cb returning the specified
+%% value.
 -define(RETURNS,
-        [[close, {dpr, [{cause, invalid}]}], [ignore, close], []]
+        [[close, {dpr, [{cause, invalid}]}],
+         [ignore, close],
+         []]
         ++ [[{dpr, [{timeout, 5000}, {cause, T}]}] || T <- ?CAUSES]).
 
 %% ===========================================================================
@@ -86,7 +88,7 @@ suite() ->
     [{timetrap, {seconds, 60}}].
 
 all() ->
-    [{group, R} || R <- ?REASONS].
+    [start, send_dpr, stop | [{group, R} || R <- ?REASONS]].
 
 %% The group determines how transports are terminated: by remove_transport,
 %% stop_service or application stop.
@@ -111,6 +113,22 @@ start(_Config) ->
     ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER)),
     ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT)).
 
+send_dpr(_Config) ->
+    LRef = ?util:listen(?SERVER, tcp),
+    Ref = ?util:connect(?CLIENT, tcp, LRef, []),
+    #diameter_base_DPA{'Result-Code' = 2001}
+        = diameter:call(?CLIENT,
+                        common,
+                        ['DPR', {'Origin-Host', "CLIENT.erlang.org"},
+                                {'Origin-Realm', "erlang.org"},
+                                {'Disconnect-Cause', 0}]),
+    ok =  receive  %% endure the transport dies on DPA
+              #diameter_event{service = ?CLIENT, info = {down, Ref, _, _}} ->
+                  ok
+          after 5000 ->
+                  erlang:process_info(self(), messages)
+          end.
+
 connect(Config) ->
     Pid = spawn(fun init/0),  %% process for disconnect_cb to bang
     Grp = group(Config),
-- 
cgit v1.2.3