diff options
author | Ingela Anderton Andin <[email protected]> | 2015-06-26 08:47:38 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-06-26 11:35:31 +0200 |
commit | fcbf2e682cedebdf768dc90273889b1f8d4b2ce4 (patch) | |
tree | 28e429fafddc8b5cdb9e2e4141f2730fc3c1b3f9 /lib/ssh/src/ssh_shell.erl | |
parent | 0f3f8f5871a1ea503cc80ae17adc8dec96c79445 (diff) | |
download | otp-fcbf2e682cedebdf768dc90273889b1f8d4b2ce4.tar.gz otp-fcbf2e682cedebdf768dc90273889b1f8d4b2ce4.tar.bz2 otp-fcbf2e682cedebdf768dc90273889b1f8d4b2ce4.zip |
ssh: Use old crypto with newer ssh
Many issues with previous process design, causing for instance process leaks,
are compleatly gone in the redesigned ssh-3.0 and later.
This is a backport of newer ssh design to R15B
Diffstat (limited to 'lib/ssh/src/ssh_shell.erl')
-rw-r--r-- | lib/ssh/src/ssh_shell.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_shell.erl b/lib/ssh/src/ssh_shell.erl index 6590486a4c..8031450617 100644 --- a/lib/ssh/src/ssh_shell.erl +++ b/lib/ssh/src/ssh_shell.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2010. All Rights Reserved. +%% Copyright Ericsson AB 2009-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -23,7 +23,9 @@ -include("ssh_connect.hrl"). --behaviour(ssh_channel). +%%% As this is an user interactive client it behaves like a daemon +%%% channel inspite of it being a client. +-behaviour(ssh_daemon_channel). %% ssh_channel callbacks -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]). @@ -123,7 +125,7 @@ handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, Status}}, State) -> {stop, ChannelId, State}. %%-------------------------------------------------------------------- -%% Function: handle_ssh_msg(Args) -> {ok, State} | {stop, ChannelId, State} +%% Function: handle_msg(Args) -> {ok, State} | {stop, ChannelId, State} %% %% Description: Handles other channel messages %%-------------------------------------------------------------------- |