diff options
| author | j.uhlig <[email protected]> | 2018-06-26 17:07:13 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-07-02 09:02:00 +0200 |
| commit | 5ada450fe10a5fc51b7f3f0900571a10547635a1 (patch) | |
| tree | 45ac84215485f09ebedce319121ed5f719b30493 /src/ranch_ssl.erl | |
| parent | caeadc82615e9e5ce0c2d92f882cad7b9cb7322d (diff) | |
| download | ranch-5ada450fe10a5fc51b7f3f0900571a10547635a1.tar.gz ranch-5ada450fe10a5fc51b7f3f0900571a10547635a1.tar.bz2 ranch-5ada450fe10a5fc51b7f3f0900571a10547635a1.zip | |
Introduce Transport:handshake/1,2
This commit deprecates Transport:accept_ack/1 in favor of
a new forward-compatible function. Transport:handshake/1,2
will use ssl:handshake/2,3 from Ranch 2.0 onward.
Diffstat (limited to 'src/ranch_ssl.erl')
| -rw-r--r-- | src/ranch_ssl.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index ac96e45..d651e7a 100644 --- a/src/ranch_ssl.erl +++ b/src/ranch_ssl.erl @@ -15,6 +15,10 @@ -module(ranch_ssl). -behaviour(ranch_transport). +-ifdef(OTP_RELEASE). +-compile({nowarn_deprecated_function, [{ssl, ssl_accept, 3}]}). +-endif. + -export([name/0]). -export([secure/0]). -export([messages/0]). @@ -22,6 +26,7 @@ -export([disallowed_listen_options/0]). -export([accept/2]). -export([accept_ack/2]). +-export([handshake/3]). -export([connect/3]). -export([connect/4]). -export([recv/3]). @@ -128,9 +133,14 @@ accept(LSocket, Timeout) -> -spec accept_ack(ssl:sslsocket(), timeout()) -> ok. accept_ack(CSocket, Timeout) -> - case ssl:ssl_accept(CSocket, Timeout) of + {ok, _} = handshake(CSocket, [], Timeout), + ok. + +-spec handshake(ssl:sslsocket(), opts(), timeout()) -> {ok, ssl:sslsocket()}. +handshake(CSocket, Opts, Timeout) -> + case ssl:ssl_accept(CSocket, Opts, Timeout) of ok -> - ok; + {ok, CSocket}; %% Garbage was most likely sent to the socket, don't error out. {error, {tls_alert, _}} -> ok = close(CSocket), |