DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request 'optimized IsBanned' (#152) from jahway603/hush3:dev into dev

Browse Source 
Reviewed-on: https://git.hush.is/hush/hush3/pulls/152
This commit is contained in:
Duke Leto
2022-07-15 15:38:11 +00:00
parent a3258de217 9806119366
commit 45af3ff80b
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net.cpp
View File

@@ -546,8 +546,6 @@ void CNode::ClearBanned()
} }
bool CNode::IsBanned(CNetAddr ip) bool CNode::IsBanned(CNetAddr ip)
{
bool fResult = false;
{ {
LOCK(cs_setBanned); LOCK(cs_setBanned);
for (std::map<CSubNet, int64_t>::iterator it = setBanned.begin(); it != setBanned.end(); it++) for (std::map<CSubNet, int64_t>::iterator it = setBanned.begin(); it != setBanned.end(); it++)
@@ -556,15 +554,12 @@ bool CNode::IsBanned(CNetAddr ip)
int64_t t = (*it).second; int64_t t = (*it).second;
if(subNet.Match(ip) && GetTime() < t) if(subNet.Match(ip) && GetTime() < t)
fResult = true; return true;
} }
} return false;
return fResult;
} }
bool CNode::IsBanned(CSubNet subnet) bool CNode::IsBanned(CSubNet subnet)
{
bool fResult = false;
{ {
LOCK(cs_setBanned); LOCK(cs_setBanned);
std::map<CSubNet, int64_t>::iterator i = setBanned.find(subnet); std::map<CSubNet, int64_t>::iterator i = setBanned.find(subnet);
@@ -572,10 +567,9 @@ bool CNode::IsBanned(CSubNet subnet)
{ {
int64_t t = (*i).second; int64_t t = (*i).second;
if (GetTime() < t) if (GetTime() < t)
fResult = true; return true;
} }
} return false;
return fResult;
} }
void CNode::Ban(const CNetAddr& addr, int64_t bantimeoffset, bool sinceUnixEpoch) { void CNode::Ban(const CNetAddr& addr, int64_t bantimeoffset, bool sinceUnixEpoch) {