← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/common_test/src/ct_ssh.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/common_test/src/ct_ssh.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
 
%% 
4
 
%% Copyright Ericsson AB 2009. All Rights Reserved.
5
 
%% 
 
3
%%
 
4
%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
 
5
%%
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
8
8
%% compliance with the License. You should have received a copy of the
9
9
%% Erlang Public License along with this software. If not, it can be
10
10
%% retrieved online at http://www.erlang.org/.
11
 
%% 
 
11
%%
12
12
%% Software distributed under the License is distributed on an "AS IS"
13
13
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
14
14
%% the License for the specific language governing rights and limitations
15
15
%% under the License.
16
 
%% 
 
16
%%
17
17
%% %CopyrightEnd%
18
18
%%
19
19
 
961
961
                 ssh ->
962
962
                     ssh:connect(Addr, Port, FinalOptions);
963
963
                 sftp ->
964
 
                     ssh_sftp:connect(Addr, Port, FinalOptions)
 
964
                     ssh_sftp:start_channel(Addr, Port, FinalOptions)
965
965
             end,
966
966
    case Result of
967
 
        {ok,SSHRef} ->
 
967
        Error = {error,_} ->
 
968
            Error;
 
969
        Ok ->
 
970
            SSHRef = element(2, Ok),
968
971
            log(heading(init,KeyOrName), 
969
972
                "Opened ~w connection:\nHost: ~p (~p)\nUser: ~p\nPassword: ~p\n",
970
973
                [ConnType,Addr,Port,User,lists:duplicate(length(Password),$*)]),
971
974
            {ok,SSHRef,#state{ssh_ref=SSHRef, conn_type=ConnType,
972
 
                              target=KeyOrName}};
973
 
        Error ->
974
 
            Error
 
975
                              target=KeyOrName}}
975
976
    end.
976
977
 
977
978
%% @hidden
978
979
handle_msg(sftp_connect, State) ->
979
980
    #state{ssh_ref=SSHRef, target=Target} = State,
980
981
    log(heading(sftp_connect,Target), "SSH Ref: ~p", [SSHRef]),
981
 
    {ssh_sftp:connect(SSHRef),State};
 
982
    {ssh_sftp:start_channel(SSHRef),State};
982
983
 
983
984
handle_msg({session_open,TO}, State) ->
984
985
    #state{ssh_ref=SSHRef, target=Target} = State,
1202
1203
        sftp ->
1203
1204
            log(heading(disconnect_sftp,State#state.target),
1204
1205
                "SFTP Ref: ~p",[SSHRef]),
1205
 
            ssh_sftp:stop(SSHRef)
 
1206
            ssh_sftp:stop_channel(SSHRef)
1206
1207
    end.
1207
1208
 
1208
1209
 
1213
1214
%%% 
1214
1215
do_recv_response(SSH, Chn, Data, End, Timeout) ->
1215
1216
    receive
1216
 
 
1217
1217
        {ssh_cm, SSH, {open,Chn,RemoteChn,{session}}} ->
1218
1218
            debug("RECVD open"),
1219
1219
            {ok,{open,Chn,RemoteChn,{session}}};