From b96f872bba8cbcd87d1e1f4a5caffdb362f45111 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 30 Nov 2018 14:52:19 +0100
Subject: Handle dead sender at terminate

---
 lib/ssl/src/tls_connection.erl | 12 +++++-------
 lib/ssl/src/tls_sender.erl     | 10 +++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'lib/ssl/src')

diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index a4fc45e834..87e7809817 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -367,13 +367,11 @@ send_alert_in_connection(#alert{description = ?CLOSE_NOTIFY} = Alert, State) ->
 send_alert_in_connection(Alert,
                          #state{protocol_specific = #{sender := Sender}}) ->
     tls_sender:send_alert(Sender, Alert).
-send_sync_alert(Alert, #state{protocol_specific = #{sender := Sender}}= State) ->
-    tls_sender:send_and_ack_alert(Sender, Alert),
-    receive
-        {Sender, ack_alert} ->
-            ok
-    after ?DEFAULT_TIMEOUT ->
-            %% Sender is blocked terminate anyway
+send_sync_alert(
+  Alert, #state{protocol_specific = #{sender := Sender}} = State) ->
+    try tls_sender:send_and_ack_alert(Sender, Alert)
+    catch
+        _:_ ->
             throw({stop, {shutdown, own_alert}, State})
     end.
 
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index 107a0dcfd4..ee2b7be4f4 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -102,7 +102,7 @@ send_alert(Pid, Alert) ->
 %% in the connection state and recive an ack.
 %%--------------------------------------------------------------------
 send_and_ack_alert(Pid, Alert) ->
-    gen_statem:cast(Pid, {ack_alert, Alert}).
+    gen_statem:call(Pid, {ack_alert, Alert}, ?DEFAULT_TIMEOUT).
 %%--------------------------------------------------------------------
 -spec setopts(pid(), [{packet, integer() | atom()}]) -> ok | {error, term()}.
 %%  Description: Send application data
@@ -235,13 +235,13 @@ connection({call, From}, {dist_handshake_complete, _Node, DHandle},
                 [{next_event, internal,
                   {application_packets,{self(),undefined},Data}}]
         end]};
+connection({call, From}, {ack_alert, #alert{} = Alert}, StateData0) ->
+    StateData = send_tls_alert(Alert, StateData0),
+    {next_state, ?FUNCTION_NAME, StateData,
+     [{reply,From,ok}]};
 connection(internal, {application_packets, From, Data}, StateData) ->
     send_application_data(Data, From, ?FUNCTION_NAME, StateData);
 %%
-connection(cast, {ack_alert, #alert{} = Alert}, #data{connection_pid = Pid} =StateData0) ->
-    StateData = send_tls_alert(Alert, StateData0),
-    Pid ! {self(), ack_alert},
-    {next_state, ?FUNCTION_NAME, StateData};
 connection(cast, #alert{} = Alert, StateData0) ->
     StateData = send_tls_alert(Alert, StateData0),
     {next_state, ?FUNCTION_NAME, StateData};
-- 
cgit v1.2.3