diff options
| author | Anders Svensson <[email protected]> | 2017-07-25 01:27:58 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-08-03 17:17:37 +0200 |
| commit | b3d9e0c09ff9d8f963b6084a84ab120cd423a9ae (patch) | |
| tree | fa6a4a1318ebd3975fe1964d681eff01817137cc /lib/diameter/src/base/diameter_traffic.erl | |
| parent | a14ba6581063c4fca2edc36156e07c6582729e2e (diff) | |
| download | otp-b3d9e0c09ff9d8f963b6084a84ab120cd423a9ae.tar.gz otp-b3d9e0c09ff9d8f963b6084a84ab120cd423a9ae.tar.bz2 otp-b3d9e0c09ff9d8f963b6084a84ab120cd423a9ae.zip | |
Redo message decode as a single pass
Decode has previously been two passes: first chunk the message into a
reversed list of toplevel diameter_avp records, then fold through the
reversed list to build the full result. Various workarounds have made it
a bit more convoluted than it should be however. Rework it completely,
turning the previous 2-pass tail-recursive implementation into a 1-pass
body recursive one.
The relay decode still exists in diameter_codec, as a stripped down
version of the full decode in diameter_gen.
Diffstat (limited to 'lib/diameter/src/base/diameter_traffic.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_traffic.erl | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl index 3463a93568..3194cb4bf1 100644 --- a/lib/diameter/src/base/diameter_traffic.erl +++ b/lib/diameter/src/base/diameter_traffic.erl @@ -327,9 +327,7 @@ recv_request(Ack, %% A request was sent for an application that is not %% supported. RC = 3007, - Es = Pkt#diameter_packet.errors, - DecPkt = Pkt#diameter_packet{avps = collect_avps(Pkt), - errors = [RC | Es]}, + DecPkt = diameter_codec:collect_avps(Pkt), send_answer(answer_message(RC, Dict0, Caps, DecPkt), TPid, Dict0, @@ -345,14 +343,6 @@ recv_request(Ack, decode(Id, Dict, #recvdata{codec = Opts}, Pkt) -> errors(Id, diameter_codec:decode(Id, Dict, Opts, Pkt)). -collect_avps(Pkt) -> - case diameter_codec:collect_avps(Pkt) of - {_Error, Avps} -> - Avps; - Avps -> - Avps - end. - %% send_A/7 send_A([T | Fs], TPid, App, Dict0, RecvData, DecPkt, Caps) -> |