aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-01-17 11:39:23 +0100
committerAnders Svensson <[email protected]>2013-01-17 11:39:23 +0100
commitd57c79b4cabf527102e86dd572d01cf8291e2cdc (patch)
treeabfb7c72efc1666a4f8edb916582cbe1c99882bb /lib/diameter/src
parentd5f985f6c1217229579ad5c06405c7ec06ecfb74 (diff)
parentc81415ff0cceb83c94397a308951992baa39295a (diff)
downloadotp-d57c79b4cabf527102e86dd572d01cf8291e2cdc.tar.gz
otp-d57c79b4cabf527102e86dd572d01cf8291e2cdc.tar.bz2
otp-d57c79b4cabf527102e86dd572d01cf8291e2cdc.zip
Merge branch 'anders/diameter/timeout_event/OTP-10628'
* anders/diameter/timeout_event/OTP-10628: Add event suite Send CER/CEA timeout events as documented
Diffstat (limited to 'lib/diameter/src')
-rw-r--r--lib/diameter/src/base/diameter_peer_fsm.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index c4320fcb99..858870566f 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -388,8 +388,9 @@ transition({diameter, {recv, Pkt}}, S) ->
recv(Pkt, S);
%% Timeout when still in the same state ...
-transition({timeout, PS}, #state{state = PS}) ->
- {stop, {capx(PS), timeout}};
+transition({timeout = T, PS}, #state{state = PS} = S) ->
+ close({capx(PS), T}, S),
+ stop;
%% ... or not.
transition({timeout, _}, _) ->