diff options
author | Erlang/OTP <[email protected]> | 2015-12-20 16:29:08 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-12-20 16:29:08 +0100 |
commit | ea94882ee5ca148564e6940fde6d17e0417de9db (patch) | |
tree | 27dd683cf142071b0f3da6537239bc6711bf21f9 /lib/diameter/include/diameter_gen.hrl | |
parent | 42493ad886f9b1b3e32e6f1bef084275a4480096 (diff) | |
parent | 502189ba42469d3332bc0658caa2bd0de1e3fcb9 (diff) | |
download | otp-ea94882ee5ca148564e6940fde6d17e0417de9db.tar.gz otp-ea94882ee5ca148564e6940fde6d17e0417de9db.tar.bz2 otp-ea94882ee5ca148564e6940fde6d17e0417de9db.zip |
Merge branch 'anders/diameter/M-bit/OTP-12947' into maint-17
* anders/diameter/M-bit/OTP-12947:
Add service_opt() strict_mbit
Diffstat (limited to 'lib/diameter/include/diameter_gen.hrl')
-rw-r--r-- | lib/diameter/include/diameter_gen.hrl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/diameter/include/diameter_gen.hrl b/lib/diameter/include/diameter_gen.hrl index ac2126cdc5..39ccdc9873 100644 --- a/lib/diameter/include/diameter_gen.hrl +++ b/lib/diameter/include/diameter_gen.hrl @@ -30,7 +30,10 @@ %% Key to a value in the process dictionary that determines whether or %% not an unrecognized AVP setting the M-bit should be regarded as an -%% error or not. See is_strict/0. +%% error or not. See is_strict/0. This is only used to relax M-bit +%% interpretation inside Grouped AVPs not setting the M-bit. The +%% service_opt() strict_mbit can be used to disable the check +%% globally. -define(STRICT_KEY, strict). %% Key that says whether or not we should do a best-effort decode @@ -447,7 +450,8 @@ relax(_, _) -> false. is_strict() -> - false /= getr(?STRICT_KEY). + diameter_codec:getopt(strict_mbit) + andalso false /= getr(?STRICT_KEY). %% relax/1 %% |