server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110 from H0zen/develop21

Browse Source 
Fix warden crash for NYI builds
This commit is contained in:
Antz 2016-03-30 10:55:51 +01:00
commit 19abc84cc9
3 changed files with 69 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/game/Warden/WardenCheckMgr.cpp
View File

@ -32,23 +32,15 @@
#include "WardenCheckMgr.h" #include "WardenCheckMgr.h"
#include "Warden.h" #include "Warden.h"
WardenCheckMgr::WardenCheckMgr() { } WardenCheckMgr::WardenCheckMgr() : m_lock(0), CheckStore(), CheckResultStore() { }
WardenCheckMgr::~WardenCheckMgr() WardenCheckMgr::~WardenCheckMgr()
{ {
for (CheckMap::iterator it = CheckStore.begin(); it != CheckStore.end(); ++it) for (CheckMap::iterator it = CheckStore.begin(); it != CheckStore.end(); ++it)
{
for (CheckContainer::iterator itr = it->second->begin(); itr != it->second->end(); ++itr)
delete itr->second;
delete it->second; delete it->second;
}
for (CheckResultMap::iterator it = CheckResultStore.begin(); it != CheckResultStore.end(); ++it) for (CheckResultMap::iterator it = CheckResultStore.begin(); it != CheckResultStore.end(); ++it)
{
for (CheckResultContainer::iterator itr = it->second->begin(); itr != it->second->end(); ++itr)
delete itr->second;
delete it->second; delete it->second;
}
} }
void WardenCheckMgr::LoadWardenChecks() void WardenCheckMgr::LoadWardenChecks()
@ -60,7 +52,8 @@ void WardenCheckMgr::LoadWardenChecks()
return; return;
} }
QueryResult *result = WorldDatabase.Query("SELECT DISTINCT build FROM warden"); // 0 1 2 3 4 5 6 7 8
QueryResult *result = WorldDatabase.Query("SELECT id, build, type, data, result, address, length, str, comment FROM warden ORDER BY build ASC, id ASC");
if (!result) if (!result)
{ {
@ -68,26 +61,8 @@ void WardenCheckMgr::LoadWardenChecks()
return; return;
} }
Field* fields;
do
{
fields = result->Fetch();
uint16 build = fields[0].GetUInt16();
CheckContainer* ck = new CheckContainer();
CheckResultContainer* ckr = new CheckResultContainer();
CheckStore[build] = ck;
CheckResultStore[build] = ckr;
} while (result->NextRow());
delete result;
// 0 1 2 3 4 5 6 7 8
result = WorldDatabase.Query("SELECT id, build, type, data, result, address, length, str, comment FROM warden ORDER BY build ASC, id ASC");
// no need to check. done in SELECT DISTINCT before
uint32 count = 0; uint32 count = 0;
Field* fields;
do do
{ {
@ -125,11 +100,6 @@ void WardenCheckMgr::LoadWardenChecks()
} }
} }
if (checkType == MEM_CHECK || checkType == MODULE_CHECK)
MemChecksIdPool.push_back(id);
else
OtherChecksIdPool.push_back(id);
if (checkType == MEM_CHECK || checkType == PAGE_CHECK_A || checkType == PAGE_CHECK_B || checkType == PROC_CHECK) if (checkType == MEM_CHECK || checkType == PAGE_CHECK_A || checkType == PAGE_CHECK_B || checkType == PROC_CHECK)
{ {
wardenCheck->Address = address; wardenCheck->Address = address;
@ -140,11 +110,12 @@ void WardenCheckMgr::LoadWardenChecks()
if (checkType == MEM_CHECK || checkType == MPQ_CHECK || checkType == LUA_STR_CHECK || checkType == DRIVER_CHECK || checkType == MODULE_CHECK) if (checkType == MEM_CHECK || checkType == MPQ_CHECK || checkType == LUA_STR_CHECK || checkType == DRIVER_CHECK || checkType == MODULE_CHECK)
wardenCheck->Str = str; wardenCheck->Str = str;
CheckStore[build]->insert(std::pair<uint16,WardenCheck*>(id, wardenCheck)); CheckStore.insert(std::pair<uint16, WardenCheck*>(build, wardenCheck));
if (checkType == MPQ_CHECK || checkType == MEM_CHECK) if (checkType == MPQ_CHECK || checkType == MEM_CHECK)
{ {
WardenCheckResult* wr = new WardenCheckResult(); WardenCheckResult* wr = new WardenCheckResult();
wr->Id = id;
wr->Result.SetHexStr(checkResult.c_str()); wr->Result.SetHexStr(checkResult.c_str());
int len = checkResult.size() / 2; int len = checkResult.size() / 2;
if (wr->Result.GetNumBytes() < len) if (wr->Result.GetNumBytes() < len)
@ -156,7 +127,7 @@ void WardenCheckMgr::LoadWardenChecks()
wr->Result.SetBinary((uint8*)temp, len); wr->Result.SetBinary((uint8*)temp, len);
delete[] temp; delete[] temp;
} }
CheckResultStore[build]->insert(std::pair<uint16, WardenCheckResult*>(id,wr)); CheckResultStore.insert(std::pair<uint16, WardenCheckResult*>(build, wr));
} }
if (comment.empty()) if (comment.empty())
@ -192,7 +163,7 @@ void WardenCheckMgr::LoadWardenOverrides()
uint32 count = 0; uint32 count = 0;
ACE_WRITE_GUARD(ACE_RW_Mutex, g, _checkStoreLock); ACE_WRITE_GUARD(ACE_RW_Mutex, g, m_lock);
do do
{ {
@ -204,21 +175,20 @@ void WardenCheckMgr::LoadWardenOverrides()
// Check if action value is in range (0-2, see WardenActions enum) // Check if action value is in range (0-2, see WardenActions enum)
if (action > WARDEN_ACTION_BAN) if (action > WARDEN_ACTION_BAN)
sLog.outWarden("Warden check override action out of range (ID: %u, action: %u)", checkId, action); sLog.outWarden("Warden check override action out of range (ID: %u, action: %u)", checkId, action);
// Check if check actually exists before accessing the CheckStore vector
else else
{ {
bool found = false;
for (CheckMap::iterator it = CheckStore.begin(); it != CheckStore.end(); ++it) for (CheckMap::iterator it = CheckStore.begin(); it != CheckStore.end(); ++it)
{ {
CheckContainer::iterator ir = it->second->find(checkId); if (it->second->CheckId == checkId)
if (ir == it->second->end())
sLog.outWarden("Warden check action override for non-existing check (ID: %u, action: %u), skipped", checkId, action);
else
{ {
ir->second->Action = WardenActions(action); it->second->Action = WardenActions(action);
++count; ++count;
found = true;
} }
} }
if (!found)
sLog.outWarden("Warden check action override for non-existing check (ID: %u, action: %u), skipped", checkId, action);
} }
} }
while (result->NextRow()); while (result->NextRow());
@ -229,12 +199,12 @@ void WardenCheckMgr::LoadWardenOverrides()
WardenCheck* WardenCheckMgr::GetWardenDataById(uint16 build, uint16 id) WardenCheck* WardenCheckMgr::GetWardenDataById(uint16 build, uint16 id)
{ {
WardenCheck* result = NULL; WardenCheck* result = NULL;
CheckMap::iterator it = CheckStore.find(build);
if (it != CheckStore.end()) ACE_READ_GUARD_RETURN(ACE_RW_Mutex, g, m_lock, result)
for (CheckMap::iterator it = CheckStore.lower_bound(build); it != CheckStore.upper_bound(build); ++it)
{ {
CheckContainer::iterator ir = it->second->find(id); if (it->second->CheckId == id)
if (ir != it->second->end()) result = it->second;
result = ir->second;
} }
return result; return result;
@ -243,13 +213,30 @@ WardenCheck* WardenCheckMgr::GetWardenDataById(uint16 build, uint16 id)
WardenCheckResult* WardenCheckMgr::GetWardenResultById(uint16 build, uint16 id) WardenCheckResult* WardenCheckMgr::GetWardenResultById(uint16 build, uint16 id)
{ {
WardenCheckResult* result = NULL; WardenCheckResult* result = NULL;
CheckResultMap::iterator it = CheckResultStore.find(build);
if (it != CheckResultStore.end()) ACE_READ_GUARD_RETURN(ACE_RW_Mutex, g, m_lock, result)
for (CheckResultMap::iterator it = CheckResultStore.lower_bound(build); it != CheckResultStore.upper_bound(build); ++it)
{ {
CheckResultContainer::iterator ir = it->second->find(id); if (it->second->Id == id)
if (ir != it->second->end()) result = it->second;
result = ir->second;
} }
return result; return result;
} }
void WardenCheckMgr::GetWardenCheckIds(bool isMemCheck, uint16 build, std::list<uint16>& idl)
{
idl.clear(); //just to be sure
ACE_READ_GUARD(ACE_RW_Mutex, g, m_lock);
for (CheckMap::iterator it = CheckStore.lower_bound(build); it != CheckStore.upper_bound(build); ++it)
{
if (isMemCheck)
{
if ((it->second->Type == MEM_CHECK) || (it->second->Type == MODULE_CHECK))
idl.push_back(it->second->CheckId);
}
else
idl.push_back(it->second->CheckId);
}
}

16
src/game/Warden/WardenCheckMgr.h
View File

@ -50,6 +50,7 @@ struct WardenCheck
struct WardenCheckResult struct WardenCheckResult
{ {
uint16 Id;
BigNumber Result; // MEM_CHECK BigNumber Result; // MEM_CHECK
}; };
@ -68,22 +69,15 @@ class WardenCheckMgr
WardenCheck* GetWardenDataById(uint16 /*build*/, uint16 /*id*/); WardenCheck* GetWardenDataById(uint16 /*build*/, uint16 /*id*/);
WardenCheckResult* GetWardenResultById(uint16 /*build*/, uint16 /*id*/); WardenCheckResult* GetWardenResultById(uint16 /*build*/, uint16 /*id*/);
void GetWardenCheckIds(bool isMemCheck /* true = MEM */, uint16 build, std::list<uint16>& list);
std::vector<uint16> MemChecksIdPool;
std::vector<uint16> OtherChecksIdPool;
void LoadWardenChecks(); void LoadWardenChecks();
void LoadWardenOverrides(); void LoadWardenOverrides();
ACE_RW_Mutex _checkStoreLock;
private: private:
// We have a linear key without any gaps, so we use vector for fast access ACE_RW_Mutex m_lock;
typedef std::map< uint16, WardenCheck* > CheckContainer; typedef std::multimap< uint16, WardenCheck* > CheckMap;
typedef std::map< uint16, WardenCheckResult* > CheckResultContainer; typedef std::multimap< uint16, WardenCheckResult* > CheckResultMap;
typedef std::map< uint16 /*build*/, CheckContainer* > CheckMap;
typedef std::map< uint16 /*build*/, CheckResultContainer* > CheckResultMap;
CheckMap CheckStore; CheckMap CheckStore;
CheckResultMap CheckResultStore; CheckResultMap CheckResultStore;

44
src/game/Warden/WardenWin.cpp
View File

@ -163,18 +163,20 @@ void WardenWin::RequestData()
{ {
sLog.outWarden("Request data"); sLog.outWarden("Request data");
uint16 build = _session->GetClientBuild();
uint16 id = 0;
uint8 type = 0;
WardenCheck* wd = NULL;
// If all checks were done, fill the todo list again // If all checks were done, fill the todo list again
if (_memChecksTodo.empty()) if (_memChecksTodo.empty())
_memChecksTodo.assign(sWardenCheckMgr->MemChecksIdPool.begin(), sWardenCheckMgr->MemChecksIdPool.end()); sWardenCheckMgr->GetWardenCheckIds(true, build, _memChecksTodo);
if (_otherChecksTodo.empty()) if (_otherChecksTodo.empty())
_otherChecksTodo.assign(sWardenCheckMgr->OtherChecksIdPool.begin(), sWardenCheckMgr->OtherChecksIdPool.end()); sWardenCheckMgr->GetWardenCheckIds(false, build, _otherChecksTodo);
_serverTicks = WorldTimer::getMSTime(); _serverTicks = WorldTimer::getMSTime();
uint16 id;
uint8 type;
WardenCheck* wd;
_currentChecks.clear(); _currentChecks.clear();
// Build check request // Build check request
@ -195,8 +197,6 @@ void WardenWin::RequestData()
ByteBuffer buff; ByteBuffer buff;
buff << uint8(WARDEN_SMSG_CHEAT_CHECKS_REQUEST); buff << uint8(WARDEN_SMSG_CHEAT_CHECKS_REQUEST);
ACE_READ_GUARD(ACE_RW_Mutex, g, sWardenCheckMgr->_checkStoreLock);
for (uint16 i = 0; i < sWorld.getConfig(CONFIG_UINT32_WARDEN_NUM_OTHER_CHECKS); ++i) for (uint16 i = 0; i < sWorld.getConfig(CONFIG_UINT32_WARDEN_NUM_OTHER_CHECKS); ++i)
{ {
// If todo list is done break loop (will be filled on next Update() run) // If todo list is done break loop (will be filled on next Update() run)
@ -210,18 +210,22 @@ void WardenWin::RequestData()
// Add the id to the list sent in this cycle // Add the id to the list sent in this cycle
_currentChecks.push_back(id); _currentChecks.push_back(id);
wd = sWardenCheckMgr->GetWardenDataById(_session->GetClientBuild(), id); // if we are here, the function is guaranteed to not return NULL
// but ... who knows
switch (wd->Type) wd = sWardenCheckMgr->GetWardenDataById(build, id);
if (wd)
{ {
case MPQ_CHECK: switch (wd->Type)
case LUA_STR_CHECK: {
case DRIVER_CHECK: case MPQ_CHECK:
buff << uint8(wd->Str.size()); case LUA_STR_CHECK:
buff.append(wd->Str.c_str(), wd->Str.size()); case DRIVER_CHECK:
break; buff << uint8(wd->Str.size());
default: buff.append(wd->Str.c_str(), wd->Str.size());
break; break;
default:
break;
}
} }
} }
@ -235,7 +239,7 @@ void WardenWin::RequestData()
for (std::list<uint16>::iterator itr = _currentChecks.begin(); itr != _currentChecks.end(); ++itr) for (std::list<uint16>::iterator itr = _currentChecks.begin(); itr != _currentChecks.end(); ++itr)
{ {
wd = sWardenCheckMgr->GetWardenDataById(_session->GetClientBuild(), *itr); wd = sWardenCheckMgr->GetWardenDataById(build, *itr);
type = wd->Type; type = wd->Type;
buff << uint8(type ^ xorByte); buff << uint8(type ^ xorByte);
@ -356,8 +360,6 @@ void WardenWin::HandleData(ByteBuffer &buff)
uint8 type; uint8 type;
uint16 checkFailed = 0; uint16 checkFailed = 0;
ACE_READ_GUARD(ACE_RW_Mutex, g, sWardenCheckMgr->_checkStoreLock);
for (std::list<uint16>::iterator itr = _currentChecks.begin(); itr != _currentChecks.end(); ++itr) for (std::list<uint16>::iterator itr = _currentChecks.begin(); itr != _currentChecks.end(); ++itr)
{ {
rd = sWardenCheckMgr->GetWardenDataById(_session->GetClientBuild(), *itr); rd = sWardenCheckMgr->GetWardenDataById(_session->GetClientBuild(), *itr);