File 3842-ssh-Cosmetic-changes-some-comments.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3842-ssh-Cosmetic-changes-some-comments.patch of Package erlang (Revision 75455c31c581aa640139ad66f6269a34)

Currently displaying revision 75455c31c581aa640139ad66f6269a34 , Show latest

From 8a1b7d1bb9c5c232d2f1275c8f333a90fd653ef4 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 25 Feb 2021 19:30:51 +0100
Subject: [PATCH 2/5] ssh: Cosmetic changes + some comments

---
 lib/ssh/src/ssh_connection_handler.erl | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 6eee333a4f..fc689b81d6 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -118,22 +118,31 @@ start_link(Role, Host, Port, Socket, Options0, NegotiationTimeout) ->
         Options1 = ?PUT_INTERNAL_OPT([{user_pid, self()}
                                      ], Options0),
         Profile = ?GET_OPT(profile, Options1),
-        {ok, {SystemSup, SubSysSup}} =
-            case Role of
-                client -> sshc_sup:start_system_subsystem(Host, Port, Profile, Options1);
-                server -> sshd_sup:start_system_subsystem(Host, Port, Profile, Options1)
+        Sup = case Role of
+                client -> sshc_sup;
+                server -> sshd_sup
             end,
+        {ok, {SystemSup, SubSysSup}} =
+            Sup:start_system_subsystem(Host, Port, Profile, Options1),
         ConnectionSup = ssh_system_sup:connection_supervisor(SystemSup),
         Options = ?PUT_INTERNAL_OPT([{supervisors, [{system_sup, SystemSup},
                                                     {subsystem_sup, SubSysSup},
                                                     {connection_sup, ConnectionSup}]}
                                     ], Options1),
+
+        %% This is essentially gen_statem:start_link/3 :
         case ssh_connection_sup:start_child(ConnectionSup,
-                                            [?MODULE, [Role, Socket, Options], [{spawn_opt, [{message_queue_data,off_heap}]}]]
+                                            [?MODULE,
+                                             [Role, Socket, Options],
+                                             [{spawn_opt, [{message_queue_data,off_heap}]}]]
                                            ) of
             {ok, Pid} ->
+                %% Now the connection_handler process is started, but no message handling
+                %% begins until the socket_control is called
                 case socket_control(Socket, Pid, Options) of
                     ok ->
+                        %% handshake returns {ok,Pid} after a successful connection setup.
+                        %% or {error,Reason} after an unsuccesful one:
                         handshake(Pid, erlang:monitor(process,Pid), NegotiationTimeout);
                     {error, Reason} ->
                         {error, Reason}
-- 
2.26.2

Places

File 3842-ssh-Cosmetic-changes-some-comments.patch of Package erlang (Revision 75455c31c581aa640139ad66f6269a34)

Places