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

i know this is probably broken but i'll get it working

Browse Source
This commit is contained in:
DarthArgus
2016-12-31 21:13:11 -06:00
parent 778ba0b02f
commit 46d49e9bac
4 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp
+12 -12
View File
@@ -98,7 +98,6 @@ ConnectionServer::ConnectionServer() :
networkBarrier(0),
pingSocket(new UdpSock),
m_recoverTime(0),
m_sessionApiClient(0),
m_pingTrafficNumBytes(0),
m_recoveringClientList()
{
@@ -1106,10 +1105,10 @@ void ConnectionServer::update()
}
}
if (m_sessionApiClient)
/*if (m_sessionApiClient)
{
m_sessionApiClient->update();
}
}*/
static const int ping_throttle_max = 1024;
@@ -1430,7 +1429,7 @@ CentralConnection * ConnectionServer::getCentralConnection()
void ConnectionServer::installSessionValidation()
{
int i = 0;
/*int i = 0;
std::vector<char const *> sessionServers;
int const numberOfSessionServers = ConfigConnectionServer::getNumberOfSessionServers();
for (i = 0; i < numberOfSessionServers; ++i)
@@ -1445,7 +1444,8 @@ void ConnectionServer::installSessionValidation()
// if there were none specified, use defaults
FATAL(i == 0, ("No session servers specified for session API"));
m_sessionApiClient = new SessionApiClient(&sessionServers[0], i);
m_sessionApiClient = new SessionApiClient(&sessionServers[0], i);*/
return;
}
// ----------------------------------------------------------------------
@@ -1575,14 +1575,14 @@ SessionApiClient* ConnectionServer::getSessionApiClient()
{
// this is causing crashes when ConnectionServer is shutdown and something calls this function
// because instance() returns 0.
if (s_connectionServer)
{
return instance().m_sessionApiClient;
}
else
{
//if (s_connectionServer)
//{
// return instance().m_sessionApiClient;
//}
//else
//{
return 0;
}
//}
}
// ----------------------------------------------------------------------