aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-10-12 18:17:12 +0200
committerAnders Svensson <[email protected]>2011-11-10 16:23:50 +0100
commite20bc73324e9e2e4fc5efedfb905bfe4b5c6664a (patch)
tree6f4cc1368777eaf08924c336bc12a785e826f087
parent39d0e598f4349b484d4b5f8fffc8fa9c25530ea8 (diff)
downloadotp-e20bc73324e9e2e4fc5efedfb905bfe4b5c6664a.tar.gz
otp-e20bc73324e9e2e4fc5efedfb905bfe4b5c6664a.tar.bz2
otp-e20bc73324e9e2e4fc5efedfb905bfe4b5c6664a.zip
Minor tls_ack simplification
We're already monitoring the transport process, no need to do so again.
-rw-r--r--lib/diameter/src/base/diameter_peer_fsm.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 282fa2742f..bc7625025a 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -685,12 +685,11 @@ open(Pkt, SupportedApps, RCaps, {Type, IS}, #state{parent = Pid,
%% and expect a reply when the handshake is complete.
tls_ack(true, Type, IS, #state{transport = TPid} = S) ->
Ref = make_ref(),
- MRef = erlang:monitor(process, TPid),
TPid ! {diameter, {tls, Ref, Type, IS == ?TLS}},
receive
{diameter, {tls, Ref}} ->
- erlang:demonitor(MRef, [flush]);
- {'DOWN', MRef, process, _, _} = T ->
+ ok;
+ {'DOWN', _, process, TPid, _} = T ->
close({tls_ack, T}, S)
end;