diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-15 14:35:22 +0100 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-16 18:25:58 +0100 |
commit | 01489b9930025bed3c5bfc34b6c86045cbaccb46 (patch) | |
tree | 2820d4a62f0562168cee7b989fd611adfff0da70 /src/game-server/accountconnection.cpp | |
parent | cee7b8909d3591ad851ac7b31753b83fbfdabfa5 (diff) | |
download | manaserv-01489b9930025bed3c5bfc34b6c86045cbaccb46.tar.gz manaserv-01489b9930025bed3c5bfc34b6c86045cbaccb46.tar.bz2 manaserv-01489b9930025bed3c5bfc34b6c86045cbaccb46.tar.xz manaserv-01489b9930025bed3c5bfc34b6c86045cbaccb46.zip |
Deharcoded the host and port options for each servers.
Changes:
============================================================
For the account server:
------------------------------------------------------------
Old -> New
------------------------------------------------------------
net_accountServerAddress,
net_listenHost -> net_accountHost
net_accountServerPort -> net_accountListenToClientPort
net_accountServerPort +1 -> net_accountListenToGamePort
For the game server:
------------------------------------------------------------
Old -> New
------------------------------------------------------------
net_gameServerAddress -> net_gameHost
net_gameServerPort -> net_gameListenToClientPort
For the chat server:
------------------------------------------------------------
Old -> New
------------------------------------------------------------
-> net_chatHost
net_accountServerPort + 2 -> net_chatListenToClientPort
Special fallback feature, as requested by Freeyorp:
When the net_accountListenToClientPort (default to 9601)
is set, the 3 others ports will automatically offset from it,
if they're not set, following this rule:
net_accountListenToGamePort = net_accountListenToClientPort + 1
net_chatListenToClientPort = net_accountListenToClientPort + 2
net_gameListenToClientPort = net_accountListenToClientPort + 3
Resolves: Mana-Mantis #216.
Reviewed-by: Jaxad0127.
Diffstat (limited to 'src/game-server/accountconnection.cpp')
-rw-r--r-- | src/game-server/accountconnection.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp index 72546fbf..c3bc83bf 100644 --- a/src/game-server/accountconnection.cpp +++ b/src/game-server/accountconnection.cpp @@ -49,9 +49,17 @@ AccountConnection::~AccountConnection() bool AccountConnection::start(int gameServerPort) { const std::string accountServerAddress = - Configuration::getValue("net_accountServerAddress", "localhost"); + Configuration::getValue("net_accountHost", "localhost"); + + // When the accountListenToGamePort is set, we use it. + // Otherwise, we use the accountListenToClientPort + 1 if the option is set. + // If neither, the DEFAULT_SERVER_PORT + 1 is used. + int alternativePort = + Configuration::getValue("net_accountListenToClientPort", 0) + 1; + if (alternativePort == 1) + alternativePort = DEFAULT_SERVER_PORT + 1; const int accountServerPort = - Configuration::getValue("net_accountServerPort", DEFAULT_SERVER_PORT) + 1; + Configuration::getValue("net_accountListenToGamePort", alternativePort); if (!Connection::start(accountServerAddress, accountServerPort)) { @@ -62,7 +70,7 @@ bool AccountConnection::start(int gameServerPort) LOG_INFO("Connection established to the account server."); const std::string gameServerAddress = - Configuration::getValue("net_gameServerAddress", "localhost"); + Configuration::getValue("net_gameHost", "localhost"); const std::string password = Configuration::getValue("net_password", "changeMe"); |