mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 07:31:21 +02:00
Code Issues Projects Releases Wiki Activity

- stub out admin port for mac osx

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-30 18:03:03 +00:00
parent e86a1ea5c0
commit 6266d1831d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/glest_game/network/server_interface.cpp
View File

@@ -60,6 +60,7 @@ ServerInterface::ServerInterface(bool publishEnabled) :GameNetworkInterface() {
broadcastMessageQueueThreadAccessor = new Mutex(); broadcastMessageQueueThreadAccessor = new Mutex();
inBroadcastMessageThreadAccessor = new Mutex(); inBroadcastMessageThreadAccessor = new Mutex();
serverSocketAdmin = NULL;
nextEventId = 1; nextEventId = 1;
gameHasBeenInitiated = false; gameHasBeenInitiated = false;
exitServer = false; exitServer = false;
@@ -76,12 +77,13 @@ ServerInterface::ServerInterface(bool publishEnabled) :GameNetworkInterface() {
// This is an admin port listening only on the localhost intended to // This is an admin port listening only on the localhost intended to
// give current connection status info // give current connection status info
#ifndef __APPLE__
serverSocketAdmin = new ServerSocket(true); serverSocketAdmin = new ServerSocket(true);
serverSocketAdmin->setBlock(false); serverSocketAdmin->setBlock(false);
serverSocketAdmin->setBindPort(Config::getInstance().getInt("ServerAdminPort", intToStr(GameConstants::serverAdminPort).c_str())); 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->setBindSpecificAddress(Config::getInstance().getString("ServerAdminBindAddress", "127.0.0.1"));
serverSocketAdmin->listen(5); serverSocketAdmin->listen(5);
#endif
maxFrameCountLagAllowed = Config::getInstance().getInt("MaxFrameCountLagAllowed", intToStr(maxFrameCountLagAllowed).c_str()); maxFrameCountLagAllowed = Config::getInstance().getInt("MaxFrameCountLagAllowed", intToStr(maxFrameCountLagAllowed).c_str());
maxFrameCountLagAllowedEver = Config::getInstance().getInt("MaxFrameCountLagAllowedEver", intToStr(maxFrameCountLagAllowedEver).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__); 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); assert(playerIndex >= 0 && playerIndex < GameConstants::maxPlayers);
MutexSafeWrapper safeMutex(serverSynchAccessor,CODE_AT_LINE); MutexSafeWrapper safeMutex(serverSynchAccessor,CODE_AT_LINE);
if(serverSocketAdmin->isSocketValid() == false) { if(serverSocketAdmin != NULL && serverSocketAdmin->isSocketValid() == false) {
serverSocketAdmin->listen(5); serverSocketAdmin->listen(5);
} }
if(serverSocket.isPortBound() == false) { if(serverSocket.isPortBound() == false) {
@@ -2484,13 +2486,15 @@ void ServerInterface::simpleTask(BaseThread *callingThread) {
} }
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) { if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
//printf("Attempt Accept\n"); //printf("Attempt Accept\n");
Socket *cli = serverSocketAdmin->accept(false); if(serverSocketAdmin != NULL) {
if(cli != NULL) { Socket *cli = serverSocketAdmin->accept(false);
printf("Got status request connection, dumping info...\n"); if(cli != NULL) {
printf("Got status request connection, dumping info...\n");
string data = DumpStatsToLog(true); string data = DumpStatsToLog(true);
cli->send(data.c_str(),data.length()); cli->send(data.c_str(),data.length());
cli->disconnectSocket(); cli->disconnectSocket();
}
} }
} }
} }