From 1558f3467266afd6f2b3d250e2c3c0b9597e5c45 Mon Sep 17 00:00:00 2001 From: CodeCodon Date: Sun, 12 Jul 2015 01:52:16 -0500 Subject: [PATCH] remove references to SOE servers and default to localhost in places we don't already --- .../AuctionTransferGameAPI/AuctionTransferAPI.cpp | 2 +- .../CentralServer/src/shared/ConfigCentralServer.cpp | 4 ++-- .../ChatServer/src/shared/ConfigChatServer.cpp | 10 +++++----- .../src/shared/ConfigConnectionServer.cpp | 2 +- .../src/shared/ConfigCustomerServiceServer.cpp | 4 ++-- .../LogServer/src/shared/ConfigLogServer.cpp | 2 +- .../PlanetServer/src/shared/ConfigPlanetServer.cpp | 2 +- .../TaskManager/src/shared/ConfigTaskManager.cpp | 2 +- .../serverDatabase/src/shared/ConfigServerDatabase.cpp | 4 ++-- .../serverGame/src/shared/core/ConfigServerGame.cpp | 2 +- .../CSAssistgameapi/CSAssistStressTest/test.cpp | 2 +- .../soePlatform/CTServiceGameAPI/CTServiceAPI.cpp | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp index 0a3fbec6..e75c66d5 100644 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp @@ -4,7 +4,7 @@ #include "Response.h" #include "zip/GZipHelper.h" -#define DEFAULT_HOST "sdt-auctionsys1" +#define DEFAULT_HOST "localhost" #define DEFAULT_PORT 5901 #define DEFAULT_IDENTIFIER "GAME+UNKNOWN" ////////////////////////////////////////////////////////////////////////////////////// diff --git a/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp b/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp index a608ff5a..5bd4a54d 100644 --- a/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/ConfigCentralServer.cpp @@ -76,7 +76,7 @@ void ConfigCentralServer::install(void) KEY_INT (connectionServicePort, 0); KEY_INT (customerServicePort, 61242); KEY_INT (gameServicePort, 44451); - KEY_STRING (loginServerAddress, "64.37.132.178"); + KEY_STRING (loginServerAddress, "127.0.0.1"); KEY_INT (loginServerPort, 44452); KEY_STRING (clusterName, "devcluster"); KEY_STRING (startPlanet, "tatooine"); @@ -121,7 +121,7 @@ void ConfigCentralServer::install(void) KEY_INT (systemTimeMismatchAlertIntervalSeconds, 1*60*60); // seconds KEY_INT (ctsDenyLoginThresholdSeconds, 2*60*60); // seconds KEY_BOOL (auctionEnabled, false); - KEY_STRING (auctionServer, "sdt-plattestsys2.localnet.loc"); + KEY_STRING (auctionServer, "localhost"); KEY_INT (auctionPort, 5901 ); KEY_STRING (auctionIDPrefix, "SWG+"); KEY_BOOL (disconnectDuplicateConnectionsOnOtherGalaxies, false); diff --git a/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp b/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp index 32c0eb68..1dda67f1 100644 --- a/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp +++ b/engine/server/application/ChatServer/src/shared/ConfigChatServer.cpp @@ -73,13 +73,13 @@ void ConfigChatServer::install(void) data = new ConfigChatServer::Data; - KEY_STRING (backupGatewayServerIP, "swo-dev8.localnet.loc"); + KEY_STRING (backupGatewayServerIP, "localhost"); KEY_INT (backupGatewayServerPort, 15150); KEY_STRING (clusterName, "devcluster"); - KEY_STRING (centralServerAddress, "swo-dev8.localnet.loc"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 61232); KEY_STRING (gameCode, "SWG"); - KEY_STRING (gatewayServerIP, "sdplatdev1.localnet.loc"); + KEY_STRING (gatewayServerIP, "localhost"); KEY_INT (gatewayServerPort, 5001); KEY_INT (roomInactivityTimeout, 60 * 60 * 24 * 3); KEY_INT (roomUnpopulatedTimeout, 60 * 5); @@ -88,7 +88,7 @@ void ConfigChatServer::install(void) KEY_INT (loginFlowControlRate, 50); KEY_INT (maxRoomQueriesPerFrame, 5); KEY_BOOL (loggingEnabled, false); - KEY_STRING (registrarHost, "sdplatdev1.localnet.loc"); + KEY_STRING (registrarHost, "localhost"); KEY_INT (registrarPort, 5000); KEY_INT (intervalToSendHeadersToClientSeconds, 1); KEY_INT (maxHeadersToSendToClientPerInterval, 100); @@ -124,7 +124,7 @@ void ConfigChatServer::install(void) if(ms_voiceGateways.empty()) { - static char const * const defaultGateway = "sdt-plattestsys1:9102"; + static char const * const defaultGateway = "localhost:9102"; ms_voiceGateways.push_back(defaultGateway); } } diff --git a/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp b/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp index 76875f37..f98eee21 100644 --- a/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp @@ -56,7 +56,7 @@ void ConfigConnectionServer::install(void) data = new ConfigConnectionServer::Data; - KEY_STRING (centralServerAddress, "swo-dev5.localnet.loc"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 0); KEY_STRING (clientServiceBindInterface, ""); KEY_INT (clientServicePortPrivate, 44464); diff --git a/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp b/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp index 19780c74..eff05cf2 100644 --- a/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp +++ b/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp @@ -45,10 +45,10 @@ void ConfigCustomerServiceServer::install() SetupSharedNetwork::install(networkSetupData); KEY_STRING (clusterName, "devcluster"); - KEY_STRING (centralServerAddress, "swo-dev8.localnet.loc"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 61242); KEY_STRING (gameCode, "SWG"); - KEY_STRING (csServerAddress, "sdlogin1.localnet.loc"); + KEY_STRING (csServerAddress, "localhost"); KEY_INT (csServerPort, 3016); KEY_INT (maxPacketsPerSecond, 50); KEY_INT (requestTimeoutSeconds, 300); diff --git a/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp b/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp index 61629d67..c2240c1b 100644 --- a/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp +++ b/engine/server/application/LogServer/src/shared/ConfigLogServer.cpp @@ -33,7 +33,7 @@ void ConfigLogServer::install() KEY_INT (logServicePort, 44467); KEY_STRING (logServiceBindInterface, ""); - KEY_STRING (loggingServerApiAddress, "sdt-gp1"); + KEY_STRING (loggingServerApiAddress, "localhost"); KEY_STRING (loggingServerApiLoginName, "MISCONFIGURED_LOG_SERVER_LOGIN_NAME"); KEY_STRING (loggingServerApiPassword, "pacman"); KEY_STRING (loggingServerApiDefaultDirectory, "swg"); diff --git a/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp b/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp index 9d7c5311..85e2c38e 100644 --- a/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp +++ b/engine/server/application/PlanetServer/src/shared/ConfigPlanetServer.cpp @@ -31,7 +31,7 @@ void ConfigPlanetServer::install(void) data = new ConfigPlanetServer::Data; - KEY_STRING (centralServerAddress, "swo-dev1.localnet.loc"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 44455); KEY_STRING (sceneID, "default"); KEY_INT (gameServicePort, 0); diff --git a/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp b/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp index 7a315a1e..20c68e81 100644 --- a/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp +++ b/engine/server/application/TaskManager/src/shared/ConfigTaskManager.cpp @@ -63,7 +63,7 @@ void ConfigTaskManager::install(void) KEY_INT (gameServicePort, 60001); KEY_INT (consoleConnectionPort, 60000); KEY_STRING (consoleServiceBindInterface, ""); - KEY_STRING (loginServerAddress, "swo-dev5.localnet.loc"); + KEY_STRING (loginServerAddress, "localhost"); KEY_INT (loginServerTaskServicePort, 44459); KEY_FLOAT (maximumLoad, 3.0f); KEY_FLOAT (loadConnectionServer, 0.5f); diff --git a/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp b/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp index 55090164..2760bb31 100644 --- a/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp +++ b/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp @@ -49,9 +49,9 @@ void ConfigServerDatabase::install(void) KEY_STRING (databaseUID,"gameserver"); KEY_STRING (databasePWD,"gameserver"); KEY_STRING (databaseProtocol,"DEFAULT"); - KEY_STRING (centralServerAddress, "swo-dev1.localnet.loc"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 44451); - KEY_STRING (commoditiesServerAddress, "swo-dev1.localnet.loc"); + KEY_STRING (commoditiesServerAddress, "localhost"); KEY_INT (commoditiesServerPort, 44457); //todo: confirm that this is a good port MSH KEY_INT (taskManagerPort, 60001); KEY_INT (expectedDBVersion, 270); diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp index eeef77c4..c3824942 100644 --- a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp +++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp @@ -50,7 +50,7 @@ void ConfigServerGame::install(void) KEY_FLOAT (startZ, 0.0f); startingPosition = Vector(data->startX,data->startY,data->startZ); KEY_INT (taskManagerPort, 60001); - KEY_STRING (centralServerAddress, "swo-dev1.localnet.loc"); + KEY_STRING (centralServerAddress, "localhost"); KEY_INT (centralServerPort, 44451); KEY_STRING (javaVMName, ""); KEY_STRING (scriptPath, "../../data/sku.0/sys.server/compiled/game"); diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp index ffefaee5..9c7de960 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp @@ -457,7 +457,7 @@ int main(int argc, char **argv) #ifdef AUTO_RUN ResetGlobals(); - serverhost = "sdplatdev2.localnet.loc"; + serverhost = "localhost"; //serverhost = "64.37.152.161"; //serverport = 3018; //serverhost = "64.37.153.15"; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp index 1b3e24d4..57f9b409 100644 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp @@ -7,8 +7,8 @@ #include "Response.h" const unsigned short EMPTY_STRING[1] = { 0 }; -const char * DEFAULT_GAMECODE = "ZZZ"; -const char * DEFAULT_HOST = "ctservice.localnet.loc"; +const char * DEFAULT_GAMECODE = "SWG"; +const char * DEFAULT_HOST = "localhost"; const unsigned short DEFAULT_PORT = 2000; namespace CTService