swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-11 21:44:58 -04:00
Code Issues Projects Releases Wiki Activity

better oci error reporting

Browse Source
This commit is contained in:
DarthArgus
2016-09-26 06:27:53 +00:00
parent 1651feb4de
commit 41639d8156
8 changed files with 118 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/LoginServer/src/shared/LoginServer.cpp
+18 -12
View File
@@ -146,11 +146,11 @@ LoginServer::LoginServer() :
setup.compress = ConfigLoginServer::getCompressClientNetworkTraffic();
setup.useTcp = false;
clientService = new Service(ConnectionAllocator<ClientConnection>(), setup);
clientService = new Service(ConnectionAllocator<ClientConnection>(), setup, ConfigLoginServer::getMaxConnectionsPerIP());
setup.compress = false;
setup.port = ConfigLoginServer::getPingServicePort();
pingService = new Service(ConnectionAllocator<PingConnection>(), setup);
pingService = new Service(ConnectionAllocator<PingConnection>(), setup, ConfigLoginServer::getMaxConnectionsPerIP());
setup.useTcp = true;
if (ConfigLoginServer::getDevelopmentMode())
@@ -246,16 +246,22 @@ ClientConnection* LoginServer::getUnvalidatedClient(int clientId)
void LoginServer::removeClient(int clientId)
{
WARNING_STRICT_FATAL(clientId == 0, ("Tried to remove a client with client id == 0"));
std::map<int, ClientConnection*>::iterator i = m_clientMap.find(clientId);
if (i != m_clientMap.end())
{
if (i->second->getIsValidated())
{
IGNORE_RETURN(m_validatedClientMap.erase(i->second->getStationId()));
}
IGNORE_RETURN(m_clientMap.erase(clientId));
}
if (clientId) // yeah why bother if it's 0 or null? i realize 0 is a valid int but since previously the warning below fired if it was 0....yeah, no
{
std::map<int, ClientConnection*>::iterator i = m_clientMap.find(clientId);
if (i != m_clientMap.end())
{
if (i->second->getIsValidated())
{
IGNORE_RETURN(m_validatedClientMap.erase(i->second->getStationId()));
}
IGNORE_RETURN(m_clientMap.erase(clientId));
}
}
else
{
WARNING_STRICT_FATAL(true, ("Tried to remove a client with client id == 0"));
}
}
//-----------------------------------------------------------------------