Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

psu_game: Correctly check for the return value of ssl_accept. Also enable reuseaddr.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-07-31 13:55:54 +02:00
parent 7025a89cee
commit cc5b621e35
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/psu/psu_game.erl
View File

@ -26,7 +26,7 @@
-include("include/missions.hrl"). -include("include/missions.hrl").
-include("include/psu_npc.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()} %% @spec start_link(Port) -> {ok,Pid::pid()}
%% @doc Start the game server. %% @doc Start the game server.
@ -51,6 +51,7 @@ cleanup(Pid) ->
%% @doc Listen for connections. %% @doc Listen for connections.
listen(Port, MPid) -> listen(Port, MPid) ->
error_logger:info_report(io_lib:format("psu_game listening on port ~b", [Port])),
{ok, LSocket} = ssl:listen(Port, ?OPTIONS), {ok, LSocket} = ssl:listen(Port, ?OPTIONS),
?MODULE:accept(LSocket, MPid). ?MODULE:accept(LSocket, MPid).
@ -58,9 +59,13 @@ listen(Port, MPid) ->
accept(LSocket, MPid) -> accept(LSocket, MPid) ->
case ssl:transport_accept(LSocket, 5000) of case ssl:transport_accept(LSocket, 5000) of
{ok, CSocket} -> {ok, CSocket} ->
ssl:ssl_accept(CSocket), case ssl:ssl_accept(CSocket, 5000) of
ok ->
Pid = spawn(?MODULE, process_init, [CSocket, MPid]), Pid = spawn(?MODULE, process_init, [CSocket, MPid]),
ssl:controlling_process(CSocket, Pid); ssl:controlling_process(CSocket, Pid);
{error, _Reason} ->
reload
end;
_ -> _ ->
reload reload
end, end,

2
src/psu/psu_login.erl
View File

@ -24,7 +24,7 @@
-include("include/records.hrl"). -include("include/records.hrl").
-include("include/network.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()} %% @spec start_link(Port) -> {ok,Pid::pid()}
%% @doc Start the PSU login server for inclusion in a supervisor tree. %% @doc Start the PSU login server for inclusion in a supervisor tree.