1 files changed, 49 insertions, 60 deletions

diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl
index 14f1937abd..449ba20d02 100644
--- a/lib/ssh/src/sshd_sup.erl
+++ b/lib/ssh/src/sshd_sup.erl
@@ -19,7 +19,7 @@
 %%
 %%
 %%----------------------------------------------------------------------
-%% Purpose: The top supervisor for ssh servers hangs under 
+%% Purpose: The top supervisor for ssh servers hangs under
 %%          ssh_sup.
 %%----------------------------------------------------------------------
 
@@ -29,90 +29,79 @@
 
 -include("ssh.hrl").
 
--export([start_link/1, start_child/1, stop_child/1,
-	 stop_child/3, system_name/1]).
+-export([start_link/0,
+         start_child/4,
+         stop_child/1,
+	 stop_child/3
+]).
 
 %% Supervisor callback
 -export([init/1]).
 
+-define(SSHD_SUP, ?MODULE).
+
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
-start_link(Servers) ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, [Servers]).
+start_link() ->
+    %% No children are start now. We wait until the user calls ssh:daemon
+    %% and uses start_child/4 to create the children
+    supervisor:start_link({local,?SSHD_SUP}, ?MODULE, []).
 
-start_child(Options) ->
-    Address = ?GET_INTERNAL_OPT(address,  Options),
-    Port =    ?GET_INTERNAL_OPT(port,     Options),    
-    Profile = ?GET_OPT(profile,  Options),
+start_child(Address, Port, Profile, Options) ->
     case ssh_system_sup:system_supervisor(Address, Port, Profile) of
        undefined ->
-	    Spec = child_spec(Address, Port, Options),
-	    case supervisor:start_child(?MODULE, Spec) of
-		{error, already_present} ->
-		    Name = id(Address, Port, Profile),
-		    supervisor:delete_child(?MODULE, Name),
-		    supervisor:start_child(?MODULE, Spec);
-		Reply ->
-		    Reply
-	    end;
+            %% Here we start listening on a new Host/Port/Profile
+	    Spec = child_spec(Address, Port, Profile, Options),
+            supervisor:start_child(?SSHD_SUP, Spec);
 	Pid ->
+            %% Here we resume listening on a new Host/Port/Profile after
+            %% haveing stopped listening to he same with ssh:stop_listen(Pid)
 	    AccPid = ssh_system_sup:acceptor_supervisor(Pid),
-	    ssh_acceptor_sup:start_child(AccPid, Options)
+            ssh_acceptor_sup:start_child(AccPid, Address, Port, Profile, Options),
+            {ok,Pid}
     end.
 
-stop_child(Name) ->
-    supervisor:terminate_child(?MODULE, Name).
+stop_child(ChildId) when is_tuple(ChildId) ->
+    supervisor:terminate_child(?SSHD_SUP, ChildId);
+stop_child(ChildPid) when is_pid(ChildPid)->
+    stop_child(system_name(ChildPid)).
 
-stop_child(Address, Port, Profile) ->
-    Name = id(Address, Port, Profile),
-    stop_child(Name).
 
-system_name(SysSup) ->
-    Children = supervisor:which_children(sshd_sup),
-    system_name(SysSup, Children).
+stop_child(Address, Port, Profile) ->
+    Id = id(Address, Port, Profile),
+    stop_child(Id).
 
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
--spec init( [term()] ) -> {ok,{supervisor:sup_flags(),[supervisor:child_spec()]}} | ignore .
-
-init([Servers]) ->
-    RestartStrategy = one_for_one,
-    MaxR = 10,
-    MaxT = 3600,
-    Fun = fun(ServerOpts) -> 
-		  Address = ?GET_INTERNAL_OPT(address, ServerOpts),
-		  Port =    ?GET_INTERNAL_OPT(port, ServerOpts),
-		  child_spec(Address, Port, ServerOpts) 
-	  end,
-    Children = lists:map(Fun, Servers),
-    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
+init(_) ->
+    SupFlags = #{strategy  => one_for_one,
+                 intensity =>   10,
+                 period    => 3600
+                },
+    ChildSpecs = [
+                 ],
+    {ok, {SupFlags,ChildSpecs}}.
 
 %%%=========================================================================
 %%%  Internal functions
 %%%=========================================================================
-child_spec(Address, Port, Options) ->
-    Profile = ?GET_OPT(profile, Options),
-    Name = id(Address, Port,Profile),
-    StartFunc = {ssh_system_sup, start_link, [Options]},
-    Restart = temporary, 
-    Shutdown = infinity,
-    Modules = [ssh_system_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+child_spec(Address, Port, Profile, Options) ->
+    #{id       => id(Address, Port, Profile),
+      start    => {ssh_system_sup, start_link, [Address, Port, Profile, Options]},
+      restart  => temporary,
+      shutdown => infinity,
+      type     => supervisor,
+      modules  => [ssh_system_sup]
+     }.
 
 id(Address, Port, Profile) ->
-    case is_list(Address) of	
-	true ->
-	    {server, ssh_system_sup, any, Port, Profile};
-	false ->
-	    {server, ssh_system_sup, Address, Port, Profile}
+    {server, ssh_system_sup, Address, Port, Profile}.
+
+system_name(SysSup) ->
+    case lists:keyfind(SysSup, 2, supervisor:which_children(?SSHD_SUP)) of
+        {Name, SysSup, _, _} -> Name;
+        false -> undefind
     end.
 
-system_name([], _ ) ->
-    undefined;
-system_name(SysSup, [{Name, SysSup, _, _} | _]) ->
-    Name;
-system_name(SysSup, [_ | Rest]) ->
-    system_name(SysSup, Rest).