aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-03-27 17:02:26 +0100
committerAnders Svensson <[email protected]>2015-03-27 17:02:26 +0100
commit45f33f09d56af793a2142ab402d73868be30b223 (patch)
tree7ca20b645e56555f498c18e44ab3b8ea8a1f73a4 /lib/diameter/src/base/diameter.erl
parentcbceea683c9f718bc6f0140c2402a7f74455ea14 (diff)
parent39acfdb005626ae1bf2f68808f9e8116637c7121 (diff)
downloadotp-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.erl')
-rw-r--r--lib/diameter/src/base/diameter.erl5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 67dfc7bdbf..010f977b97 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -45,6 +45,7 @@
-export_type([evaluable/0,
restriction/0,
+ message_length/0,
remotes/0,
sequence/0,
app_alias/0,
@@ -298,6 +299,9 @@ call(SvcName, App, Message) ->
| [node()]
| evaluable().
+-type message_length()
+ :: 0..16#FFFFFF.
+
%% Options passed to start_service/2
-type service_opt()
@@ -307,6 +311,7 @@ call(SvcName, App, Message) ->
| {sequence, sequence() | evaluable()}
| {share_peers, remotes()}
| {string_decode, boolean()}
+ | {incoming_maxlen, message_length()}
| {use_shared_peers, remotes()}
| {spawn_opt, list()}.