From bd6b5632f1c57b5d0d674dfa43844b5dd7b366cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 17 Nov 2010 21:31:33 +0100 Subject: [PATCH] The server now requires Erlang R14B to run. --- Makefile | 2 +- README | 2 ++ src/egs.erl | 2 ++ src/egs_network.erl | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 17fe872..4dd8d4e 100644 --- a/Makefile +++ b/Makefile @@ -42,4 +42,4 @@ run: @echo "EGS is free software available under the GNU GPL version 3" @echo "Copyright (C) 2010 Loic Hoguin" @echo - $(ERL) -ssl protocol_version '{sslv3}' -sname egs -pa ebin -boot start_sasl -s reloader -s egs + $(ERL) -sname egs -pa ebin -boot start_sasl -s reloader -s egs diff --git a/README b/README index d1e9262..4792a6b 100644 --- a/README +++ b/README @@ -10,4 +10,6 @@ This is a very early work in progress. It does not include any data files yet, meaning one cannot at this point run a server without using the proprietary files from AOTI. +The server requires Erlang R14B to compile and run. + Use 'make' to compile, 'make run' to run and 'make fclean' to cleanup. diff --git a/src/egs.erl b/src/egs.erl index ff296a1..721a895 100644 --- a/src/egs.erl +++ b/src/egs.erl @@ -34,6 +34,7 @@ ensure_started(App) -> %% @doc Start the EGS server. start() -> ensure_started(crypto), + ensure_started(public_key), ensure_started(ssl), ssl:seed(crypto:rand_bytes(256)), ensure_started(mnesia), @@ -45,6 +46,7 @@ stop() -> Res = application:stop(egs), application:stop(mnesia), application:stop(ssl), + application:stop(public_key), application:stop(crypto), Res. diff --git a/src/egs_network.erl b/src/egs_network.erl index 3f5981d..e6cf2b7 100644 --- a/src/egs_network.erl +++ b/src/egs_network.erl @@ -21,7 +21,7 @@ -export([listen/2, recv/3]). %% API. -export([accept/2]). %% Internal. --define(OPTIONS, [binary, {active, true}, {reuseaddr, true}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]). +-define(OPTIONS, [binary, {active, true}, {reuseaddr, true}, {ssl_imp, new}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]). %% @doc Listen for connections. listen(Port, CallbackMod) ->