From 6266d1831d1da4bec1cf7928ed978f4692b5291b Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 30 Oct 2012 18:03:03 +0000 Subject: [PATCH] - stub out admin port for mac osx --- .../glest_game/network/server_interface.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp index deec49bf6..707cce7ea 100644 --- a/source/glest_game/network/server_interface.cpp +++ b/source/glest_game/network/server_interface.cpp @@ -60,6 +60,7 @@ ServerInterface::ServerInterface(bool publishEnabled) :GameNetworkInterface() { broadcastMessageQueueThreadAccessor = new Mutex(); inBroadcastMessageThreadAccessor = new Mutex(); + serverSocketAdmin = NULL; nextEventId = 1; gameHasBeenInitiated = false; exitServer = false; @@ -76,12 +77,13 @@ ServerInterface::ServerInterface(bool publishEnabled) :GameNetworkInterface() { // This is an admin port listening only on the localhost intended to // give current connection status info +#ifndef __APPLE__ serverSocketAdmin = new ServerSocket(true); serverSocketAdmin->setBlock(false); serverSocketAdmin->setBindPort(Config::getInstance().getInt("ServerAdminPort", intToStr(GameConstants::serverAdminPort).c_str())); - //serverSocketAdmin->setBindSpecificAddress("127.0.0.1"); serverSocketAdmin->setBindSpecificAddress(Config::getInstance().getString("ServerAdminBindAddress", "127.0.0.1")); serverSocketAdmin->listen(5); +#endif maxFrameCountLagAllowed = Config::getInstance().getInt("MaxFrameCountLagAllowed", intToStr(maxFrameCountLagAllowed).c_str()); maxFrameCountLagAllowedEver = Config::getInstance().getInt("MaxFrameCountLagAllowedEver", intToStr(maxFrameCountLagAllowedEver).c_str()); @@ -373,7 +375,7 @@ void ServerInterface::addSlot(int playerIndex) { if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); assert(playerIndex >= 0 && playerIndex < GameConstants::maxPlayers); MutexSafeWrapper safeMutex(serverSynchAccessor,CODE_AT_LINE); - if(serverSocketAdmin->isSocketValid() == false) { + if(serverSocketAdmin != NULL && serverSocketAdmin->isSocketValid() == false) { serverSocketAdmin->listen(5); } if(serverSocket.isPortBound() == false) { @@ -2484,13 +2486,15 @@ void ServerInterface::simpleTask(BaseThread *callingThread) { } if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) { //printf("Attempt Accept\n"); - Socket *cli = serverSocketAdmin->accept(false); - if(cli != NULL) { - printf("Got status request connection, dumping info...\n"); + if(serverSocketAdmin != NULL) { + Socket *cli = serverSocketAdmin->accept(false); + if(cli != NULL) { + printf("Got status request connection, dumping info...\n"); - string data = DumpStatsToLog(true); - cli->send(data.c_str(),data.length()); - cli->disconnectSocket(); + string data = DumpStatsToLog(true); + cli->send(data.c_str(),data.length()); + cli->disconnectSocket(); + } } } }