aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <anders@erlang.org>2015-05-16 21:35:39 +0200
committerAnders Svensson <anders@erlang.org>2015-05-18 14:10:43 +0200
commit5350bf6cbd16a02ff4edea73f3285069221d3210 (patch)
tree70159319ff216671fcbdf7eb4a32cf95514c67e2
parent2599f843ccb48193348d75c287a9cfd507d09d08 (diff)
downloadotp-5350bf6cbd16a02ff4edea73f3285069221d3210.tar.gz
otp-5350bf6cbd16a02ff4edea73f3285069221d3210.tar.bz2
otp-5350bf6cbd16a02ff4edea73f3285069221d3210.zip
Lift answer send up the call chain
As the first step in starting to count outgoing, relayed answer messages.
-rw-r--r--lib/diameter/src/base/diameter_traffic.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index ad63e5b150..e13713d3c0 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -524,7 +524,7 @@ send_A(_, _, _, _) ->
%% send_A/6
send_A(T, TPid, DictT, ReqPkt, EvalPktFs, EvalFs) ->
- reply(T, TPid, DictT, EvalPktFs, ReqPkt),
+ send(TPid, reply(T, TPid, DictT, EvalPktFs, ReqPkt)),
lists:foreach(fun diameter_lib:eval/1, EvalFs).
%% answer/6
@@ -643,7 +643,7 @@ resend(false,
%%
%% Relay a reply to a relayed request.
-%% Answer from the peer: reset the hop by hop identifier and send.
+%% Answer from the peer: reset the hop by hop identifier.
resend(#diameter_packet{bin = B}
= Pkt,
_Caps,
@@ -686,9 +686,9 @@ reply({Dict, Ans}, TPid, {AppDict, Dict0}, Fs, ReqPkt) ->
local(Ans, TPid, {Dict, AppDict, Dict0}, Fs, ReqPkt);
%% ... or relayed.
-reply(#diameter_packet{} = Pkt, TPid, _Dict0, Fs, _ReqPkt) ->
+reply(#diameter_packet{} = Pkt, _TPid, _Dict0, Fs, _ReqPkt) ->
eval_packet(Pkt, Fs),
- send(TPid, Pkt).
+ Pkt.
%% local/5
%%
@@ -708,7 +708,7 @@ local(Msg, TPid, {Dict, AppDict, Dict0} = DictT, Fs, ReqPkt) ->
Fs),
incr(send, Pkt, TPid, AppDict),
incr_rc(send, Pkt, TPid, DictT), %% count outgoing
- send(TPid, Pkt).
+ Pkt.
%% reset/3