diff options
| author | Raimo Niskanen <[email protected]> | 2016-07-25 15:41:33 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-08-02 09:37:56 +0200 |
| commit | 401dbd2334cf8f063c9a697eafcd0694e3bbe2fe (patch) | |
| tree | 7e17af08f47dc12f8db24af6db7df09d62b5fc20 /lib/ssl/src/tls_connection.erl | |
| parent | 46a93b31a9b94ffb478393788376f78249e60a1f (diff) | |
| download | otp-401dbd2334cf8f063c9a697eafcd0694e3bbe2fe.tar.gz otp-401dbd2334cf8f063c9a697eafcd0694e3bbe2fe.tar.bz2 otp-401dbd2334cf8f063c9a697eafcd0694e3bbe2fe.zip | |
Rewrite SSL for gen_statem M:callback_mode/0
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 9880befa94..eaf866c339 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -68,10 +68,8 @@ hello/3, certify/3, cipher/3, abbreviated/3, %% Handshake states connection/3]). %% gen_statem callbacks --export([terminate/3, code_change/4, format_status/2]). +-export([callback_mode/0, terminate/3, code_change/4, format_status/2]). --define(GEN_STATEM_CB_MODE, state_functions). - %%==================================================================== %% Internal application API %%==================================================================== @@ -169,11 +167,14 @@ init([Role, Host, Port, Socket, Options, User, CbInfo]) -> State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo), try State = ssl_connection:ssl_config(State0#state.ssl_options, Role, State0), - gen_statem:enter_loop(?MODULE, [], ?GEN_STATEM_CB_MODE, init, State) + gen_statem:enter_loop(?MODULE, [], init, State) catch throw:Error -> - gen_statem:enter_loop(?MODULE, [], ?GEN_STATEM_CB_MODE, error, {Error, State0}) + gen_statem:enter_loop(?MODULE, [], error, {Error, State0}) end. +callback_mode() -> + state_functions. + %%-------------------------------------------------------------------- %% State functions %%-------------------------------------------------------------------- @@ -457,9 +458,9 @@ format_status(Type, Data) -> %%-------------------------------------------------------------------- code_change(_OldVsn, StateName, State0, {Direction, From, To}) -> State = convert_state(State0, Direction, From, To), - {?GEN_STATEM_CB_MODE, StateName, State}; + {ok, StateName, State}; code_change(_OldVsn, StateName, State, _) -> - {?GEN_STATEM_CB_MODE, StateName, State}. + {ok, StateName, State}. %%-------------------------------------------------------------------- %%% Internal functions |