aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/include/diameter_gen.hrl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-09-14 23:41:46 +0200
committerAnders Svensson <[email protected]>2015-09-14 23:41:46 +0200
commita8d17f7e69e853d1bc858e72dc9daf6beed30f19 (patch)
tree945fdac18a607297ad7fd834dd2a1d1b0e1a936c /lib/diameter/include/diameter_gen.hrl
parent44a53a37f39e65c935ed2648ec74dc0f741611e1 (diff)
parent502189ba42469d3332bc0658caa2bd0de1e3fcb9 (diff)
downloadotp-a8d17f7e69e853d1bc858e72dc9daf6beed30f19.tar.gz
otp-a8d17f7e69e853d1bc858e72dc9daf6beed30f19.tar.bz2
otp-a8d17f7e69e853d1bc858e72dc9daf6beed30f19.zip
Merge branch 'anders/diameter/M-bit/OTP-12947' into maint
* 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.hrl8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/diameter/include/diameter_gen.hrl b/lib/diameter/include/diameter_gen.hrl
index 5624ee6626..611ad796a9 100644
--- a/lib/diameter/include/diameter_gen.hrl
+++ b/lib/diameter/include/diameter_gen.hrl
@@ -31,7 +31,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
@@ -448,7 +451,8 @@ relax(_, _) ->
false.
is_strict() ->
- false /= getr(?STRICT_KEY).
+ diameter_codec:getopt(strict_mbit)
+ andalso false /= getr(?STRICT_KEY).
%% relax/1
%%