diff options
| author | Anders Svensson <[email protected]> | 2017-08-29 15:13:31 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-08-29 15:13:31 +0200 |
| commit | 6f9ddb858507dc91cfdf0ccc82f3f6aad5463f50 (patch) | |
| tree | ec12fcf82f010519b5a8ea9684d0984ed4b03b6f /lib/diameter/doc/src | |
| parent | 59accf943fabb07a79488289798a2aa3d78d4d96 (diff) | |
| parent | 0ad00d91398c093af6139bd4b8e452d7f6133636 (diff) | |
| download | otp-6f9ddb858507dc91cfdf0ccc82f3f6aad5463f50.tar.gz otp-6f9ddb858507dc91cfdf0ccc82f3f6aad5463f50.tar.bz2 otp-6f9ddb858507dc91cfdf0ccc82f3f6aad5463f50.zip | |
Merge branch 'anders/diameter/loopback_any/OTP-14544' into maint
* anders/diameter/loopback_any/OTP-14544:
Use loopback/any config in examples suite
Handle loopback/any as local address in diameter_tcp/sctp
Diffstat (limited to 'lib/diameter/doc/src')
| -rw-r--r-- | lib/diameter/doc/src/diameter_sctp.xml | 3 | ||||
| -rw-r--r-- | lib/diameter/doc/src/diameter_tcp.xml | 13 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/diameter/doc/src/diameter_sctp.xml b/lib/diameter/doc/src/diameter_sctp.xml index 9b6d629f79..c9b74a9ec5 100644 --- a/lib/diameter/doc/src/diameter_sctp.xml +++ b/lib/diameter/doc/src/diameter_sctp.xml @@ -16,7 +16,7 @@ <header> <copyright> <year>2011</year> -<year>2016</year> +<year>2017</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -116,7 +116,6 @@ and port respectively.</p> Multiple <c>ip</c> options can be specified for a multihomed peer. If none are specified then the values of <c>Host-IP-Address</c> in the <c>diameter_service</c> record are used. -(In particular, one of these must be specified.) Option <c>port</c> defaults to 3868 for a listening transport and 0 for a connecting transport.</p> diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml index 6ca280c52b..1d65d14257 100644 --- a/lib/diameter/doc/src/diameter_tcp.xml +++ b/lib/diameter/doc/src/diameter_tcp.xml @@ -170,14 +170,11 @@ that will not be forthcoming, which will eventually cause the RFC 3539 watchdog to take down the connection.</p> <p> -If an <c>ip</c> option is not specified then the first element of a -non-empty <c>Host-IP-Address</c> list in <c>Svc</c> provides the local -IP address. -If neither is specified then the default address selected by &gen_tcp; -is used. -In all cases, the selected address is either returned from -&start; or passed in a <c>connected</c> message over the transport -interface.</p> +The first element of a non-empty <c>Host-IP-Address</c> list in +<c>Svc</c> provides the local IP address if an <c>ip</c> option is not +specified. +The local address is either returned from&start; or passed in a +<c>connected</c> message over the transport interface.</p> </desc> </func> |