From 8ff6dc862d330c62ab520d03e8a26174b4350424 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 23 Sep 2014 17:48:39 +0200
Subject: ssh: Fixed parallel_login bug that made all logins serial

---
 lib/ssh/src/ssh_connection_handler.erl | 24 ++++++++++++++++--------
 lib/ssh/test/ssh_basic_SUITE.erl       | 13 ++++++++++---
 lib/ssh/test/ssh_test_lib.erl          |  3 +++
 3 files changed, 29 insertions(+), 11 deletions(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 86804c4436..a1e505961a 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -103,12 +103,22 @@ start_connection(client = Role, Socket, Options, Timeout) ->
     end;
 
 start_connection(server = Role, Socket, Options, Timeout) ->
+    SSH_Opts = proplists:get_value(ssh_opts, Options, []),
     try
-	case proplists:get_value(parallel_login, Options, false) of
+	case proplists:get_value(parallel_login, SSH_Opts, false) of
 	    true ->
-		spawn(fun() -> start_server_connection(Role, Socket, Options, Timeout) end);
+		HandshakerPid = 
+		    spawn_link(fun() -> 
+				       receive
+					   {do_handshake, Pid} ->
+					       handshake(Pid, erlang:monitor(process,Pid), Timeout)
+				       end
+			       end),
+		ChildPid = start_the_connection_child(HandshakerPid, Role, Socket, Options),
+		HandshakerPid ! {do_handshake, ChildPid};
 	    false ->
-		start_server_connection(Role, Socket, Options, Timeout)
+		ChildPid = start_the_connection_child(self(), Role, Socket, Options),
+		handshake(ChildPid, erlang:monitor(process,ChildPid), Timeout)
 	end
     catch
 	exit:{noproc, _} ->
@@ -117,16 +127,14 @@ start_connection(server = Role, Socket, Options, Timeout) ->
 	    {error, Error}
     end.
 
-
-start_server_connection(server = Role, Socket, Options, Timeout) ->
+start_the_connection_child(UserPid, Role, Socket, Options) ->
     Sups = proplists:get_value(supervisors, Options),
     ConnectionSup = proplists:get_value(connection_sup, Sups),
-    Opts = [{supervisors, Sups}, {user_pid, self()} | proplists:get_value(ssh_opts, Options, [])],
+    Opts = [{supervisors, Sups}, {user_pid, UserPid} | proplists:get_value(ssh_opts, Options, [])],
     {ok, Pid} = ssh_connection_sup:start_child(ConnectionSup, [Role, Socket, Opts]),
     {_, Callback, _} =  proplists:get_value(transport, Options, {tcp, gen_tcp, tcp_closed}),
     socket_control(Socket, Pid, Callback),
-    Ref = erlang:monitor(process, Pid),
-    handshake(Pid, Ref, Timeout).
+    Pid.
 
 
 start_link(Role, Socket, Options) ->
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 9242731924..415cb9fc9c 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -798,12 +798,14 @@ ssh_connect_nonegtimeout_connected(Config, Parallel) ->
 					       {parallel_login, Parallel},
 					       {negotiation_timeout, NegTimeOut},
 					       {failfun, fun ssh_test_lib:failfun/2}]),
+    ct:pal("~p Listen ~p:~p",[_Pid,_Host,Port]),
     ct:sleep(500),
 
     IO = ssh_test_lib:start_io_server(),
     Shell = ssh_test_lib:start_shell(Port, IO, UserDir),
     receive
-	{'EXIT', _, _} ->
+	Error = {'EXIT', _, _} ->
+	    ct:pal("~p",[Error]),
 	    ct:fail(no_ssh_connection);  
 	ErlShellStart ->
 	    ct:pal("---Erlang shell start: ~p~n", [ErlShellStart]),
@@ -898,7 +900,12 @@ connect_fun(ssh_sftp__start_channel, _Config) ->
     end.
 
 
-max_sessions(Config, ParallelLogin, Connect) when is_function(Connect,2) ->
+max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
+    Connect = fun(Host,Port) ->
+		      R = Connect0(Host,Port),
+		      ct:pal("Connect(~p,~p) -> ~p",[Host,Port,R]),
+		      R
+	      end,
     SystemDir = filename:join(?config(priv_dir, Config), system),
     UserDir = ?config(priv_dir, Config),
     MaxSessions = 5,
@@ -909,7 +916,7 @@ max_sessions(Config, ParallelLogin, Connect) when is_function(Connect,2) ->
 					     {parallel_login, ParallelLogin},
 					     {max_sessions, MaxSessions}
 					    ]),
-
+    ct:pal("~p Listen ~p:~p for max ~p sessions",[Pid,Host,Port,MaxSessions]),
     try [Connect(Host,Port) || _ <- lists:seq(1,MaxSessions)]
     of
 	Connections ->
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 00c25bf394..b8abf5e80e 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -113,6 +113,9 @@ io_request({put_chars, Chars}, TestCase, _, _, Buff) ->
 io_request({put_chars, unicode, Chars}, TestCase, _, _, Buff) when is_binary(Chars) ->
     reply(TestCase, Chars),
     {ok, ok, Buff};
+io_request({put_chars, unicode, io_lib, format, [Fmt,Args]}, TestCase, _, _, Buff) ->
+    reply(TestCase, io_lib:format(Fmt,Args)),
+    {ok, ok, Buff};
 io_request({put_chars, Enc, Chars}, TestCase, _, _, Buff) ->
     reply(TestCase, unicode:characters_to_binary(Chars,Enc,latin1)),
     {ok, ok, Buff};
-- 
cgit v1.2.3