diff options
author | Ingela Anderton Andin <[email protected]> | 2019-05-07 17:21:49 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-05-07 17:21:49 +0200 |
commit | d5782e4fad73ed834c206f2839f12608c8eb841c (patch) | |
tree | 8cf120916389456005b429d21370f152b62815e8 | |
parent | 79df59b5e0643a236fdc238e7417053f84e50c77 (diff) | |
download | otp-d5782e4fad73ed834c206f2839f12608c8eb841c.tar.gz otp-d5782e4fad73ed834c206f2839f12608c8eb841c.tar.bz2 otp-d5782e4fad73ed834c206f2839f12608c8eb841c.zip |
Revert "ssl: Add check when to toggle internal active N"
This reverts commit 6e190b012dd5a304fc42a5f3bb58ff173a23eb66.
-rw-r--r-- | lib/ssl/src/tls_connection.erl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 872a557e67..a05858221a 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -171,21 +171,19 @@ next_record(#state{protocol_buffers = connection_states = ConnectionStates, ssl_options = #ssl_options{padding_check = Check}} = State) -> next_record(State, CipherTexts, ConnectionStates, Check); -next_record(#state{user_data_buffer = {_,0,_}, - protocol_buffers = #protocol_buffers{tls_cipher_texts = []}, - protocol_specific = #{active_n_toggle := true, - active_n := N} = ProtocolSpec, +next_record(#state{protocol_buffers = #protocol_buffers{tls_cipher_texts = []}, + protocol_specific = #{active_n_toggle := true, active_n := N} = ProtocolSpec, static_env = #static_env{socket = Socket, close_tag = CloseTag, transport_cb = Transport} - } = State) -> + } = State) -> case tls_socket:setopts(Transport, Socket, [{active, N}]) of ok -> - {no_record, State#state{protocol_specific = ProtocolSpec#{active_n_toggle => false}}}; + {no_record, State#state{protocol_specific = ProtocolSpec#{active_n_toggle => false}}}; _ -> - self() ! {CloseTag, Socket}, - {no_record, State} - end; + self() ! {CloseTag, Socket}, + {no_record, State} + end; next_record(State) -> {no_record, State}. |