remove references to SOE servers and default to localhost in places we don't already

This commit is contained in:
CodeCodon
2015-07-12 01:52:16 -05:00
parent 9e710b6d76
commit 1558f34672
12 changed files with 20 additions and 20 deletions
@@ -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"
//////////////////////////////////////////////////////////////////////////////////////
@@ -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);
@@ -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);
}
}
@@ -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);
@@ -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);
@@ -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");
@@ -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);
@@ -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);
@@ -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);
@@ -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");
@@ -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";
@@ -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