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

remove more dead code

Browse Source
This commit is contained in:
DarthArgus
2016-04-17 04:42:28 +00:00
parent 0e22ecd027
commit 7d03daec7d
3 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
+6 -31
View File
@@ -330,15 +330,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg& msg)
Archive::ReadIterator ri(t);
KeyShare::Token token(ri);
if (!ConfigConnectionServer::getValidateStationKey())
{
// get SUID from token
result = ConnectionServer::decryptToken(token, m_suid, m_isSecure, m_accountName);
}
else
{
result = ConnectionServer::decryptToken(token, sessionId, m_requestedSuid);
}
result = ConnectionServer::decryptToken(token, sessionId, m_requestedSuid);
static const std::string loginTrace("TRACE_LOGIN");
LOG(loginTrace, ("ClientConnection SUID = %d", m_suid));
@@ -378,30 +370,13 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg& msg)
return;
}
if (ConfigConnectionServer::getValidateStationKey())
m_suid = atoi(m_accountName.c_str());
if (m_suid == 0)
{
SessionApiClient * session = ConnectionServer::getSessionApiClient();
NOT_NULL(session);
if(session)
{
session->validateClient(this, sessionId);
}
else
{
ConnectionServer::dropClient(this, "SessionApiClient is not available!");
disconnect();
}
}
else
{
m_suid = atoi(m_accountName.c_str());
if (m_suid == 0)
{
std::hash<std::string> h;
m_suid = h(m_accountName.c_str());
}
onValidateClient(m_suid, m_accountName, m_isSecure, nullptr, ConfigConnectionServer::getDefaultGameFeatures(), ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0, ConfigConnectionServer::getFakeBuddyPoints());
std::hash<std::string> h;
m_suid = h(m_accountName.c_str());
}
onValidateClient(m_suid, m_accountName, m_isSecure, nullptr, ConfigConnectionServer::getDefaultGameFeatures(), ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0, ConfigConnectionServer::getFakeBuddyPoints());
}
else
{
engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.h
-10
View File
@@ -104,7 +104,6 @@ public:
static const int getClientHashTableSize ();
static const int getLagReportThreshold ();
static bool getValidateStationKey();
static const char * getSessionServers();
static const int getSessionType();
static bool getDisableSessionLogout();
@@ -349,15 +348,6 @@ inline const int ConfigConnectionServer::getLagReportThreshold()
// ----------------------------------------------------------------------
//------------------------------------------------------------------------------------------
inline bool ConfigConnectionServer::getValidateStationKey()
{
return data->validateStationKey;
}
//------------------------------------------------------------------------------------------
inline const char * ConfigConnectionServer::getSessionServers()
{
return data->sessionServers;
engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp
-6
View File
@@ -119,12 +119,6 @@ m_recoveringClientList()
Address a("", ConfigConnectionServer::getPingPort());
IGNORE_RETURN(pingSocket->bind (a));
if (ConfigConnectionServer::getValidateStationKey())
{
installSessionValidation();
}
}
//-----------------------------------------------------------------------