diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-13 15:03:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-13 15:03:14 +0200 |
| commit | 8d081115b4d57bb3a52a6ebe87c119cb762bc153 (patch) | |
| tree | f84436268ac9aff09817afcbfc6560e39172744a /lib/ssl/src/ssl_connection.erl | |
| parent | d284f024154cd8b1f8da219d716ad5aa6e8f539c (diff) | |
| parent | 8508cc2a00012bfadb9dd8f894d187965191b0ca (diff) | |
| download | otp-8d081115b4d57bb3a52a6ebe87c119cb762bc153.tar.gz otp-8d081115b4d57bb3a52a6ebe87c119cb762bc153.tar.bz2 otp-8d081115b4d57bb3a52a6ebe87c119cb762bc153.zip | |
Merge branch 'ia/ssl/dialyzer-specs' into maint
* ia/ssl/dialyzer-specs:
ssl: Fix dialyzer specs to reflect reality
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index c4771b03d5..4ac4e81d9e 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -58,7 +58,10 @@ %%==================================================================== %%-------------------------------------------------------------------- -spec connect(tls_connection | dtls_connection, - host(), inet:port_number(), port(), {#ssl_options{}, #socket_options{}}, + host(), inet:port_number(), port(), + {#ssl_options{}, #socket_options{}, + %% Tracker only needed on server side + undefined}, pid(), tuple(), timeout()) -> {ok, #sslsocket{}} | {error, reason()}. %% @@ -73,9 +76,10 @@ connect(Connection, Host, Port, Socket, Options, User, CbInfo, Timeout) -> end. %%-------------------------------------------------------------------- -spec ssl_accept(tls_connection | dtls_connection, - inet:port_number(), port(), {#ssl_options{}, #socket_options{}}, - pid(), tuple(), timeout()) -> - {ok, #sslsocket{}} | {error, reason()}. + inet:port_number(), port(), + {#ssl_options{}, #socket_options{}, undefined | pid()}, + pid(), tuple(), timeout()) -> + {ok, #sslsocket{}} | {error, reason()}. %% %% Description: Performs accept on an ssl listen socket. e.i. performs %% ssl handshake. @@ -102,7 +106,8 @@ handshake(#sslsocket{pid = Pid}, Timeout) -> end. %%-------------------------------------------------------------------- --spec handshake(#sslsocket{}, #ssl_options{}, timeout()) -> ok | {error, reason()}. +-spec handshake(#sslsocket{}, {#ssl_options{},#socket_options{}}, + timeout()) -> ok | {error, reason()}. %% %% Description: Starts ssl handshake with some new options %%-------------------------------------------------------------------- |