diff options
author | Ingela Anderton Andin <[email protected]> | 2017-03-06 15:05:59 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-03-06 16:00:32 +0100 |
commit | d795732ea0fdd669a0b6dc60b199374b432c7cfb (patch) | |
tree | f299e228c83ef4e48a2d58c4386ce32c6f370ae3 /lib/ssl/src/ssl.erl | |
parent | 2117e29474712445725b30b8b5a8a53b5f99b6a0 (diff) | |
download | otp-d795732ea0fdd669a0b6dc60b199374b432c7cfb.tar.gz otp-d795732ea0fdd669a0b6dc60b199374b432c7cfb.tar.bz2 otp-d795732ea0fdd669a0b6dc60b199374b432c7cfb.zip |
dtls: Correct dialyzer spec and postpone inclusion of test
The new_options_in_accept test is not working yet, however DTLS is still
work in progress and we want to make a progress merge to avoid merge conflicts
with other progress of the ssl application.
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r-- | lib/ssl/src/ssl.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 273429008e..ed04c7e67b 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -196,10 +196,12 @@ ssl_accept(#sslsocket{fd = {_, _, _, Tracker}} = Socket, SslOpts, Timeout) when catch Error = {error, _Reason} -> Error end; -ssl_accept(#sslsocket{fd = {_, _, _}} = Socket, SslOpts, Timeout) when +ssl_accept(#sslsocket{pid = Pid, fd = {_, _, _}} = Socket, SslOpts, Timeout) when (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity)-> try - ssl_connection:handshake(Socket, {SslOpts, []}, Timeout) + {ok, EmOpts, _} = dtls_udp_listener:get_all_opts(Pid), + ssl_connection:handshake(Socket, {SslOpts, + tls_socket:emulated_socket_options(EmOpts, #socket_options{})}, Timeout) catch Error = {error, _Reason} -> Error end; |