swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-05 06:16:47 -04:00
Code Issues Projects Releases Wiki Activity

squash some of my overly verbose commits that have no uses

Browse Source
This commit is contained in:
DarthArgus
2016-09-26 06:27:53 +00:00
parent 10b86bcc7f
commit 1651feb4de
8 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/LoginServer/src/shared/LoginServer.cpp
+18 -9
View File
@@ -160,8 +160,12 @@ LoginServer::LoginServer() :
m_centralService = new Service(ConnectionAllocator<CentralServerConnection>(), setup);
}
// only start the customer tool connection listener if the port is set (defaults to 0)
setup.port = ConfigLoginServer::getCSToolPort();
m_CSService = new Service(ConnectionAllocator<CSToolConnection>(), setup);
if (setup.port)
{
m_CSService = new Service(ConnectionAllocator<CSToolConnection>(), setup);
}
// set up message connections
connectToMessage("ClaimRewardsMessage");
@@ -387,12 +391,17 @@ void LoginServer::receiveMessage(const MessageDispatch::Emitter & source, const
CentralServerConnection * connection = const_cast<CentralServerConnection*>(safe_cast<const CentralServerConnection *>(&source));
DEBUG_REPORT_LOG(true, ("Cluster connection %s opened\n", msg.getClusterName().c_str()));
ClusterListEntry *cle = nullptr;
if (ConfigLoginServer::getDevelopmentMode())
{
// in this mode, we trust the name sent by the cluster and we dynamically add clusters we don't know about
cle = findClusterByName(msg.getClusterName());
if (!cle)
cle = addCluster(msg.getClusterName());
if (ConfigLoginServer::getDevelopmentMode()) {
// in this mode, we trust the name sent by the cluster
cle = findClusterByName(msg.getClusterName());
#ifdef _DEBUG
// if in debug mode, we dynamically add clusters we don't know about
// DO NOT USE ON PRODUCTION! This is where other servers are getting hijacked.
if (!cle)
{
cle = addCluster(msg.getClusterName());
}
#endif
}
else
{
@@ -407,7 +416,7 @@ void LoginServer::receiveMessage(const MessageDispatch::Emitter & source, const
disconnectCluster(*cle, true, false);
cle = nullptr;
}
}
}
if (cle)
{
@@ -1961,4 +1970,4 @@ void LoginServer::setClusterInfoByName(const std::string &name, const std::strin
}
}
// ======================================================================
// ======================================================================