From e2ecc6e0db2064d072ad68b7c0a3d1bcf7c27c3a Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 23 Sep 2011 11:02:18 +0200
Subject: Improve code structure

---
 lib/ssl/src/ssl_tls_dist_proxy.erl | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

(limited to 'lib/ssl/src')

diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
index 1a998a0f34..8993582fe8 100644
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -126,11 +126,9 @@ get_tcp_address(Socket) ->
 		  family = inet
 		}.
 
-accept_loop(Proxy, Type, Listen, Extra) ->
+accept_loop(Proxy, erts = Type, Listen, Extra) ->
     process_flag(priority, max),
-    case Type of
-	erts ->
-	    case gen_tcp:accept(Listen) of
+    case gen_tcp:accept(Listen) of
 		{ok, Socket} ->
 		    Extra ! {accept,self(),Socket,inet,proxy},
 		    receive 
@@ -142,30 +140,31 @@ accept_loop(Proxy, Type, Listen, Extra) ->
 			    exit(unsupported_protocol)
 		    end;
 		Error ->
-		    exit(Error)
+	    exit(Error)
+    end,
+    accept_loop(Proxy, Type, Listen, Extra);
+
+accept_loop(Proxy, world = Type, Listen, Extra) ->
+    process_flag(priority, max),
+    case gen_tcp:accept(Listen) of
+	{ok, Socket} ->
+	    Opts = get_ssl_options(server),
+	    case ssl:ssl_accept(Socket, Opts) of
+		{ok, SslSocket} ->
+		    PairHandler =
+			spawn_link(fun() ->
+					   setup_connection(SslSocket, Extra)
+				   end),
+		    ok = ssl:controlling_process(SslSocket, PairHandler),
+		    flush_old_controller(PairHandler, SslSocket);
+		_ ->
+		    gen_tcp:close(Socket)
 	    end;
-	world ->
-	    case gen_tcp:accept(Listen) of
-		{ok, Socket} ->
-		    Opts = get_ssl_options(server),
-		    case ssl:ssl_accept(Socket, Opts) of
-			{ok, SslSocket} ->
-			    PairHandler =
-				spawn_link(fun() ->
-						   setup_connection(SslSocket, Extra)
-					   end),
-			    ok = ssl:controlling_process(SslSocket, PairHandler),
-			    flush_old_controller(PairHandler, SslSocket);
-			_ ->
-			    gen_tcp:close(Socket)
-		    end;
-		Error ->
-		    exit(Error)
-	    end
+	Error ->
+	    exit(Error)
     end,
     accept_loop(Proxy, Type, Listen, Extra).
 
-
 try_connect(Port) ->
     case gen_tcp:connect({127,0,0,1}, Port, [{active, false}, {packet,?PPRE}]) of
 	R = {ok, _S} ->
-- 
cgit v1.2.3