aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-02-28 12:19:37 +0100
committerHans Nilsson <[email protected]>2017-04-07 10:19:55 +0200
commit7925b59450dd6f34b756da7b10dd10af95304d94 (patch)
tree05888de759e41f6563308a1eecb22b521d1497eb
parent7b21b7b5fa0b6da173080bc8322e99eead905191 (diff)
downloadotp-7925b59450dd6f34b756da7b10dd10af95304d94.tar.gz
otp-7925b59450dd6f34b756da7b10dd10af95304d94.tar.bz2
otp-7925b59450dd6f34b756da7b10dd10af95304d94.zip
ssh: Option pruning
-rw-r--r--lib/ssh/src/ssh.erl3
-rw-r--r--lib/ssh/src/ssh_acceptor.erl1
-rw-r--r--lib/ssh/src/ssh_system_sup.erl2
3 files changed, 2 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 369a00ac40..c1be9f732d 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -368,8 +368,7 @@ do_start_daemon(Socket, Options) ->
_:_ -> throw(bad_socket)
end,
Host = fmt_host(IP),
- Opts = ?PUT_INTERNAL_OPT([{asocket, Socket},
- {asock_owner,self()},
+ Opts = ?PUT_INTERNAL_OPT([{connected_socket, Socket},
{address, Host},
{port, Port},
{role, server}], Options),
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index 42be18f2ad..4943f062b4 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -66,7 +66,6 @@ acceptor_init(Parent, Port, Address, Opts, AcceptTimeout) ->
of
{ok, ListenSocket} ->
proc_lib:init_ack(Parent, {ok, self()}),
- {_, Callback, _} = ?GET_OPT(transport, Opts),
acceptor_loop(Callback,
Port, Address, Opts, ListenSocket, AcceptTimeout);
{error,Error} ->
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index b0bbd3aae5..5a58ef1c44 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -131,7 +131,7 @@ init([Options]) ->
RestartStrategy = one_for_one,
MaxR = 0,
MaxT = 3600,
- Children = case ?GET_INTERNAL_OPT(asocket,Options,undefined) of
+ Children = case ?GET_INTERNAL_OPT(connected_socket,Options,undefined) of
undefined -> child_specs(Options);
_ -> []
end,