aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter_traffic.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-12-20 16:29:08 +0100
committerErlang/OTP <[email protected]>2015-12-20 16:29:08 +0100
commitea94882ee5ca148564e6940fde6d17e0417de9db (patch)
tree27dd683cf142071b0f3da6537239bc6711bf21f9 /lib/diameter/src/base/diameter_traffic.erl
parent42493ad886f9b1b3e32e6f1bef084275a4480096 (diff)
parent502189ba42469d3332bc0658caa2bd0de1e3fcb9 (diff)
downloadotp-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/src/base/diameter_traffic.erl')
-rw-r--r--lib/diameter/src/base/diameter_traffic.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 230a05fa11..6be2c35d48 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -79,6 +79,7 @@
apps :: [#diameter_app{}],
sequence :: diameter:sequence(),
codec :: [{string_decode, boolean()}
+ | {strict_mbit, boolean()}
| {incoming_maxlen, diameter:message_length()}]}).
%% Note that incoming_maxlen is currently handled in diameter_peer_fsm,
%% so that any message exceeding the maximum is discarded. Retain the
@@ -108,7 +109,8 @@ make_recvdata([SvcName, PeerT, Apps, SvcOpts | _]) ->
sequence = Mask,
codec = [T || {K,_} = T <- SvcOpts,
lists:member(K, [string_decode,
- incoming_maxlen])]}.
+ incoming_maxlen,
+ strict_mbit])]}.
%% ---------------------------------------------------------------------------
%% peer_up/1