ssh: ssh_daemon_channel replaced by ssh_server_channel

11 files changed, 103 insertions, 45 deletions

diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index a2cefe7c15..1665e8b554 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -40,42 +40,43 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssh-$(VSN)
 # Behaviour (api) modules are first so they are compiled when
 # the compiler reaches a callback module using them.
 BEHAVIOUR_MODULES= \
-	ssh_sftpd_file_api \
-        ssh_channel \
-	ssh_daemon_channel \
 	ssh_client_key_api \
-	ssh_server_key_api
+	ssh_daemon_channel \
+	ssh_server_channel \
+	ssh_server_key_api \
+	ssh_sftpd_file_api \
+        ssh_channel
 
 MODULES= \
 	ssh \
-	ssh_sup \
-	sshc_sup \
-	sshd_sup \
-	ssh_options \
-	ssh_connection_sup \
-	ssh_connection \
-	ssh_connection_handler \
-	ssh_dbg \
-	ssh_shell \
-	ssh_system_sup \
-	ssh_subsystem_sup \
-	ssh_daemon_channel_sup \
-	ssh_acceptor_sup \
 	ssh_acceptor \
+	ssh_acceptor_sup \
 	ssh_app \
 	ssh_auth\
 	ssh_bits \
 	ssh_cli \
+	ssh_connection \
+	ssh_connection_handler \
+	ssh_connection_sup \
+	ssh_dbg \
 	ssh_file \
-	ssh_io \
 	ssh_info \
+	ssh_io \
 	ssh_message \
 	ssh_no_io \
+	ssh_options \
+	ssh_server_channel_sup \
 	ssh_sftp \
 	ssh_sftpd \
 	ssh_sftpd_file\
+	ssh_shell \
+	ssh_subsystem_sup \
+	ssh_sup \
+	ssh_system_sup \
 	ssh_transport \
-	ssh_xfer
+	ssh_xfer \
+	sshc_sup \
+	sshd_sup
 
 HRL_FILES =
 
@@ -169,7 +170,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_daemon_channel_sup.$(EMULATOR): ssh_daemon_channel_sup.erl
+$(EBIN)/ssh_server_channel_sup.$(EMULATOR): ssh_server_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
@@ -210,6 +211,7 @@ $(EBIN)/ssh_xfer.$(EMULATOR): ssh_xfer.erl ssh.hrl ssh_xfer.hrl
 $(EBIN)/ssh_sftpd_file_api.$(EMULATOR): ssh_sftpd_file_api.erl
 $(EBIN)/ssh_channel.$(EMULATOR): ssh_channel.erl ssh_connect.hrl
 $(EBIN)/ssh_daemon_channel.$(EMULATOR): ssh_daemon_channel.erl
+$(EBIN)/ssh_server_channel.$(EMULATOR): ssh_server_channel.erl
 $(EBIN)/ssh_client_key_api.$(EMULATOR): ssh_client_key_api.erl \
   ../../public_key/include/public_key.hrl \
   ../../public_key/include/OTP-PUB-KEY.hrl \
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index b935ea94d5..897235e054 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -14,7 +14,6 @@
 	     ssh_cli,
              ssh_client_key_api,
 	     ssh_channel,
-	     ssh_daemon_channel_sup,
 	     ssh_connection,
 	     ssh_connection_handler,
 	     ssh_connection_sup,
@@ -27,6 +26,8 @@
 	     ssh_io,
 	     ssh_info,
 	     ssh_no_io,
+	     ssh_server_channel,
+	     ssh_server_channel_sup,
              ssh_server_key_api,
 	     ssh_sftp,
 	     ssh_sftpd,
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index 31f6194bf9..fcc1d3d59f 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -25,12 +25,12 @@
 
 -module(ssh_cli).
 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
 -include("ssh.hrl").
 -include("ssh_connect.hrl").
 
-%% ssh_daemon_channel callbacks
+%% ssh_server_channel callbacks
 -export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2]).
 
 -export([dbg_trace/3]).
@@ -47,7 +47,7 @@
 	 }).
 
 %%====================================================================
-%% ssh_daemon_channel callbacks
+%% ssh_server_channel callbacks
 %%====================================================================
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 0a07ea778d..cff9ec3a61 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_daemon_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec);
+            ssh_server_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_daemon_channel]} <- 
+    NumChannels = length([x || {_,_,worker,[ssh_server_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 e1d6906bbc..fdb6c10971 100644
--- a/lib/ssh/src/ssh_daemon_channel.erl
+++ b/lib/ssh/src/ssh_daemon_channel.erl
@@ -48,8 +48,8 @@
         ]).
 
 start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
-    ssh_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
+    ssh_server_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
 
 
 get_print_info(Pid) ->
-    ssh_channel:get_print_info(Pid).
+    ssh_server_channel:get_print_info(Pid).
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index e1613f0599..ee244f1432 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_daemon_channel_sup,_,_},Pid,supervisor,[ssh_daemon_channel_sup]}) when is_pid(Pid) ->
+print_channels({{server,ssh_server_channel_sup,_,_},Pid,supervisor,[ssh_server_channel_sup]}) when is_pid(Pid) ->
     Children =  supervisor:which_children(Pid),
-    ChannelPids = [P || {R,P,worker,[ssh_daemon_channel]} <- Children,
+    ChannelPids = [P || {R,P,worker,[ssh_server_channel]} <- Children,
 			is_pid(P),
 			is_reference(R)],
     case ChannelPids of
 	[] -> io_lib:format(?INDENT?INDENT"No channels~n",[]);
 	[Ch1Pid|_] ->
-	    {{ConnManager,_}, _Str} = ssh_daemon_channel:get_print_info(Ch1Pid),
+	    {{ConnManager,_}, _Str} = ssh_server_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_daemon_channel:get_print_info(Pid),
+	{{ConnManager,ChannelID}, Str} = ssh_server_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_server_channel.erl b/lib/ssh/src/ssh_server_channel.erl
new file mode 100644
index 0000000000..117b7855e2
--- /dev/null
+++ b/lib/ssh/src/ssh_server_channel.erl
@@ -0,0 +1,55 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Description: a gen_server implementing a simple
+%% terminal (using the group module) for a CLI
+%% over SSH
+
+-module(ssh_server_channel).
+
+%% 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.
+
+-callback terminate(Reason :: (normal | shutdown | {shutdown, term()} |
+                               term()),
+                    State :: term()) ->
+    term().
+
+-callback handle_msg(Msg ::term(), State :: term()) ->
+    {ok, State::term()} | {stop, ChannelId::ssh:channel_id(), State::term()}. 
+-callback handle_ssh_msg({ssh_cm, ConnectionRef::ssh:connection_ref(), SshMsg::term()},
+			 State::term()) -> {ok, State::term()} |
+					   {stop, ChannelId::ssh:channel_id(),
+					    State::term()}.
+
+%%% 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).
+
+
+get_print_info(Pid) ->
+    ssh_channel:get_print_info(Pid).
diff --git a/lib/ssh/src/ssh_daemon_channel_sup.erl b/lib/ssh/src/ssh_server_channel_sup.erl
index cd86347501..70799db714 100644
--- a/lib/ssh/src/ssh_daemon_channel_sup.erl
+++ b/lib/ssh/src/ssh_server_channel_sup.erl
@@ -22,7 +22,7 @@
 %%----------------------------------------------------------------------
 %% Purpose: Ssh channel supervisor.
 %%----------------------------------------------------------------------
--module(ssh_daemon_channel_sup).
+-module(ssh_server_channel_sup).
 
 -behaviour(supervisor).
 
@@ -40,10 +40,10 @@ start_link(Args) ->
 start_child(Sup, Callback, Id, Args, Exec) ->
     ChildSpec =
         #{id       => make_ref(),
-          start    => {ssh_daemon_channel, start_link, [self(), Id, Callback, Args, Exec]},
+          start    => {ssh_server_channel, start_link, [self(), Id, Callback, Args, Exec]},
           restart  => temporary,
           type     => worker,
-          modules  => [ssh_daemon_channel]
+          modules  => [ssh_server_channel]
          },
     supervisor:start_child(Sup, ChildSpec).
 
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index fda9a38a43..cb2eab1fec 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -24,7 +24,7 @@
 
 -module(ssh_sftpd).
 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
 -include_lib("kernel/include/file.hrl").
 
diff --git a/lib/ssh/src/ssh_shell.erl b/lib/ssh/src/ssh_shell.erl
index 6470f4c492..084daa6821 100644
--- a/lib/ssh/src/ssh_shell.erl
+++ b/lib/ssh/src/ssh_shell.erl
@@ -27,9 +27,9 @@
 
 %%% As this is an user interactive client it behaves like a daemon
 %%% channel inspite of it being a client. 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
-%% ssh_daemon_channel callbacks
+%% ssh_server_channel callbacks
 -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 
 %% Spawn export
@@ -46,7 +46,7 @@
        ).
 
 %%====================================================================
-%% ssh_daemon_channel callbacks
+%% ssh_server_channel callbacks
 %%====================================================================
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_subsystem_sup.erl b/lib/ssh/src/ssh_subsystem_sup.erl
index f1e74a24ac..f80be7f20b 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_daemon_channel_sup(Children).
+    ssh_server_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_daemon_channel_sup, Address, Port),
-      start    => {ssh_daemon_channel_sup, start_link, [Options]},
+    #{id       => id(Role, ssh_server_channel_sup, Address, Port),
+      start    => {ssh_server_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_daemon_channel_sup([{_, Child, _, [ssh_daemon_channel_sup]} | _]) ->
+ssh_server_channel_sup([{_, Child, _, [ssh_server_channel_sup]} | _]) ->
     Child;
-ssh_daemon_channel_sup([_ | Rest]) ->
-    ssh_daemon_channel_sup(Rest).
+ssh_server_channel_sup([_ | Rest]) ->
+    ssh_server_channel_sup(Rest).