diff --git a/src/net.cpp b/src/net.cpp index ef029025b..db47d5ec7 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -547,35 +547,29 @@ void CNode::ClearBanned() bool CNode::IsBanned(CNetAddr ip) { - bool fResult = false; + LOCK(cs_setBanned); + for (std::map::iterator it = setBanned.begin(); it != setBanned.end(); it++) { - LOCK(cs_setBanned); - for (std::map::iterator it = setBanned.begin(); it != setBanned.end(); it++) - { - CSubNet subNet = (*it).first; - int64_t t = (*it).second; + CSubNet subNet = (*it).first; + int64_t t = (*it).second; - if(subNet.Match(ip) && GetTime() < t) - fResult = true; - } + if(subNet.Match(ip) && GetTime() < t) + return true; } - return fResult; + return false; } bool CNode::IsBanned(CSubNet subnet) { - bool fResult = false; + LOCK(cs_setBanned); + std::map::iterator i = setBanned.find(subnet); + if (i != setBanned.end()) { - LOCK(cs_setBanned); - std::map::iterator i = setBanned.find(subnet); - if (i != setBanned.end()) - { - int64_t t = (*i).second; - if (GetTime() < t) - fResult = true; - } + int64_t t = (*i).second; + if (GetTime() < t) + return true; } - return fResult; + return false; } void CNode::Ban(const CNetAddr& addr, int64_t bantimeoffset, bool sinceUnixEpoch) {