diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-12-14 09:44:10 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-12-14 09:44:10 +0100 |
| commit | 70892a1e03e441b24f879a9bb5f124defbab2e16 (patch) | |
| tree | deb09395eec02ee31efda4415070113a29d89128 /lib/ssh/src/ssh_sftpd.erl | |
| parent | 33124ad120c10e5057f25753a9d4b56f265b53dd (diff) | |
| parent | 671cf55d2388ef3c30f8e0e6b3e5ec824b02da09 (diff) | |
| download | otp-70892a1e03e441b24f879a9bb5f124defbab2e16.tar.gz otp-70892a1e03e441b24f879a9bb5f124defbab2e16.tar.bz2 otp-70892a1e03e441b24f879a9bb5f124defbab2e16.zip | |
Merge branch 'ia/ssh/add_users_guide/OTP-7786'
* ia/ssh/add_users_guide/OTP-7786:
ssh: Document and clean up SSH behaviours
ssh: Add Users Guide and enhance man pages
ssh: Added User's Guide framework and minor enhancements
Diffstat (limited to 'lib/ssh/src/ssh_sftpd.erl')
| -rw-r--r-- | lib/ssh/src/ssh_sftpd.erl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl index ec7b76b0b3..6d6f4a0121 100644 --- a/lib/ssh/src/ssh_sftpd.erl +++ b/lib/ssh/src/ssh_sftpd.erl @@ -24,7 +24,7 @@ -module(ssh_sftpd). %%-behaviour(gen_server). --behaviour(ssh_channel). +-behaviour(ssh_subsystem). -include_lib("kernel/include/file.hrl"). @@ -36,7 +36,7 @@ -export([subsystem_spec/1, listen/1, listen/2, listen/3, stop/1]). --export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2, code_change/3]). +-export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2]). -record(state, { xf, % [{channel,ssh_xfer states}...] @@ -128,14 +128,6 @@ init(Options) -> %%-------------------------------------------------------------------- -%% Function: code_change(OldVsn, State, Extra) -> {ok, NewState} -%% Description: -%%-------------------------------------------------------------------- -code_change(_OldVsn, State, _Extra) -> - {ok, State}. - - -%%-------------------------------------------------------------------- %% Function: handle_ssh_msg(Args) -> {ok, State} | {stop, ChannelId, State} %% %% Description: Handles channel messages |