From d6b3b84abeef4a323a3ddfd89c9a6b131bcd11fc Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Mon, 28 Apr 2014 15:04:23 +0200
Subject: Count result codes in CEA/DWA/DPA

Corresponding counters for other answer messages have been counted
previously, but those for CEA, DWA, and DPA have been missing since
diameter itself sends these messages and the implementation is as bit
more separate than it might be. The counters are keyed on values of the
following form.

  {{ApplicationId, CommandCode, 0 = Rbit}, send|recv, {'Result-Code', RC}}
---
 lib/diameter/src/base/diameter_peer_fsm.erl | 53 ++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 17 deletions(-)

(limited to 'lib/diameter/src/base/diameter_peer_fsm.erl')

diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 282276827f..ae890d67d7 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. 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
@@ -613,9 +613,13 @@ rcv('DPR' = N, Pkt, S) ->
 %% DPA in response to DPR and with the expected identifiers.
 rcv('DPA' = N,
     #diameter_packet{header = #diameter_header{end_to_end_id = Eid,
-                                               hop_by_hop_id = Hid}},
-    #state{transport = TPid,
+                                               hop_by_hop_id = Hid}}
+    = Pkt,
+    #state{dictionary = Dict0,
+           transport = TPid,
            dpr = {Hid, Eid}}) ->
+
+    incr_A(recv, diameter_codec:decode(Dict0, Pkt), Dict0),
     diameter_peer:close(TPid),
     {stop, N};
 
@@ -623,6 +627,11 @@ rcv('DPA' = N,
 rcv(_, _, _) ->
     ok.
 
+%% incr_A/3
+
+incr_A(Dir, Pkt, Dict0) ->
+    diameter_traffic:incr_A(Dir, Pkt, self(), Dict0).
+
 %% send/2
 
 %% Msg here could be a #diameter_packet or a binary depending on who's
@@ -649,15 +658,18 @@ send_answer(Type, ReqPkt, #state{transport = TPid, dictionary = Dict} = S) ->
 
     %% An answer message clears the R and T flags and retains the P
     %% flag. The E flag is set at encode.
-    Pkt = #diameter_packet{header
-                           = H#diameter_header{version = ?DIAMETER_VERSION,
-                                               is_request = false,
-                                               is_error = undefined,
-                                               is_retransmitted = false},
-                           msg = Msg,
-                           transport_data = TD},
-
-    send(TPid, diameter_codec:encode(Dict, Pkt)),
+    Pkt0 = #diameter_packet{header
+                            = H#diameter_header{version = ?DIAMETER_VERSION,
+                                                is_request = false,
+                                                is_error = undefined,
+                                                is_retransmitted = false},
+                            msg = Msg,
+                            transport_data = TD},
+
+    Pkt = diameter_codec:encode(Dict, Pkt0),
+
+    incr_A(send, Pkt, Dict),
+    send(TPid, Pkt),
     eval(PostF, S).
 
 eval([F|A], S) ->
@@ -738,7 +750,7 @@ rejected(discard, T, _) ->
 rejected({N, Es}, T, S) ->
     {answer('CER', N, failed_avp(N, Es), S), T};
 rejected(N, T, S) ->
-    rejected({N, []}, T, S).
+    {answer('CER', N, [], S), T}.
 
 failed_avp(RC, [{RC, Avp} | _]) ->
     [{'Failed-AVP', [[{'AVP', [Avp]}]]}];
@@ -856,7 +868,7 @@ recv_CER(CER, #state{service = Svc, dictionary = Dict}) ->
             close({'CER', CER, Svc, Dict, Reason})
     end.
 
-%% handle_CEA/1
+%% handle_CEA/2
 
 handle_CEA(#diameter_packet{bin = Bin}
            = Pkt,
@@ -866,18 +878,18 @@ handle_CEA(#diameter_packet{bin = Bin}
   when is_binary(Bin) ->
     ?LOG(recv, 'CEA'),
 
-    #diameter_packet{msg = CEA}
+    #diameter_packet{}
         = DPkt
         = diameter_codec:decode(Dict0, Pkt),
 
+    RC = result_code(incr_A(recv, DPkt, Dict0)),
+
     {SApps, IS, RCaps} = recv_CEA(DPkt, S),
 
     #diameter_caps{origin_host = {OH, DH}}
         = Caps
         = capz(LCaps, RCaps),
 
-    RC = Dict0:'#get-'('Result-Code', CEA),
-
     %% Ensure that we don't already have a connection to the peer in
     %% question. This isn't the peer election of 3588 except in the
     %% sense that, since we don't know who we're talking to until we
@@ -885,6 +897,8 @@ handle_CEA(#diameter_packet{bin = Bin}
     %% connection with the peer.
 
     try
+        is_integer(RC)
+            orelse ?THROW(no_result_code),
         ?IS_SUCCESS(RC)
             orelse ?THROW(RC),
         [] == SApps
@@ -905,6 +919,11 @@ handle_CEA(#diameter_packet{bin = Bin}
 %% capabilities exchange could send DIAMETER_LIMITED_SUCCESS = 2002,
 %% even if this isn't required by RFC 3588.
 
+result_code({{'Result-Code', N}, _}) ->
+    N;
+result_code(_) ->
+    undefined.
+
 %% recv_CEA/2
 
 recv_CEA(#diameter_packet{header = #diameter_header{version
-- 
cgit v1.2.3