diff options
| author | Niclas Eklund <[email protected]> | 2010-05-28 12:00:00 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-08-20 08:55:16 +0200 |
| commit | d5fa5e53b882cd9849034399ac769d2b7e7d3179 (patch) | |
| tree | 9df0a6c0b516b182112aa1d4dcf466617060e19e /lib/ssh/src/ssh.erl | |
| parent | 8c78ac1382f089167afbf8d794cb9eff834577bd (diff) | |
| download | otp-d5fa5e53b882cd9849034399ac769d2b7e7d3179.tar.gz otp-d5fa5e53b882cd9849034399ac769d2b7e7d3179.tar.bz2 otp-d5fa5e53b882cd9849034399ac769d2b7e7d3179.zip | |
ssh: Patch 1119
OTP-8550 The function ssh:connect/4 was not exported.
OTP-8644 Aligned error message with used version (SSH_FX_FAILURE
vs SSH_FX_NOT_A_DIRECTORY, the latter introduced in version
6).
OTP-8645 Resolved race condition when another connection is started
before a channel is opened in the first connection.
OTP-8535 The configuration parameter ip_v6_disabled is now available,
which makes it possible for the user to alter the IP version
SSH shall use.
OTP-8534 The ssh_connection:send operation now accepts infinity as
timeout.
OTP-8524 The connection handler now include stack traces when a channel
message is not handled correctly.
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index f9a986a8b6..994c77436a 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2004-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2004-2010. 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 %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% @@ -24,7 +24,7 @@ -include("ssh.hrl"). -include("ssh_connect.hrl"). --export([start/0, start/1, stop/0, connect/3, close/1, connection_info/2, +-export([start/0, start/1, stop/0, connect/3, connect/4, close/1, connection_info/2, channel_info/3, daemon/1, daemon/2, daemon/3, stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2, @@ -330,10 +330,10 @@ handle_options([{nodelay, _} = Opt | Rest], SockOpts, Opts) -> handle_options([Opt | Rest], SockOpts, Opts) -> handle_options(Rest, SockOpts, [Opt | Opts]). +%% Has IPv6 been disabled? inetopt(true) -> - inet6; - + inet; inetopt(false) -> - inet. + inet6. |