File 3834-ssh-Handle-EXIT-msg-by-default-at-channel-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3834-ssh-Handle-EXIT-msg-by-default-at-channel-close.patch of Package erlang (Revision 2587bae7bf0dfb77beed2069b73c8f2a)

Currently displaying revision 2587bae7bf0dfb77beed2069b73c8f2a , Show latest

From 28a94bb930282d498254e15f219dfa17ad2a498c Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 4 Feb 2021 10:49:29 +0100
Subject: [PATCH 04/10] ssh: Handle EXIT-msg by default at channel close

---
 lib/ssh/src/ssh_client_channel.erl | 34 +++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/lib/ssh/src/ssh_client_channel.erl b/lib/ssh/src/ssh_client_channel.erl
index bb16d878fa..3cfffc25b4 100644
--- a/lib/ssh/src/ssh_client_channel.erl
+++ b/lib/ssh/src/ssh_client_channel.erl
@@ -273,29 +273,33 @@ handle_info({ssh_cm, _, _} = Msg, #state{cm = ConnectionManager,
 				       channel_state = ChannelState}}
     end;
 
-handle_info(Msg, #state{cm = ConnectionManager, channel_cb = Module, 
+handle_info(Msg, #state{channel_cb = Module, 
 			channel_state = ChannelState0} = State) -> 
-    case Module:handle_msg(Msg, ChannelState0) of 
+    try Module:handle_msg(Msg, ChannelState0)
+    of 
 	{ok, ChannelState} ->
 	    {noreply, State#state{channel_state = ChannelState}};
 	{ok, ChannelState, Timeout} ->
 	    {noreply, State#state{channel_state = ChannelState}, Timeout};
-	{stop, Reason, ChannelState} when is_atom(Reason)->
-	    {stop, Reason, State#state{close_sent = true,
-				       channel_state = ChannelState}};
 	{stop, ChannelId, ChannelState} ->
-	    Reason =
-		case Msg of
-		    {'EXIT', _Pid, shutdown} ->
-			shutdown;
-		    _ ->
-			normal
-		end,
-	    (catch ssh_connection:close(ConnectionManager, ChannelId)),
-	    {stop, Reason, State#state{close_sent = true,
-				       channel_state = ChannelState}}
+            do_the_close(Msg, ChannelId, State#state{channel_state = ChannelState})
+    catch
+        error:function_clause when size(Msg) == 3,
+                                   element(1,Msg) == 'EXIT' ->
+            do_the_close(Msg, State#state.channel_id, State)
     end.
 
+
+
+do_the_close(Msg, ChannelId, State = #state{close_sent = false,
+                                            cm = ConnectionManager}) ->
+    catch ssh_connection:close(ConnectionManager, ChannelId),
+    do_the_close(Msg, ChannelId, State#state{close_sent=true});
+do_the_close({'EXIT', _Pid, shutdown=Reason},     _, State) -> {stop, Reason, State};
+do_the_close({'EXIT', _Pid, {shutdown,_}=Reason}, _, State) -> {stop, Reason, State};
+do_the_close(_Msg,                                _, State) -> {stop, normal, State}.
+
+
 %%--------------------------------------------------------------------
 %% Function: terminate(Reason, State) -> void()
 %% Description: This function is called by a gen_server when it is about to
-- 
2.26.2

Places

File 3834-ssh-Handle-EXIT-msg-by-default-at-channel-close.patch of Package erlang (Revision 2587bae7bf0dfb77beed2069b73c8f2a)

Places