diff options
| author | Hans Nilsson <[email protected]> | 2016-05-02 13:08:18 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-05-02 13:08:18 +0200 |
| commit | 8a7789a5814dad194310d08dafc4421d22b3c89f (patch) | |
| tree | 95b22111cdd36b2022cbfa56e5304a141d173801 /lib/ssh/src/ssh.erl | |
| parent | d32a045349d5f9156142aa57a932b6a270052d29 (diff) | |
| parent | 5fa07312d27a7ff6826bf943e3b9d6575be3acf1 (diff) | |
| download | otp-8a7789a5814dad194310d08dafc4421d22b3c89f.tar.gz otp-8a7789a5814dad194310d08dafc4421d22b3c89f.tar.bz2 otp-8a7789a5814dad194310d08dafc4421d22b3c89f.zip | |
Merge branch 'hans/ssh/gen_statem/OTP-13267'
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index d0121e73ba..2eae897ce2 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -36,6 +36,11 @@ shell/1, shell/2, shell/3 ]). +%%% Type exports +-export_type([connection_ref/0, + channel_id/0 + ]). + %%-------------------------------------------------------------------- -spec start() -> ok | {error, term()}. -spec start(permanent | transient | temporary) -> ok | {error, term()}. @@ -81,7 +86,7 @@ connect(Host, Port, Options, Timeout) -> ConnectionTimeout = proplists:get_value(connect_timeout, Options, infinity), try Transport:connect(Host, Port, [ {active, false} | SocketOptions], ConnectionTimeout) of {ok, Socket} -> - Opts = [{user_pid, self()}, {host, Host} | fix_idle_time(SshOptions)], + Opts = [{user_pid,self()}, {host,Host} | SshOptions], ssh_connection_handler:start_connection(client, Socket, Opts, Timeout); {error, Reason} -> {error, Reason} @@ -223,13 +228,6 @@ default_algorithms() -> %%-------------------------------------------------------------------- %%% Internal functions %%-------------------------------------------------------------------- -fix_idle_time(SshOptions) -> - case proplists:get_value(idle_time, SshOptions) of - undefined -> - [{idle_time, infinity}|SshOptions]; - _ -> - SshOptions - end. start_daemon(Host, Port, Options, Inet) -> case handle_options(Options) of {error, _Reason} = Error -> |