diff options
| author | Hans Nilsson <[email protected]> | 2017-04-18 12:16:40 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-04-18 12:16:40 +0200 |
| commit | 9e104d8cb7bf78088ed7fb06e1824a299d31c0bc (patch) | |
| tree | 7019f13dce51bf77c942740d1729e5a3e09eefa5 /lib | |
| parent | 3b79995e86b0b5adb9a0083e2b8b16236c536451 (diff) | |
| parent | 0d91185b9093de3a254f0a869e7dadfcfa79295d (diff) | |
| download | otp-9e104d8cb7bf78088ed7fb06e1824a299d31c0bc.tar.gz otp-9e104d8cb7bf78088ed7fb06e1824a299d31c0bc.tar.bz2 otp-9e104d8cb7bf78088ed7fb06e1824a299d31c0bc.zip | |
Merge branch 'hans/ssh/dialyzer_fixes'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 1a8e022da8..84bb7dc23f 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -337,8 +337,7 @@ renegotiate_data(ConnectionHandler) -> transport_protocol :: atom(), % ex: tcp transport_cb :: atom(), % ex: gen_tcp transport_close_tag :: atom(), % ex: tcp_closed - ssh_params :: #ssh{} - | undefined, + ssh_params :: #ssh{}, socket :: inet:socket(), decrypted_data_buffer = <<>> :: binary(), encrypted_data_buffer = <<>> :: binary(), @@ -370,7 +369,7 @@ init_connection_handler(Role, Socket, Opts) -> StartState, D); - {stop, {error,enotconn}} -> + {stop, enotconn} -> %% Handles the abnormal sequence: %% SYN-> %% <-SYNACK @@ -394,21 +393,20 @@ init([Role,Socket,Opts]) -> requests = [], options = Opts}, D0 = #data{starter = ?GET_INTERNAL_OPT(user_pid, Opts), + connection_state = C, socket = Socket, transport_protocol = Protocol, transport_cb = Callback, transport_close_tag = CloseTag, ssh_params = init_ssh_record(Role, Socket, PeerAddr, Opts), - opts = Opts + opts = Opts }, D = case Role of client -> %% Start the renegotiation timers timer:apply_after(?REKEY_TIMOUT, gen_statem, cast, [self(), renegotiate]), timer:apply_after(?REKEY_DATA_TIMOUT, gen_statem, cast, [self(), data_size]), - cache_init_idle_timer( - D0#data{connection_state = C} - ); + cache_init_idle_timer(D0); server -> Sups = ?GET_INTERNAL_OPT(supervisors, Opts), cache_init_idle_timer( |