diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-11-19 10:04:47 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-12-02 09:50:27 +0100 |
| commit | b84f16e07336eecfb6dd30a4ef3824de76525265 (patch) | |
| tree | c4398187a5f0c4c942a1b7fa5f6cd2a6d4798054 /lib/ssl/src/tls_connection.erl | |
| parent | c46f856dda536d92537461115112b2021c08b52a (diff) | |
| download | otp-b84f16e07336eecfb6dd30a4ef3824de76525265.tar.gz otp-b84f16e07336eecfb6dd30a4ef3824de76525265.tar.bz2 otp-b84f16e07336eecfb6dd30a4ef3824de76525265.zip | |
ssl: API and supervisor
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index c8380c109c..37d4928531 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -49,7 +49,7 @@ register_session/4 ]). -%% Called by ssl_connection_sup +%% Called by tls_connection_sup -export([start_link/7]). %% gen_fsm callbacks @@ -263,7 +263,7 @@ send_change_cipher(Msg, #state{connection_states = ConnectionStates0, State0#state{connection_states = ConnectionStates}. %%==================================================================== -%% ssl_connection_sup API +%% tls_connection_sup API %%==================================================================== %%-------------------------------------------------------------------- @@ -777,7 +777,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_} = Opts, User, {CbModule, _,_, _} = CbInfo, Timeout) -> try - {ok, Pid} = ssl_connection_sup:start_child([Role, Host, Port, Socket, + {ok, Pid} = tls_connection_sup:start_child([Role, Host, Port, Socket, Opts, User, CbInfo]), {ok, SslSocket} = socket_control(Socket, Pid, CbModule), ok = handshake(SslSocket, Timeout), @@ -791,7 +791,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_} = Opts, User, {CbModule, _,_, _} = CbInfo, Timeout) -> try - {ok, Pid} = ssl_connection_sup:start_child_dist([Role, Host, Port, Socket, + {ok, Pid} = tls_connection_sup:start_child_dist([Role, Host, Port, Socket, Opts, User, CbInfo]), {ok, SslSocket} = socket_control(Socket, Pid, CbModule), ok = handshake(SslSocket, Timeout), |