diff options
author | Anders Svensson <[email protected]> | 2017-08-18 11:00:57 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2017-08-18 11:00:57 +0200 |
commit | 770454f0a32fbc0714c6762ed3e4d761b799814f (patch) | |
tree | dc5613f518bc50e768fb03336cdc5b96685bb58f /lib/diameter/src/base/diameter_watchdog.erl | |
parent | 91318cd5576a3283cd0dbc263e846fad55010f89 (diff) | |
parent | f392006644991074d2c4d5055773409c5e0503d7 (diff) | |
download | otp-770454f0a32fbc0714c6762ed3e4d761b799814f.tar.gz otp-770454f0a32fbc0714c6762ed3e4d761b799814f.tar.bz2 otp-770454f0a32fbc0714c6762ed3e4d761b799814f.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_watchdog.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index a63425d92a..b2172356ee 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -72,7 +72,9 @@ restrict := boolean(), suspect := non_neg_integer(), %% OKAY -> SUSPECT okay := non_neg_integer()}, %% REOPEN -> OKAY - codec :: #{string_decode := false, + codec :: #{decode_format := false, + string_decode := false, + strict_arities => diameter:strict_arities(), strict_mbit := boolean(), failed_avp := false, rfc := 3588 | 6733, @@ -135,7 +137,9 @@ i({Ack, T, Pid, {Opts, putr(restart, {T, Opts, Svc, SvcOpts}), %% save seeing it in trace putr(dwr, dwr(Caps)), %% Nodes = restrict_nodes(Restrict), - CodecKeys = [string_decode, + CodecKeys = [decode_format, + string_decode, + strict_arities, strict_mbit, incoming_maxlen, spawn_opt, @@ -150,13 +154,15 @@ i({Ack, T, Pid, {Opts, receive_data = RecvData, dictionary = Dict0, config = - maps:without(CodecKeys, + maps:without([traffic_counters | CodecKeys], config(SvcOpts#{restrict => restrict(Nodes), suspect => 1, okay => 3}, Opts)), - codec = maps:with(CodecKeys, SvcOpts#{string_decode := false, - ordered_encode => false})}. + codec = maps:with(CodecKeys -- [strict_arities], + SvcOpts#{decode_format := false, + string_decode := false, + ordered_encode => false})}. wait(Ref, Pid) -> receive |