diff options
| author | Anders Svensson <[email protected]> | 2015-06-22 00:39:48 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-06-22 00:39:48 +0200 |
| commit | 5fff4543e890229527c2b8875fbc96aa88c87ad9 (patch) | |
| tree | d884f1f39ffd44ac3aade7888a6d40db693d9341 /lib/diameter/src | |
| parent | 2bf100436c480c030200a655c82ec12fe55cdca4 (diff) | |
| parent | 7f4f9583bb1245c27ca58d88fe6862498a2df1f2 (diff) | |
| download | otp-5fff4543e890229527c2b8875fbc96aa88c87ad9.tar.gz otp-5fff4543e890229527c2b8875fbc96aa88c87ad9.tar.bz2 otp-5fff4543e890229527c2b8875fbc96aa88c87ad9.zip | |
Merge branch 'anders/diameter/grouped_errors/OTP-12721'
* anders/diameter/grouped_errors/OTP-12721:
Fix decode of Grouped AVPs containing errors
Simplify logic
Simplify logic
Diffstat (limited to 'lib/diameter/src')
| -rw-r--r-- | lib/diameter/src/base/diameter_codec.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl index bf2fe8e7ca..810be03f5e 100644 --- a/lib/diameter/src/base/diameter_codec.erl +++ b/lib/diameter/src/base/diameter_codec.erl @@ -590,6 +590,7 @@ split_head(<<Code:32, 0:1, M:1, P:1, _:5, Len:24, _/binary>>) -> %% Header is truncated. split_head(Bin) -> ?THROW({5014, #diameter_avp{data = Bin}}). +%% Note that pack_avp/1 will pad this at encode if sent in a Failed-AVP. %% 3588: %% @@ -619,7 +620,7 @@ split_head(Bin) -> %% AVP header with zero up to the minimum AVP header length. %% %% The underlined clause must be in error since (1) a header less than -%% the minimum value mean we don't know the identity of the AVP and +%% the minimum value mean we might not know the identity of the AVP and %% (2) the last sentence covers this case. %% split_data/3 |