swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-08-02 02:15:58 -04:00
Code Issues Projects Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
DarthArgus
2016-12-27 02:38:50 +00:00
parent d0e630bf43
commit 9904f2e271
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/LoginServer/src/shared/ClientConnection.cpp
+16 -12
View File
@@ -207,8 +207,10 @@ void ClientConnection::validateClient(const std::string & id, const std::string
{
authOK = true;
parentAccount = api.getString("mainAccount");
childAccounts = api.getStringVector("subAccounts");
parentAccount = api.getString("mainAccount");
childAccounts = api.getStringVector("subAccounts");
WARNING(true, ("Raw: %s", api.getRaw().c_str()));
}
else
{
@@ -245,24 +247,26 @@ void ClientConnection::validateClient(const std::string & id, const std::string
}
std::hash<std::string> h;
suid = h(uname.c_str());
suid = h(uname.c_str());
}
if (childAccounts.size() == 0) {
// if (childAccounts.size() == 0) {
std::hash<std::string> h;
StationId parent = h(parentAccount);
for (auto i = childAccounts.begin(); i != childAccounts.end(); ++i) {
if (!i->empty()) {
if (i->length() > MAX_ACCOUNT_NAME_LENGTH) {
i->resize(MAX_ACCOUNT_NAME_LENGTH);
}
WARNING(true, ("Parent account is %s", parentAccount.c_str()));
// insert all related accounts, if not already there, into the db
DatabaseConnection::getInstance().upsertAccountRelationship(parent, h(*i));
for (auto i : childAccounts) {
WARNING(true, ("Found child account %s", i.c_str()));
if (i.length() > MAX_ACCOUNT_NAME_LENGTH) {
i.resize(MAX_ACCOUNT_NAME_LENGTH);
}
// insert all related accounts, if not already there, into the db
DatabaseConnection::getInstance().upsertAccountRelationship(parent, h(i));
}
}
//}
LOG("LoginClientConnection", ("validateClient() for stationId (%lu) at IP (%s), id (%s)", m_stationId, getRemoteAddress().c_str(), uname.c_str()));
engine/server/application/LoginServer/src/shared/TaskMapAccount.cpp
+1
View File
@@ -55,6 +55,7 @@ TaskMapAccount::MapAccountQuery::MapAccountQuery() :
void TaskMapAccount::MapAccountQuery::getSQL(std::string &sql)
{
sql = std::string("begin ")+DatabaseConnection::getInstance().getSchemaQualifier()+"login.upsert_account_map(:parentID, :childID); end;";
WARNING(true, ("TaskRegisterNewCluster SQL: %s\n", sql.c_str()));
}
// ----------------------------------------------------------------------