File 3845-ssh-connected-not_connected-via-new-handsh... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3845-ssh-connected-not_connected-via-new-handshake-2.patch of Package erlang (Revision 1d8c27ee7c6a6523d300eb9c976f0ca2)

Currently displaying revision 1d8c27ee7c6a6523d300eb9c976f0ca2 , Show latest

From 14be1038d52faa5c083a457bf6ad128fbfb84378 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 1 Mar 2021 11:55:35 +0100
Subject: [PATCH 5/5] ssh: connected/not_connected via new handshake/2

---
 lib/ssh/src/ssh_connection_handler.erl  | 18 +++++++++++-------
 lib/ssh/src/ssh_fsm_userauth_client.erl |  2 +-
 lib/ssh/src/ssh_fsm_userauth_server.erl |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 6554655d3b..5d564b6db8 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -50,6 +50,7 @@
 -export([available_hkey_algorithms/2,
 	 open_channel/6,
          start_channel/5,
+         handshake/2,
          handle_direct_tcpip/6,
 	 request/6, request/7,
 	 reply_request/3, 
@@ -545,23 +546,27 @@ socket_control(Socket, Pid, Options) ->
 
 handshake(Pid, Ref, Timeout) ->
     receive
-	ssh_connected ->
+	{Pid, ssh_connected} ->
 	    erlang:demonitor(Ref),
 	    {ok, Pid};
-	{Pid, not_connected, Reason} ->
+	{Pid, {not_connected, Reason}} ->
+	    erlang:demonitor(Ref),
 	    {error, Reason};
-	{'DOWN', _, process, Pid, {shutdown, Reason}} ->
+	{'DOWN', Ref, process, Pid, {shutdown, Reason}} ->
 	    {error, Reason};
-	{'DOWN', _, process, Pid, Reason} ->
+	{'DOWN', Ref, process, Pid, Reason} ->
 	    {error, Reason};
         {'EXIT',_,Reason} ->
             stop(Pid),
             {error, {exit,Reason}}
     after Timeout ->
 	    ssh_connection_handler:stop(Pid),
 	    {error, timeout}
     end.
 
+handshake(Msg, #data{starter = User}) ->
+    User ! {self(), Msg}.
+
 %%====================================================================
 %% gen_statem callbacks
 %%====================================================================
@@ -745,8 +750,7 @@ handle_event(internal, #ssh_msg_debug{} = Msg, _StateName, D) ->
     debug_fun(Msg, D),
     keep_state_and_data;
 
-handle_event(internal, {conn_msg,Msg}, StateName, #data{starter = User,
-                                                        connection_state = Connection0,
+handle_event(internal, {conn_msg,Msg}, StateName, #data{connection_state = Connection0,
                                                         event_queue = Qev0} = D0) ->
     Role = ?role(StateName),
     Rengotation = renegotiation(StateName),
@@ -756,7 +760,7 @@ handle_event(internal, {conn_msg,Msg}, StateName, #data{starter = User,
             case {Reason0,Role} of
                 {{_, Reason}, client} when ((StateName =/= {connected,client})
                                             and (not Rengotation)) ->
-		   User ! {self(), not_connected, Reason};
+                    handshake({not_connected,Reason}, D);
                 _ ->
                     ok
             end,
diff --git a/lib/ssh/src/ssh_fsm_userauth_client.erl b/lib/ssh/src/ssh_fsm_userauth_client.erl
index 938070efc2..4b94c6c935 100644
--- a/lib/ssh/src/ssh_fsm_userauth_client.erl
+++ b/lib/ssh/src/ssh_fsm_userauth_client.erl
@@ -64,7 +64,7 @@ handle_event(internal, #ssh_msg_ext_info{}=Msg, {userauth,client}, D0) ->
 %%---- recevied userauth success from the server
 handle_event(internal, #ssh_msg_userauth_success{}, {userauth,client}, D0=#data{ssh_params = Ssh}) ->
     ssh_auth:ssh_msg_userauth_result(success),
-    D0#data.starter ! ssh_connected,
+    ssh_connection_handler:handshake(ssh_connected, D0),
     D = D0#data{ssh_params=Ssh#ssh{authenticated = true}},
     {next_state, {connected,client}, D, {change_callback_module,ssh_connection_handler}};
 
diff --git a/lib/ssh/src/ssh_fsm_userauth_server.erl b/lib/ssh/src/ssh_fsm_userauth_server.erl
index 9fbe102aa2..74642a8098 100644
--- a/lib/ssh/src/ssh_fsm_userauth_server.erl
+++ b/lib/ssh/src/ssh_fsm_userauth_server.erl
@@ -151,7 +151,7 @@ code_change(_OldVsn, StateName, State, _Extra) ->
 connected_state(Reply, Ssh1, User, Method, D0) ->
     D1 = #data{ssh_params=Ssh} =
         ssh_connection_handler:send_msg(Reply, D0#data{ssh_params = Ssh1}),
-    D1#data.starter ! ssh_connected,
+    ssh_connection_handler:handshake(ssh_connected, D1),
     connected_fun(User, Method, D1),
     D1#data{auth_user=User,
             %% Note: authenticated=true MUST NOT be sent
-- 
2.26.2

Places

File 3845-ssh-connected-not_connected-via-new-handshake-2.patch of Package erlang (Revision 1d8c27ee7c6a6523d300eb9c976f0ca2)

Places