aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src/diameter.xml
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-03-23 12:37:26 +0100
committerAnders Svensson <[email protected]>2015-03-23 12:37:26 +0100
commit7d05e55951b4f3fc4af0febb965d3075e5ddf324 (patch)
tree481788ecb55b80ae8b29bb7cf6608d03fed36791 /lib/diameter/doc/src/diameter.xml
parent88c8959a685ee5c296d57e9d50de46dbb19cc1df (diff)
parent09e51b177e0b2c1528c99bdd1c354319e07bc421 (diff)
downloadotp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.gz
otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.bz2
otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.zip
Merge branch 'anders/diameter/dpr/OTP-12542' into maint
* anders/diameter/dpr/OTP-12542: Discard CER or DWR sent with diameter:call/4 Allow DPR to be sent with diameter:call/4 Add transport_opt() dpa_timeout Add testcase for sending DPR with diameter:call/4
Diffstat (limited to 'lib/diameter/doc/src/diameter.xml')
-rw-r--r--lib/diameter/doc/src/diameter.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 638c1c4c2b..27f2d76f28 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1115,7 +1115,7 @@ Defaults to <c>rebooting</c> for <c>Reason=service|application</c> and
<p>
Number of milliseconds after which the transport process is
terminated if DPA has not been received.
-Defaults to 1000.</p>
+Defaults to the value of &dpa_timeout;.</p>
</item>
</taglist>
</item>
@@ -1152,6 +1152,17 @@ configured them.</p>
Defaults to a single callback returning <c>dpr</c>.</p>
</item>
+<marker id="dpa_timeout"/>
+<tag><c>{dpa_timeout, &dict_Unsigned32;}</c></tag>
+<item>
+<p>
+Number of milliseconds after which a transport connection is
+terminated following an outgoing DPR if DPA is not received.</p>
+
+<p>
+Defaults to 1000.</p>
+</item>
+
<marker id="length_errors"/>
<tag><c>{length_errors, exit|handle|discard}</c></tag>
<item>