Fix race condition when an other connection is started before a channel is opened in the first connection.

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index b9827c90ea..7b9e9185bf 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -946,13 +946,12 @@ encode_ip(Addr) when is_list(Addr) ->
 	    end
     end.
 
-start_channel(Address, Port, Cb, Id, Args) ->
-    start_channel(Address, Port, Cb, Id, Args, undefined).
+start_channel(Cb, Id, Args, SubSysSup) ->
+    start_channel(Cb, Id, Args, SubSysSup, undefined).
 
-start_channel(Address, Port, Cb, Id, Args, Exec) ->
+start_channel(Cb, Id, Args, SubSysSup, Exec) ->
     ChildSpec = child_spec(Cb, Id, Args, Exec),
-    SystemSup = ssh_system_sup:system_supervisor(Address, Port),
-    ChannelSup = ssh_system_sup:channel_supervisor(SystemSup),
+    ChannelSup =ssh_subsystem_sup:channel_supervisor(SubSysSup),
     ssh_channel_sup:start_child(ChannelSup, ChildSpec).
     
 %%--------------------------------------------------------------------
@@ -1017,18 +1016,19 @@ start_cli(#connection{address = Address, port = Port, cli_spec = {Fun, [Shell]},
 	    {ok, Pid}
     end;
 
-start_cli(#connection{address = Address, port = Port,
-		      cli_spec = {CbModule, Args}, exec = Exec}, ChannelId) ->
-    start_channel(Address, Port, CbModule, ChannelId, Args, Exec).
+start_cli(#connection{cli_spec = {CbModule, Args}, exec = Exec,
+		      sub_system_supervisor = SubSysSup}, ChannelId) ->
+    start_channel(CbModule, ChannelId, Args, SubSysSup, Exec).
 
 start_subsytem(BinName, #connection{address = Address, port = Port, 
-				    options = Options},
+				    options = Options, 
+				    sub_system_supervisor = SubSysSup},
 	       #channel{local_id = ChannelId, remote_id = RemoteChannelId},
 	       ReplyMsg) ->
     Name = binary_to_list(BinName),
     case check_subsystem(Name, Options) of
 	{Callback, Opts} when is_atom(Callback), Callback =/= none ->
-	    start_channel(Address, Port, Callback, ChannelId, Opts);
+	    start_channel(Callback, ChannelId, Opts, SubSysSup);
 	{Other, _} when Other =/= none ->
 	    handle_backwards_compatibility(Other, self(), 
 					   ChannelId, RemoteChannelId,