diff options
| author | Anders Svensson <[email protected]> | 2015-03-27 17:02:26 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-27 17:02:26 +0100 |
| commit | 45f33f09d56af793a2142ab402d73868be30b223 (patch) | |
| tree | 7ca20b645e56555f498c18e44ab3b8ea8a1f73a4 /lib/diameter/src/base/diameter_service.erl | |
| parent | cbceea683c9f718bc6f0140c2402a7f74455ea14 (diff) | |
| parent | 39acfdb005626ae1bf2f68808f9e8116637c7121 (diff) | |
| download | otp-45f33f09d56af793a2142ab402d73868be30b223.tar.gz otp-45f33f09d56af793a2142ab402d73868be30b223.tar.bz2 otp-45f33f09d56af793a2142ab402d73868be30b223.zip | |
Merge branch 'anders/diameter/hardening/OTP-12628' into maint
* anders/diameter/hardening/OTP-12628:
Remove potentially large error reason in call to diameter_lib:log/4
Limit FQDN in DiameterURI to 255 octets
Limit DiameterURI ports to 0-65535 digits on decode
Add service_opt() incoming_maxlen
Add guard to reject {spawn_opt, false} as transport/service_opt()
Diffstat (limited to 'lib/diameter/src/base/diameter_service.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_service.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl index a01bcdd4e7..86e744dfbe 100644 --- a/lib/diameter/src/base/diameter_service.erl +++ b/lib/diameter/src/base/diameter_service.erl @@ -131,7 +131,8 @@ | {share_peers, diameter:remotes()} %% broadcast to | {use_shared_peers, diameter:remotes()} %% use from | {restrict_connections, diameter:restriction()} - | {string_decode, boolean()}]}). + | {string_decode, boolean()} + | {incoming_maxlen, diameter:message_length()}]}). %% shared_peers reflects the peers broadcast from remote nodes. %% Record representing an RFC 3539 watchdog process implemented by @@ -698,7 +699,8 @@ service_options(Opts) -> Opts, ?RESTRICT)}, {spawn_opt, proplists:get_value(spawn_opt, Opts, [])}, - {string_decode, proplists:get_value(string_decode, Opts, true)}]. + {string_decode, proplists:get_value(string_decode, Opts, true)}, + {incoming_maxlen, proplists:get_value(incoming_maxlen, Opts, 16#FFFFFF)}]. %% The order of options is significant since we match against the list. mref(false = No) -> |