diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-29 10:35:33 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-29 10:35:33 +0100 |
| commit | 2b9e5ea8652ad8d85c9bc3ceda812904718578a2 (patch) | |
| tree | aefa90e8228846666093e7962a891e01313c5c26 /lib/ssl/src/ssl_connection.erl | |
| parent | 779ea5fecf0e0ba525410a3dcb4ea84d12b5c77f (diff) | |
| parent | a8d9ed7566d571dc234891517ab95818a3d1b516 (diff) | |
| download | otp-2b9e5ea8652ad8d85c9bc3ceda812904718578a2.tar.gz otp-2b9e5ea8652ad8d85c9bc3ceda812904718578a2.tar.bz2 otp-2b9e5ea8652ad8d85c9bc3ceda812904718578a2.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_connection.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 414b181078..b1efcbb857 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -61,7 +61,7 @@ %% General gen_statem state functions with extra callback argument %% to determine if it is an SSL/TLS or DTLS gen_statem machine --export([init/4, hello/4, abbreviated/4, certify/4, cipher/4, +-export([init/4, error/4, hello/4, abbreviated/4, certify/4, cipher/4, connection/4, death_row/4, downgrade/4]). %% gen_statem callbacks @@ -70,9 +70,6 @@ %% Erlang Distribution export -export([get_sslsocket/1, handshake_complete/3]). -%% TODO: do not export, call state function instead --export([handle_info/3, handle_call/5, handle_common_event/5]). - %%==================================================================== %% Setup %%==================================================================== @@ -592,6 +589,15 @@ init(_Type, _Event, _State, _Connection) -> {keep_state_and_data, [postpone]}. %%-------------------------------------------------------------------- +-spec error(gen_statem:event_type(), + {start, timeout()} | term(), #state{}, + tls_connection | dtls_connection) -> + gen_statem:state_function_result(). +%%-------------------------------------------------------------------- +error({call, From}, Msg, State, Connection) -> + handle_call(Msg, From, ?FUNCTION_NAME, State, Connection). + +%%-------------------------------------------------------------------- -spec hello(gen_statem:event_type(), #hello_request{} | #server_hello{} | term(), #state{}, tls_connection | dtls_connection) -> |