diff options
| author | Anders Svensson <[email protected]> | 2017-09-02 16:17:47 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-09-04 15:45:04 +0200 |
| commit | 2a25b1f4a45430a2df973f3c632b5aae703d9b81 (patch) | |
| tree | ee4599d2cd53bee95e026b521a6029f66de6feed /lib/diameter/src/base/diameter_codec.erl | |
| parent | 382c88e5fdb92c6f97acad2f1c260cc69759b8e5 (diff) | |
| download | otp-2a25b1f4a45430a2df973f3c632b5aae703d9b81.tar.gz otp-2a25b1f4a45430a2df973f3c632b5aae703d9b81.tar.bz2 otp-2a25b1f4a45430a2df973f3c632b5aae703d9b81.zip | |
Let generic AVPs be encoded/decoded in alternate dictionaries
To support specifications like RFC 7683 DOIC, that only define AVPs, not
applications. AVPs that aren't known to the application dictionary in
question could previously not be decoded. Configuring alternate
dictionaries with the new transport/service option avp_dictionaries
changes this, so that AVPs like DOIC's Grouped OC-OLR can presented in
their fully decoded glory. Encode is also extended, allowing things like
the following to be encoded in an outgoing message:
'AVP' => [{'OC-OLR', #{'OC-Sequence-Number' => 1,
'OC-Report-Type' => 0,
'OC-Reduction-Percentage' => [25]}}]
A diameter_gen_doic_rfc7683 dictionary is installed, but
avp_dictionaries isn't specific to DOIC.
This commit also solves the problem demonstrated a few commits back,
that application AVPs aren't decoded in answers setting the E-bit. Test
coverage will come in a subsequent commit.
Diffstat (limited to 'lib/diameter/src/base/diameter_codec.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_codec.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl index 4f024f9947..2dd2c906a2 100644 --- a/lib/diameter/src/base/diameter_codec.erl +++ b/lib/diameter/src/base/diameter_codec.erl @@ -614,8 +614,8 @@ pack_avp(#diameter_avp{data = {T, {Type, Value}}}, Opts) -> pack_avp(#diameter_avp{data = {T, Data}}, _) -> pack_data(T, Data); -pack_avp(#diameter_avp{data = {Dict, Name, Data}}, Opts) -> - pack_data(Dict:avp_header(Name), Dict:avp(encode, Data, Name, Opts)); +pack_avp(#diameter_avp{data = {Dict, Name, Value}}, Opts) -> + pack_data(Dict:avp_header(Name), Dict:avp(encode, Value, Name, Opts)); %% ... with a truncated header ... pack_avp(#diameter_avp{code = undefined, data = B}, _) |