R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

CBanSystem optimizations

Browse Source 
Pass by constant reference, const qualifiers, size_t loop iterators instead of implicit cast to int, extraneous cast to c-string, etc..
This commit is contained in:
Kawe Mazidjatari 2022-08-09 17:57:43 +02:00
parent efd92f8ebc
commit cdfc557452
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
r5dev/networksystem/bansystem.cpp
View File

@ -20,9 +20,9 @@ CBanSystem::CBanSystem(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
// Input : pair - // Input : pair<const string&, const uint64_t> -
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CBanSystem::operator[](std::pair<string, uint64_t> pair) void CBanSystem::operator[](std::pair<const string&, const uint64_t> pair)
{ {
AddEntry(pair.first, pair.second); AddEntry(pair.first, pair.second);
} }
@ -54,7 +54,7 @@ void CBanSystem::Load(void)
for (int i = 0; i < nTotalBans; i++) for (int i = 0; i < nTotalBans; i++)
{ {
nlohmann::json jsEntry = jsIn[std::to_string(i).c_str()]; nlohmann::json jsEntry = jsIn[std::to_string(i)];
if (jsEntry.is_null()) if (jsEntry.is_null())
{ {
continue; continue;
@ -75,11 +75,11 @@ void CBanSystem::Save(void) const
{ {
nlohmann::json jsOut; nlohmann::json jsOut;
for (int i = 0; i < m_vBanList.size(); i++) for (size_t i = 0; i < m_vBanList.size(); i++)
{ {
jsOut["totalBans"] = m_vBanList.size(); jsOut["totalBans"] = m_vBanList.size();
jsOut[std::to_string(i).c_str()]["ipAddress"] = m_vBanList[i].first; jsOut[std::to_string(i)]["ipAddress"] = m_vBanList[i].first;
jsOut[std::to_string(i).c_str()]["originID"] = m_vBanList[i].second; jsOut[std::to_string(i)]["originID"] = m_vBanList[i].second;
} }
fs::path path = std::filesystem::current_path() /= "platform\\banlist.json"; fs::path path = std::filesystem::current_path() /= "platform\\banlist.json";
@ -90,10 +90,10 @@ void CBanSystem::Save(void) const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: adds a banned player entry to the banlist // Purpose: adds a banned player entry to the banlist
// Input : svIpAddress - // Input : &svIpAddress -
// nOriginID - // nOriginID -
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CBanSystem::AddEntry(string svIpAddress, uint64_t nOriginID) void CBanSystem::AddEntry(const string& svIpAddress, const uint64_t nOriginID)
{ {
if (!svIpAddress.empty()) if (!svIpAddress.empty())
{ {
@ -107,10 +107,10 @@ void CBanSystem::AddEntry(string svIpAddress, uint64_t nOriginID)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: deletes an entry in the banlist // Purpose: deletes an entry in the banlist
// Input : svIpAddress - // Input : &svIpAddress -
// nOriginID - // nOriginID -
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CBanSystem::DeleteEntry(string svIpAddress, uint64_t nOriginID) void CBanSystem::DeleteEntry(const string& svIpAddress, const uint64_t nOriginID)
{ {
for (size_t i = 0; i < m_vBanList.size(); i++) for (size_t i = 0; i < m_vBanList.size(); i++)
{ {
@ -123,10 +123,10 @@ void CBanSystem::DeleteEntry(string svIpAddress, uint64_t nOriginID)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: adds a connect refuse entry to the refuselist // Purpose: adds a connect refuse entry to the refuselist
// Input : svError - // Input : &svError -
// nOriginID - // nOriginID -
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CBanSystem::AddConnectionRefuse(string svError, uint64_t nOriginID) void CBanSystem::AddConnectionRefuse(const string& svError, const uint64_t nOriginID)
{ {
if (m_vRefuseList.empty()) if (m_vRefuseList.empty())
{ {
@ -148,7 +148,7 @@ void CBanSystem::AddConnectionRefuse(string svError, uint64_t nOriginID)
// Purpose: deletes an entry in the refuselist // Purpose: deletes an entry in the refuselist
// Input : nOriginID - // Input : nOriginID -
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CBanSystem::DeleteConnectionRefuse(uint64_t nOriginID) void CBanSystem::DeleteConnectionRefuse(const uint64_t nOriginID)
{ {
for (size_t i = 0; i < m_vRefuseList.size(); i++) for (size_t i = 0; i < m_vRefuseList.size(); i++)
{ {
@ -194,11 +194,11 @@ void CBanSystem::BanListCheck(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: checks if specified ip address or necleus id is banned // Purpose: checks if specified ip address or necleus id is banned
// Input : svIpAddress - // Input : &svIpAddress -
// nOriginID - // nOriginID -
// Output : true if banned, false if not banned // Output : true if banned, false if not banned
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CBanSystem::IsBanned(string svIpAddress, uint64_t nOriginID) const bool CBanSystem::IsBanned(const string& svIpAddress, const uint64_t nOriginID) const
{ {
for (size_t i = 0; i < m_vBanList.size(); i++) for (size_t i = 0; i < m_vBanList.size(); i++)
{ {

12
r5dev/networksystem/bansystem.h
View File

@ -4,20 +4,20 @@ class CBanSystem
{ {
public: public:
CBanSystem(void); CBanSystem(void);
void operator[](std::pair<string, uint64_t> pair); void operator[](std::pair<const string&, const uint64_t> pair);
void Load(void); void Load(void);
void Save(void) const; void Save(void) const;
void AddEntry(string svIpAddress, uint64_t nOriginID); void AddEntry(const string& svIpAddress, const uint64_t nOriginID);
void DeleteEntry(string svIpAddress, uint64_t nOriginID); void DeleteEntry(const string& svIpAddress, const uint64_t nOriginID);
void AddConnectionRefuse(string svError, uint64_t nOriginID); void AddConnectionRefuse(const string& svError, const uint64_t nOriginID);
void DeleteConnectionRefuse(uint64_t nOriginID); void DeleteConnectionRefuse(const uint64_t nOriginID);
void BanListCheck(void); void BanListCheck(void);
bool IsBanned(string svIpAddress, uint64_t nOriginID) const; bool IsBanned(const string& svIpAddress, const uint64_t nOriginID) const;
bool IsRefuseListValid(void) const; bool IsRefuseListValid(void) const;
bool IsBanListValid(void) const; bool IsBanListValid(void) const;