diff options
| author | Andreas Schultz <[email protected]> | 2016-09-01 17:39:33 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-05 14:37:27 +0200 |
| commit | 21a2e000f61a65a7636aac4a8cdaf147a9281991 (patch) | |
| tree | ab4e09eb973bcebf19dcb6af701ed47f728cd924 /lib | |
| parent | 40a08384a9b66a837d7b34bcd4fc6c191f7dff2b (diff) | |
| download | otp-21a2e000f61a65a7636aac4a8cdaf147a9281991.tar.gz otp-21a2e000f61a65a7636aac4a8cdaf147a9281991.tar.bz2 otp-21a2e000f61a65a7636aac4a8cdaf147a9281991.zip | |
dtls: Prepare start of DTLS connection manager with SSL app
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_sup.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_sup.erl b/lib/ssl/src/ssl_sup.erl index 7fa1f7dc9e..ba20f65f44 100644 --- a/lib/ssl/src/ssl_sup.erl +++ b/lib/ssl/src/ssl_sup.erl @@ -47,11 +47,13 @@ init([]) -> SessionCertManager = session_and_cert_manager_child_spec(), TLSConnetionManager = tls_connection_manager_child_spec(), %% Not supported yet - %%DTLSConnetionManager = tls_connection_manager_child_spec(), + %%DTLSConnetionManager = dtls_connection_manager_child_spec(), %% Handles emulated options so that they inherited by the accept socket, even when setopts is performed on %% the listen socket ListenOptionsTracker = listen_options_tracker_child_spec(), - {ok, {{one_for_all, 10, 3600}, [SessionCertManager, TLSConnetionManager, ListenOptionsTracker]}}. + {ok, {{one_for_all, 10, 3600}, [SessionCertManager, TLSConnetionManager, + %%DTLSConnetionManager, + ListenOptionsTracker]}}. manager_opts() -> @@ -93,15 +95,14 @@ tls_connection_manager_child_spec() -> {Name, StartFunc, Restart, Shutdown, Type, Modules}. %% dtls_connection_manager_child_spec() -> -%% Name = dtls_connection, +%% Name = dtls_connection, %% StartFunc = {dtls_connection_sup, start_link, []}, -%% Restart = permanent, +%% Restart = permanent, %% Shutdown = 4000, %% Modules = [dtls_connection, ssl_connection], %% Type = supervisor, %% {Name, StartFunc, Restart, Shutdown, Type, Modules}. - listen_options_tracker_child_spec() -> Name = ssl_socket, StartFunc = {ssl_listen_tracker_sup, start_link, []}, |