1 files changed, 11 insertions, 37 deletions

diff --git a/lib/ssl/src/ssl_connection_sup.erl b/lib/ssl/src/ssl_connection_sup.erl
index 934dd39df5..d43254d23a 100644
--- a/lib/ssl/src/ssl_connection_sup.erl
+++ b/lib/ssl/src/ssl_connection_sup.erl
@@ -45,57 +45,31 @@ start_link() ->
 
 init([]) ->    
   
-    TLSConnetionManager = tls_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(), 
-    
-    DTLSConnetionManager = dtls_connection_manager_child_spec(),
-    DTLSListeners = dtls_listeners_spec(),
+    TLSSup = tls_sup_child_spec(),
+    DTLSSup = dtls_sup_child_spec(),
 
-    {ok, {{one_for_one, 10, 3600}, [TLSConnetionManager, 
-				    ListenOptionsTracker,
-				    DTLSConnetionManager, 
-				    DTLSListeners
-				   ]}}.
+    {ok, {{one_for_one, 10, 3600}, [TLSSup, DTLSSup]}}.
 
     
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
 
-tls_connection_manager_child_spec() ->
-    Name = tls_connection,  
-    StartFunc = {tls_connection_sup, start_link, []},
+tls_sup_child_spec() ->
+    Name = tls_sup,  
+    StartFunc = {tls_sup, start_link, []},
     Restart = permanent, 
     Shutdown = 4000,
-    Modules = [tls_connection_sup],
+    Modules = [tls_sup],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-dtls_connection_manager_child_spec() ->
-    Name = dtls_connection,
-    StartFunc = {dtls_connection_sup, start_link, []},
+dtls_sup_child_spec() ->
+    Name = dtls_sup,
+    StartFunc = {dtls_sup, start_link, []},
     Restart = permanent,
     Shutdown = 4000,
-    Modules = [dtls_connection_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
-listen_options_tracker_child_spec() ->
-    Name = tls_socket,  
-    StartFunc = {ssl_listen_tracker_sup, start_link, []},
-    Restart = permanent, 
-    Shutdown = 4000,
-    Modules = [tls_socket],
+    Modules = [dtls_sup],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-dtls_listeners_spec() ->
-    Name = dtls_listener,  
-    StartFunc = {dtls_listener_sup, start_link, []},
-    Restart = permanent, 
-    Shutdown = 4000,
-    Modules = [],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.