diff options
author | Anders Svensson <[email protected]> | 2015-03-23 14:04:39 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2015-03-23 14:04:39 +0100 |
commit | 487446e76102b27fa8df02a353c7fdeec2d091f1 (patch) | |
tree | 19dce38759ffdf13a8686ce2b11c7fe190abf0f3 /lib/diameter/src/base/diameter_watchdog.erl | |
parent | d9eb16007cab3238ea2f6667cdc7731b0aa50edc (diff) | |
parent | 7d05e55951b4f3fc4af0febb965d3075e5ddf324 (diff) | |
download | otp-487446e76102b27fa8df02a353c7fdeec2d091f1.tar.gz otp-487446e76102b27fa8df02a353c7fdeec2d091f1.tar.bz2 otp-487446e76102b27fa8df02a353c7fdeec2d091f1.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_watchdog.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index 67715906e8..ff51c6dcf7 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -333,8 +333,9 @@ transition({shutdown = T, Pid, Reason}, #watchdog{parent = Pid, send(TPid, {T, self(), Reason}), S#watchdog{shutdown = true}; -%% Transport is telling us that DPA has been sent in response to DPR: -%% its death should lead to ours. +%% Transport is telling us that DPA has been sent in response to DPR, +%% or that DPR has been explicitly sent: transport death should lead +%% to ours. transition({'DPR', TPid}, #watchdog{transport = TPid} = S) -> S#watchdog{shutdown = true}; @@ -550,7 +551,7 @@ send_watchdog(#watchdog{pending = false, ?LOG(send, 'DWR'), S#watchdog{pending = true}. -%% Dont' count encode errors since we don't expect any on DWR/DWA. +%% Don't count encode errors since we don't expect any on DWR/DWA. %% recv/3 @@ -591,9 +592,10 @@ rcv('DWA', Pkt, #watchdog{transport = TPid, rcv(N, _, _) when N == 'CER'; N == 'CEA'; - N == 'DPR'; - N == 'DPA' -> + N == 'DPR' -> false; +%% DPR can be sent explicitly with diameter:call/4. Only the +%% corresponding DPAs arrive here. rcv(_, Pkt, #watchdog{transport = TPid, dictionary = Dict0, |