diff options
| author | Hans Nilsson <[email protected]> | 2016-04-26 12:45:49 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-04-27 13:39:05 +0200 |
| commit | bbf8fb6e42e730a4037485c3313e63733d8c100b (patch) | |
| tree | f2508bd40342708307857b83fd1f783536113bab /lib/ssh/src/ssh.erl | |
| parent | 73f90b506c5ceff51cd8a6f264dc8fe20dd9351d (diff) | |
| download | otp-bbf8fb6e42e730a4037485c3313e63733d8c100b.tar.gz otp-bbf8fb6e42e730a4037485c3313e63733d8c100b.tar.bz2 otp-bbf8fb6e42e730a4037485c3313e63733d8c100b.zip | |
ssh: Idle-timer refactoring and some cosmetics and inlineing
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 48ef8aad2a..2eae897ce2 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -86,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} @@ -228,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 -> |