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

fixes display and some things; probably will have to do some hackery to get classic hashed station ids working

Browse Source
This commit is contained in:
DarthArgus
2018-05-16 07:24:16 +00:00
parent 29cfee7922
commit aef53f66bd
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/LoginServer/src/shared/ClientConnection.cpp
+11 -9
View File
@@ -5,6 +5,8 @@
//-----------------------------------------------------------------------
#include <inttypes.h>
#include "FirstLoginServer.h"
#include "ClientConnection.h"
@@ -195,8 +197,8 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
uname.resize(MAX_ACCOUNT_NAME_LENGTH);
}
parent_id = std::hash < std::string > {}(parentAccount.c_str());
user_id = std::hash < std::string > {}(uname.c_str());
parent_id = static_cast<uint32_t>(std::hash < std::string > {}(parentAccount.c_str()));
user_id = static_cast<uint32_t>(std::hash < std::string > {}(uname.c_str()));
}
} else {
std::string msg(api.getString("message"));
@@ -221,25 +223,25 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
uname.resize(MAX_ACCOUNT_NAME_LENGTH);
}
user_id = std::hash < std::string > {}(uname.c_str());
user_id = static_cast<uint32_t>(std::hash < std::string > {}(uname.c_str()));
}
if (authOK) {
m_stationId = user_id;
if (!testMode) {
REPORT_LOG(true, ("Client connected. Username: %s (%i) \n", uname.c_str(), user_id));
REPORT_LOG(true, ("Client connected. Username: %s (%" PRId64 ") \n", uname.c_str(), user_id));
if (!parentAccount.empty()) {
if (parentAccount != uname) {
REPORT_LOG(true, ("\t%s's parent is %s (%i) \n", uname.c_str(), parentAccount.c_str(), parent_id));
REPORT_LOG(true, ("\t%s's parent is %s (%" PRId64 ") \n", uname.c_str(), parentAccount.c_str(), parent_id));
}
} else {
parentAccount = "(Empty Parent!) " + uname;
}
for (auto i : childAccounts) {
StationId child_id = static_cast<StationId>(i.first);
StationId child_id = i.first;
std::string child(i.second);
if (!child.empty() && i.first > 0) {
@@ -248,11 +250,11 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
child.resize(MAX_ACCOUNT_NAME_LENGTH);
}
child_id = std::hash < std::string > {}(child.c_str());
child_id = static_cast<uint32_t>(std::hash < std::string > {}(child.c_str()));
}
REPORT_LOG((parent_id !=
child_id), ("\tchild of %s (%i) is %s (%i) \n", parentAccount.c_str(), parent_id, child.c_str(), child_id));
child_id), ("\tchild of %s (%" PRId64 ") is %s (%" PRId64 ") \n", parentAccount.c_str(), parent_id, child.c_str(), child_id));
// insert all related accounts, if not already there, into the db
if (parent_id != child_id) {
@@ -267,7 +269,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
} else {
LoginServer::getInstance().onValidateClient(m_stationId, uname, this, true, nullptr, 0xFFFFFFFF, 0xFFFFFFFF);
}
LOG("LoginClientConnection", ("validateClient() for stationId (%i) at IP (%s), id (%s)", user_id, getRemoteAddress().c_str(), uname.c_str()));
LOG("LoginClientConnection", ("validateClient() for stationId (%" PRId64 ") at IP (%s), id (%s)", user_id, getRemoteAddress().c_str(), uname.c_str()));
}
}