aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src/diameter_tcp.xml
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-06-11 12:19:42 +0200
committerAnders Svensson <[email protected]>2013-06-11 12:19:42 +0200
commitc80d324e1eeb34129e63e10b00cff688988b0296 (patch)
treea85fa28fa741d2ca18b02e2bf6c2347967c0ff60 /lib/diameter/doc/src/diameter_tcp.xml
parent9919508b2cc177ec4afdb53bb9d20563973461f8 (diff)
parent9bbf27eb94877dea7229223de62d28f0d0206709 (diff)
downloadotp-c80d324e1eeb34129e63e10b00cff688988b0296.tar.gz
otp-c80d324e1eeb34129e63e10b00cff688988b0296.tar.bz2
otp-c80d324e1eeb34129e63e10b00cff688988b0296.zip
Merge branch 'anders/diameter/peer_address_config/OTP-10893' into maint
* anders/diameter/peer_address_config/OTP-10893: Let diameter_{tcp,sctp} be configured with permissible remote addresses Fix diameter_{tcp,sctp} spec Remove trailing whitespace
Diffstat (limited to 'lib/diameter/doc/src/diameter_tcp.xml')
-rw-r--r--lib/diameter/doc/src/diameter_tcp.xml15
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml
index 8e509aa829..ce4d6cfd0f 100644
--- a/lib/diameter/doc/src/diameter_tcp.xml
+++ b/lib/diameter/doc/src/diameter_tcp.xml
@@ -96,10 +96,12 @@ before configuring TLS capability on diameter transports.</p>
<v>Reason = term()</v>
<v>OwnOpt = {raddr, &ip_address;}
| {rport, integer()}
+ | {accept, Match}
| {port, integer()}
| {fragment_timer, infinity | 0..16#FFFFFFFF}</v>
<v>SslOpt = {ssl_options, true | list()}</v>
<v>TcpOpt = term()</v>
+<v>Match = &ip_address; | string() | [Match]</v>
</type>
<desc>
@@ -109,7 +111,18 @@ The start function required by &man_transport;.</p>
<p>
Options <c>raddr</c> and <c>rport</c> specify the remote address
and port for a connecting transport and are not valid for a listening
-transport.
+transport.</p>
+
+<p>
+Option <c>accept</c> specifies remote addresses for a listening
+transport and is not valid for a connecting transport.
+If specified, a remote address that does not match one of the
+specified addresses causes the connection to be aborted.
+Multiple <c>accept</c> options can be specified.
+A string-valued <c>Match</c> that does not parse as an address is
+interpreted as a regular expression.</p>
+
+<p>
Option <c>ssl_options</c> must be specified for a transport
that should support TLS: a value of <c>true</c> results in a
TLS handshake immediately upon connection establishment while