diff options
| author | Hans Nilsson <[email protected]> | 2017-03-21 15:20:58 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-04-07 10:19:56 +0200 |
| commit | 3bbb2c9d5f92205f91cc68b9cebe263b84afe3e2 (patch) | |
| tree | 018fafdcde7570aea3c8891f09eda5ed90380493 | |
| parent | f64dc7858c06d3096b47532270d9f6b732aa7ece (diff) | |
| download | otp-3bbb2c9d5f92205f91cc68b9cebe263b84afe3e2.tar.gz otp-3bbb2c9d5f92205f91cc68b9cebe263b84afe3e2.tar.bz2 otp-3bbb2c9d5f92205f91cc68b9cebe263b84afe3e2.zip | |
ssh: -type and -spec adjustments
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 17 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_options.erl | 12 |
2 files changed, 16 insertions, 13 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 63eeb0bd0a..e03c15454c 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -113,12 +113,25 @@ -type double_algs() :: list( {client2serverlist,simple_algs()} | {server2client,simple_algs()} ) | simple_algs() . +-type options() :: #{socket_options := socket_options(), + internal_options := internal_options(), + option_key() => any() + }. + +-type socket_options() :: proplists:proplist(). +-type internal_options() :: #{option_key() => any()}. + +-type option_key() :: atom(). + + %% Records -record(ssh, { - role, %% client | server - peer, %% string version of peer address + role :: client | role(), + peer :: undefined | + {inet:hostname(), + {inet:ip_adress(),inet:port_number()}}, %% string version of peer address c_vsn, %% client version {Major,Minor} s_vsn, %% server version {Major,Minor} diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl index cb3f63103c..febd3f6eef 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -38,16 +38,6 @@ %%%================================================================ %%% Types --type options() :: #{socket_options := socket_options(), - internal_options := internal_options(), - option_key() => any() - }. - --type socket_options() :: proplists:proplist(). --type internal_options() :: #{option_key() => any()}. - --type option_key() :: atom(). - -type option_in() :: proplists:property() | proplists:proplist() . -type option_class() :: internal_options | socket_options | user_options . @@ -431,7 +421,7 @@ default(client) -> }, {silently_accept_hosts, def} => - #{default => {false,none}, + #{default => false, chk => fun check_silently_accept_hosts/1, class => user_options }, |