diff options
author | Anders Svensson <[email protected]> | 2013-02-18 12:55:56 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2013-02-18 12:55:56 +0100 |
commit | fbe790cebb7ac6c713e0a4c440e11174ce49c51f (patch) | |
tree | 397b52c2ae7b07ba740b75bb50b263c0b14e8b77 /lib/diameter/doc/src/diameter.xml | |
parent | 1eb56b8359fdc2f695f7439d5343330f3d5a5692 (diff) | |
parent | df2189c22f7ca7660496e46322d8b825e9f28ba3 (diff) | |
download | otp-fbe790cebb7ac6c713e0a4c440e11174ce49c51f.tar.gz otp-fbe790cebb7ac6c713e0a4c440e11174ce49c51f.tar.bz2 otp-fbe790cebb7ac6c713e0a4c440e11174ce49c51f.zip |
Merge branch 'anders/diameter/3xxx_callback/OTP-10686'
* anders/diameter/3xxx_callback/OTP-10686:
Add 3xxx suite for testing application_opt() request_errors
Minor suite simplification
Add application_opt() request_errors
Diffstat (limited to 'lib/diameter/doc/src/diameter.xml')
-rw-r--r-- | lib/diameter/doc/src/diameter.xml | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml index ba9225da8b..accf21cf98 100644 --- a/lib/diameter/doc/src/diameter.xml +++ b/lib/diameter/doc/src/diameter.xml @@ -16,7 +16,7 @@ <header> <copyright> -<year>2011</year><year>2012</year> +<year>2011</year><year>2013</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -206,11 +206,13 @@ probably avoid it.</p> <item> <p> Determines the manner in which incoming answer messages containing -decode errors are handled. +decode errors are handled.</p> + +<p> If <c>callback</c> then errors result in a &app_handle_answer; callback in the same fashion as for &app_handle_request;, with errors communicated in the <c>errors</c> field of the -<c>#diameter_packet{}</c> record passed to the callback. +<c>#diameter_packet{}</c> passed to the callback. If <c>report</c> then an answer containing errors is discarded without a callback and a warning report is written to the log. If <c>discard</c> then an answer containing errors is silently @@ -224,6 +226,24 @@ question is as if a callback had taken place and returned Defaults to <c>report</c> if unspecified.</p> </item> +<tag><c>{request_errors, answer_3xxx|callback}</c></tag> +<item> +<p> +Determines the manner in which incoming requests are handled when an +error other than 3007, DIAMETER_APPLICATION_UNSUPPORTED. (With which no +application callback module can be associated.)</p> + +<p> +If <c>answer_3xxx</c> then the request is answered by diameter +without a &app_handle_request; callback taking place if a 3xxx series +error (protocol errors) is detected. +If <c>callback</c> then even 3xxx errors result in an application +&app_handle_request; callback.</p> + +<p> +Defaults to <c>answer_3xxx</c> if unspecified.</p> +</item> + </taglist> <marker id="call_opt"/> @@ -534,7 +554,7 @@ Pkt = #diameter_packet{} The RFC 3539 watchdog state machine has transitioned into (<c>up</c>) or out of (<c>down</c>) the OKAY state. -If a <c>#diameter_packet{}</c> record is present in an <c>up</c> event +If a <c>#diameter_packet{}</c> is present in an <c>up</c> event then there has been a capabilties exchange on a newly established transport connection and the record contains the received CER or CEA. Otherwise a connection has reestablished without the loss or |