aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter_traffic.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-09-05 15:00:58 +0200
committerAnders Svensson <[email protected]>2017-09-05 15:00:58 +0200
commit31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69 (patch)
treeaf3f1c1c58a0906ac5c9b074996a7e9d75f4ffcd /lib/diameter/src/base/diameter_traffic.erl
parent67f6114d3701dd38614acf520f13c07174a99d11 (diff)
parenteb54c14b3c0ad26c365e6be70256f16fc8e72d70 (diff)
downloadotp-31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69.tar.gz
otp-31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69.tar.bz2
otp-31c4defc94c44f8cdb2bd54b0a4f829f47e4ac69.zip
Merge branch 'anders/diameter/DOIC/OTP-14588' into maint
* anders/diameter/DOIC/OTP-14588: Exercise avp_dictionaries in traffic suite Let generic AVPs be encoded/decoded in alternate dictionaries Rename field in codec map: dictionary -> app_dictionary Add RFC 7683 Diameter Overload Indicator Conveyance text and dictionary Fix decode undef Fix dictionary compilation error message
Diffstat (limited to 'lib/diameter/src/base/diameter_traffic.erl')
-rw-r--r--lib/diameter/src/base/diameter_traffic.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 1a4bb4d0bf..f510f40a17 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -78,6 +78,7 @@
sequence :: diameter:sequence(),
counters :: boolean(),
codec :: #{decode_format := diameter:decode_format(),
+ avp_dictionaries => nonempty_list(module()),
string_decode := boolean(),
strict_arities => diameter:strict_arities(),
strict_mbit := boolean(),
@@ -108,6 +109,7 @@ make_recvdata([SvcName, PeerT, Apps, SvcOpts | _]) ->
sequence = Mask,
counters = B,
codec = maps:with([decode_format,
+ avp_dictionaries,
string_decode,
strict_arities,
strict_mbit,
@@ -352,6 +354,8 @@ recv_request(Ack,
No
end.
+%% decode/4
+
decode(Id, Dict, #recvdata{codec = Opts}, Pkt) ->
errors(Id, diameter_codec:decode(Id, Dict, Opts, Pkt)).
@@ -2021,4 +2025,4 @@ decode_opts(Dict) ->
strict_mbit => false,
failed_avp => false,
module => Dict,
- dictionary => Dict}.
+ app_dictionary => Dict}.