From cc5b621e35000da01c63ff9f32c787244d88beeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@dev-extend.eu>
Date: Sat, 31 Jul 2010 13:55:54 +0200
Subject: [PATCH] psu_game: Correctly check for the return value of ssl_accept.
 Also enable reuseaddr.

---
 src/psu/psu_game.erl  | 13 +++++++++----
 src/psu/psu_login.erl |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/psu/psu_game.erl b/src/psu/psu_game.erl
index a9bf16f..3bcba30 100644
--- a/src/psu/psu_game.erl
+++ b/src/psu/psu_game.erl
@@ -26,7 +26,7 @@
 -include("include/missions.hrl").
 -include("include/psu_npc.hrl").
 
--define(OPTIONS, [binary, {active, false}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]).
+-define(OPTIONS, [binary, {active, false}, {reuseaddr, true}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]).
 
 %% @spec start_link(Port) -> {ok,Pid::pid()}
 %% @doc Start the game server.
@@ -51,6 +51,7 @@ cleanup(Pid) ->
 
 %% @doc Listen for connections.
 listen(Port, MPid) ->
+	error_logger:info_report(io_lib:format("psu_game listening on port ~b", [Port])),
 	{ok, LSocket} = ssl:listen(Port, ?OPTIONS),
 	?MODULE:accept(LSocket, MPid).
 
@@ -58,9 +59,13 @@ listen(Port, MPid) ->
 accept(LSocket, MPid) ->
 	case ssl:transport_accept(LSocket, 5000) of
 		{ok, CSocket} ->
-			ssl:ssl_accept(CSocket),
-			Pid = spawn(?MODULE, process_init, [CSocket, MPid]),
-			ssl:controlling_process(CSocket, Pid);
+			case ssl:ssl_accept(CSocket, 5000) of
+				ok ->
+					Pid = spawn(?MODULE, process_init, [CSocket, MPid]),
+					ssl:controlling_process(CSocket, Pid);
+				{error, _Reason} ->
+					reload
+			end;
 		_ ->
 			reload
 	end,
diff --git a/src/psu/psu_login.erl b/src/psu/psu_login.erl
index 6c54e82..18baa1f 100644
--- a/src/psu/psu_login.erl
+++ b/src/psu/psu_login.erl
@@ -24,7 +24,7 @@
 -include("include/records.hrl").
 -include("include/network.hrl").
 
--define(OPTIONS, [binary, {active, false}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]).
+-define(OPTIONS, [binary, {active, false}, {reuseaddr, true}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]).
 
 %% @spec start_link(Port) -> {ok,Pid::pid()}
 %% @doc Start the PSU login server for inclusion in a supervisor tree.