swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-28 22:15:49 -04:00
Code Issues Projects Releases Wiki Activity

partial revert

Browse Source
This commit is contained in:
DarthArgus
2016-07-26 03:15:10 +00:00
parent 814cf4f731
commit 5503ac606a
2 changed files with 494 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/CentralServer/src/shared/CentralServer.cpp
+475 -442
View File
File diff suppressed because it is too large Load Diff
engine/server/application/CentralServer/src/shared/CentralServer.h
+19 -18
View File
@@ -50,7 +50,7 @@ public:
typedef unsigned int SpawnDelaySeconds;
struct CentralObject
{
CentralObject();
CentralObject();
CentralObject(const SceneId & sceneId, uint32 authProcess);
SceneId m_sceneId;
@@ -148,12 +148,12 @@ public:
static void run(void);
static void done();
static void remove();
ConnectionServerConnection * getAnyConnectionServer();
GameServerConnection * getGameServer(const uint32 processId) const;
GameServerConnection * getGameServer(const SceneId &scene) const;
const ServersList getGameServers(const SceneId &scene) const;
GameServerConnection * getGameServer (const uint32 processId) const;
GameServerConnection * getGameServer (const SceneId &scene) const;
const ServersList getGameServers (const SceneId &scene) const;
std::vector<const GameServerConnection *> getGameServers() const;
time_t getLastTimeSystemTimeMismatchNotification() const;
@@ -172,23 +172,24 @@ public:
void removeFromAccountConnectionMap(StationId suid);
private:
void handleRequestGameServerForLoginMessage(const RequestGameServerForLoginMessage & msg);
void handleRequestSceneTransfer(const RequestSceneTransfer & msg);
void handleGameServerForLoginMessage(const GameServerForLoginMessage & msg);
void handleRequestGameServerForLoginMessage (const RequestGameServerForLoginMessage & msg);
void handleRequestSceneTransfer (const RequestSceneTransfer & msg);
void handleGameServerForLoginMessage (const GameServerForLoginMessage & msg);
void handleExchangeListCreditsMessage(const ExchangeListCreditsMessage& msg);
size_t getGameServerCount(void) const;
void handleExchangeListCreditsMessage (const ExchangeListCreditsMessage& msg);
size_t getGameServerCount (void) const;
void update();
void sendPopulationUpdateToLoginServer();
void sendMetricsToWebAPI(const std::string &updateURL);
void sendMetricsToWebAPI(std::string updateURL);
ConnectionServerConnection * getConnectionServerForAccount(StationId suid);
void addToAccountConnectionMap(StationId suid, ConnectionServerConnection * cconn, uint32 subscriptionBits);
void removeFromAccountConnectionMap(int connectionServerConnectionId);
void doServerPings();
void excommunicateServer(const ExcommunicateGameServerMessage &);
protected:
protected:
friend class Singleton<CentralServer>;
CentralServer();
@@ -204,11 +205,11 @@ private:
SceneGameMap m_gameServers;
ConnectionServerSUIDMap m_accountConnectionMap;
// Network::Address clientService;
/**
The dbProcessServerProcessId is set by the DBProcess. The central server
refers to this process if there are no matching objects in any of its maps.
*/
// Network::Address clientService;
/**
The dbProcessServerProcessId is set by the DBProcess. The central server
refers to this process if there are no matching objects in any of its maps.
*/
uint32 m_dbProcessServerProcessId;
bool m_done;
Service * m_gameService;
@@ -329,7 +330,7 @@ inline int CentralServer::getNumConnectionServers() const
inline int CentralServer::getNumDatabaseServers() const
{
GameServerConnection * g = getGameServer(getDbProcessServerProcessId());
if (g)
if(g)
{
return 1;
}