ssh: Use ssh_daemon_channel_sup and ssh_damon_channel

11 files changed, 36 insertions, 51 deletions

diff --git a/lib/ssh/doc/src/ssh_channel.xml b/lib/ssh/doc/src/ssh_channel.xml
index 2ee6ab566b..b4bcd148f3 100644
--- a/lib/ssh/doc/src/ssh_channel.xml
+++ b/lib/ssh/doc/src/ssh_channel.xml
@@ -225,8 +225,8 @@
       The following functions are to be exported from a
       <c>ssh_daemon_channel</c> callback module.
     </p>
+    <marker id="cb_timeouts"></marker>
     <section>
-      <marker id="cb_timeouts"></marker>
       <title>Callback timeouts</title>
       <p>The timeout values that can be returned by the callback functions
       have the same semantics as in a <seealso marker="stdlib:gen_server">gen_server</seealso>.
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index bcd13213b3..a2cefe7c15 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -59,7 +59,7 @@ MODULES= \
 	ssh_shell \
 	ssh_system_sup \
 	ssh_subsystem_sup \
-	ssh_channel_sup \
+	ssh_daemon_channel_sup \
 	ssh_acceptor_sup \
 	ssh_acceptor \
 	ssh_app \
@@ -169,7 +169,7 @@ $(EBIN)/ssh_connection_handler.$(EMULATOR): ssh_connection_handler.erl ssh.hrl \
 $(EBIN)/ssh_shell.$(EMULATOR): ssh_shell.erl ssh_connect.hrl
 $(EBIN)/ssh_system_sup.$(EMULATOR): ssh_system_sup.erl ssh.hrl
 $(EBIN)/ssh_subsystem_sup.$(EMULATOR): ssh_subsystem_sup.erl
-$(EBIN)/ssh_channel_sup.$(EMULATOR): ssh_channel_sup.erl
+$(EBIN)/ssh_daemon_channel_sup.$(EMULATOR): ssh_daemon_channel_sup.erl
 $(EBIN)/ssh_acceptor_sup.$(EMULATOR): ssh_acceptor_sup.erl ssh.hrl
 $(EBIN)/ssh_acceptor.$(EMULATOR): ssh_acceptor.erl ssh.hrl
 $(EBIN)/ssh_app.$(EMULATOR): ssh_app.erl
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 4a22322333..b935ea94d5 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -14,7 +14,7 @@
 	     ssh_cli,
              ssh_client_key_api,
 	     ssh_channel,
-	     ssh_channel_sup,
+	     ssh_daemon_channel_sup,
 	     ssh_connection,
 	     ssh_connection_handler,
 	     ssh_connection_sup,
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index 382de90ae1..31f6194bf9 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -30,7 +30,7 @@
 -include("ssh.hrl").
 -include("ssh_connect.hrl").
 
-%% ssh_channel callbacks
+%% ssh_daemon_channel callbacks
 -export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2]).
 
 -export([dbg_trace/3]).
@@ -47,7 +47,7 @@
 	 }).
 
 %%====================================================================
-%% ssh_channel callbacks
+%% ssh_daemon_channel callbacks
 %%====================================================================
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 2261d37d6a..0a07ea778d 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -822,14 +822,14 @@ start_channel(Cb, Id, Args, SubSysSup, Exec, Opts) ->
     ChannelSup = ssh_subsystem_sup:channel_supervisor(SubSysSup),
     case max_num_channels_not_exceeded(ChannelSup, Opts) of
         true ->
-            ssh_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec);
+            ssh_daemon_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec);
         false ->
 	    throw(max_num_channels_exceeded)
     end.
     
 max_num_channels_not_exceeded(ChannelSup, Opts) ->
     MaxNumChannels = ?GET_OPT(max_channels, Opts),
-    NumChannels = length([x || {_,_,worker,[ssh_channel]} <- 
+    NumChannels = length([x || {_,_,worker,[ssh_daemon_channel]} <- 
 				   supervisor:which_children(ChannelSup)]),
     %% Note that NumChannels is BEFORE starting a new one
     NumChannels < MaxNumChannels.
diff --git a/lib/ssh/src/ssh_daemon_channel.erl b/lib/ssh/src/ssh_daemon_channel.erl
index 72853f2d6a..e1d6906bbc 100644
--- a/lib/ssh/src/ssh_daemon_channel.erl
+++ b/lib/ssh/src/ssh_daemon_channel.erl
@@ -25,7 +25,7 @@
 
 -module(ssh_daemon_channel).
 
-%% API to special server side channel that can be pluged into the erlang ssh daemeon
+%% API to server side channel that can be pluged into the erlang ssh daemeon
 -callback init(Args :: term()) ->
     {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
     {stop, Reason :: term()} | ignore.
@@ -42,29 +42,14 @@
 					   {stop, ChannelId::ssh:channel_id(),
 					    State::term()}.
 
-%%% API
--export([start/4, start/5, start_link/4, start_link/5, enter_loop/1]).
-
-%% gen_server callbacks
--export([init/1, terminate/2]).
-
--spec start(ssh:connection_ref(), ssh:channel_id(), atom(), term()) -> term().
-start(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
-    ssh_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
-
-start(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
-    ssh_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
-
-start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
-    ssh_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
+%%% Internal API
+-export([start_link/5,
+         get_print_info/1
+        ]).
 
 start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
     ssh_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
 
-enter_loop(State) ->
-    ssh_channel:enter_loop(State).
 
-init(Args) ->
-    ssh_channel:init(Args).
-terminate(Reason, State) ->
-    ssh_channel:terminate(Reason, State).
+get_print_info(Pid) ->
+    ssh_channel:get_print_info(Pid).
diff --git a/lib/ssh/src/ssh_channel_sup.erl b/lib/ssh/src/ssh_daemon_channel_sup.erl
index 7a12f34049..cd86347501 100644
--- a/lib/ssh/src/ssh_channel_sup.erl
+++ b/lib/ssh/src/ssh_daemon_channel_sup.erl
@@ -22,7 +22,7 @@
 %%----------------------------------------------------------------------
 %% Purpose: Ssh channel supervisor.
 %%----------------------------------------------------------------------
--module(ssh_channel_sup).
+-module(ssh_daemon_channel_sup).
 
 -behaviour(supervisor).
 
@@ -40,10 +40,10 @@ start_link(Args) ->
 start_child(Sup, Callback, Id, Args, Exec) ->
     ChildSpec =
         #{id       => make_ref(),
-          start    => {ssh_channel, start_link, [self(), Id, Callback, Args, Exec]},
+          start    => {ssh_daemon_channel, start_link, [self(), Id, Callback, Args, Exec]},
           restart  => temporary,
           type     => worker,
-          modules  => [ssh_channel]
+          modules  => [ssh_daemon_channel]
          },
     supervisor:start_child(Sup, ChildSpec).
 
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index d464def6fa..e1613f0599 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -140,15 +140,15 @@ print_system_sup({{ssh_acceptor_sup,_LocalHost,_LocalPort,_Profile}, Pid, superv
 
 
 
-print_channels({{server,ssh_channel_sup,_,_},Pid,supervisor,[ssh_channel_sup]}) when is_pid(Pid) ->
+print_channels({{server,ssh_daemon_channel_sup,_,_},Pid,supervisor,[ssh_daemon_channel_sup]}) when is_pid(Pid) ->
     Children =  supervisor:which_children(Pid),
-    ChannelPids = [P || {R,P,worker,[ssh_channel]} <- Children,
+    ChannelPids = [P || {R,P,worker,[ssh_daemon_channel]} <- Children,
 			is_pid(P),
 			is_reference(R)],
     case ChannelPids of
 	[] -> io_lib:format(?INDENT?INDENT"No channels~n",[]);
 	[Ch1Pid|_] ->
-	    {{ConnManager,_}, _Str} = ssh_channel:get_print_info(Ch1Pid),
+	    {{ConnManager,_}, _Str} = ssh_daemon_channel:get_print_info(Ch1Pid),
 	    {{_,Remote},_} = ssh_connection_handler:get_print_info(ConnManager),
 	    [io_lib:format(?INDENT?INDENT"Remote: ~s ConnectionRef = ~p~n",[fmt_host_port(Remote),ConnManager]),
 	     lists:map(fun print_ch/1, ChannelPids)
@@ -159,7 +159,7 @@ print_channels({{server,ssh_connection_sup,_,_},Pid,supervisor,[ssh_connection_s
 
 print_ch(Pid) ->
     try
-	{{ConnManager,ChannelID}, Str} = ssh_channel:get_print_info(Pid),
+	{{ConnManager,ChannelID}, Str} = ssh_daemon_channel:get_print_info(Pid),
 	{_LocalRemote,StrM} = ssh_connection_handler:get_print_info(ConnManager),
 	io_lib:format(?INDENT?INDENT?INDENT"ch ~p ~p: ~s ~s~n",[ChannelID, Pid, StrM, Str])
     catch
diff --git a/lib/ssh/src/ssh_shell.erl b/lib/ssh/src/ssh_shell.erl
index c7c63c5c43..6470f4c492 100644
--- a/lib/ssh/src/ssh_shell.erl
+++ b/lib/ssh/src/ssh_shell.erl
@@ -29,7 +29,7 @@
 %%% channel inspite of it being a client. 
 -behaviour(ssh_daemon_channel).
 
-%% ssh_channel callbacks
+%% ssh_daemon_channel callbacks
 -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 
 %% Spawn export
@@ -46,7 +46,7 @@
        ).
 
 %%====================================================================
-%% ssh_channel callbacks
+%% ssh_daemon_channel callbacks
 %%====================================================================
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_subsystem_sup.erl b/lib/ssh/src/ssh_subsystem_sup.erl
index 77da240a66..f1e74a24ac 100644
--- a/lib/ssh/src/ssh_subsystem_sup.erl
+++ b/lib/ssh/src/ssh_subsystem_sup.erl
@@ -48,7 +48,7 @@ connection_supervisor(SupPid) ->
 
 channel_supervisor(SupPid) ->    
     Children = supervisor:which_children(SupPid),
-    ssh_channel_sup(Children).
+    ssh_daemon_channel_sup(Children).
 
 %%%=========================================================================
 %%%  Supervisor callback
@@ -78,8 +78,8 @@ ssh_connection_child_spec(Role, Address, Port, _Profile, Options) ->
      }.
 
 ssh_channel_child_spec(Role, Address, Port, _Profile, Options) ->
-    #{id       => id(Role, ssh_channel_sup, Address, Port),
-      start    => {ssh_channel_sup, start_link, [Options]},
+    #{id       => id(Role, ssh_daemon_channel_sup, Address, Port),
+      start    => {ssh_daemon_channel_sup, start_link, [Options]},
       restart  => temporary,
       type     => supervisor
      }.
@@ -92,10 +92,10 @@ ssh_connection_sup([{_, Child, _, [ssh_connection_sup]} | _]) ->
 ssh_connection_sup([_ | Rest]) ->
     ssh_connection_sup(Rest).
 
-ssh_channel_sup([{_, Child, _, [ssh_channel_sup]} | _]) ->
+ssh_daemon_channel_sup([{_, Child, _, [ssh_daemon_channel_sup]} | _]) ->
     Child;
-ssh_channel_sup([_ | Rest]) ->
-    ssh_channel_sup(Rest).
+ssh_daemon_channel_sup([_ | Rest]) ->
+    ssh_daemon_channel_sup(Rest).
 
 
 
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index 4e7169d927..ed1840640b 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -290,7 +290,7 @@ shell_channel_tree(Config) ->
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
     ok = ssh_connection:shell(ConnectionRef,ChannelId0),
 
-    ?wait_match([{_, GroupPid,worker,[ssh_channel]}],
+    ?wait_match([{_, GroupPid,worker,[ssh_daemon_channel]}],
 		supervisor:which_children(ChannelSup),
                [GroupPid]),
     {links,GroupLinks} = erlang:process_info(GroupPid, links),
@@ -339,9 +339,9 @@ chk_empty_con_daemon(Daemon) ->
     ?wait_match([{{server,ssh_connection_sup, _,_},
 		  ConnectionSup, supervisor,
 		  [ssh_connection_sup]},
-		 {{server,ssh_channel_sup,_ ,_},
+		 {{server,ssh_daemon_channel_sup,_ ,_},
 		  ChannelSup,supervisor,
-		  [ssh_channel_sup]}],
+		  [ssh_daemon_channel_sup]}],
 		supervisor:which_children(SubSysSup),
 		[ConnectionSup,ChannelSup]),
     ?wait_match([{{ssh_acceptor_sup,_,_,_},_,worker,[ssh_acceptor]}],
@@ -372,9 +372,9 @@ check_sshd_system_tree(Daemon, Config) ->
     ?wait_match([{{server,ssh_connection_sup, _,_},
 		  ConnectionSup, supervisor,
 		  [ssh_connection_sup]},
-		 {{server,ssh_channel_sup,_ ,_},
+		 {{server,ssh_daemon_channel_sup,_ ,_},
 		  ChannelSup,supervisor,
-		  [ssh_channel_sup]}],
+		  [ssh_daemon_channel_sup]}],
 		supervisor:which_children(SubSysSup),
 		[ConnectionSup,ChannelSup]),
     
@@ -388,7 +388,7 @@ check_sshd_system_tree(Daemon, Config) ->
     
     ssh_sftp:start_channel(Client),
 
-    ?wait_match([{_, _,worker,[ssh_channel]}],
+    ?wait_match([{_, _,worker,[ssh_daemon_channel]}],
 		supervisor:which_children(ChannelSup)),
     ssh:close(Client).