aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/net.cpp27
-rw-r--r--src/net.h5
2 files changed, 25 insertions, 7 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 42ac0e50ea..51d1c53331 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -458,16 +458,31 @@ bool CNode::IsBanned(CNetAddr ip)
return fResult;
}
-bool CNode::Ban(const CNetAddr &addr) {
+bool CNode::Ban(const CNetAddr &addr, int64_t bantimeoffset) {
int64_t banTime = GetTime()+GetArg("-bantime", 60*60*24); // Default 24-hour ban
- {
- LOCK(cs_setBanned);
- if (setBanned[addr] < banTime)
- setBanned[addr] = banTime;
- }
+ if (bantimeoffset > 0)
+ banTime = GetTime()+bantimeoffset;
+
+ LOCK(cs_setBanned);
+ if (setBanned[addr] < banTime)
+ setBanned[addr] = banTime;
+
return true;
}
+bool CNode::Unban(const CNetAddr &addr) {
+ LOCK(cs_setBanned);
+ if (setBanned.erase(addr))
+ return true;
+ return false;
+}
+
+void CNode::GetBanned(std::map<CNetAddr, int64_t> &banMap)
+{
+ LOCK(cs_setBanned);
+ banMap = setBanned; //create a thread safe copy
+}
+
std::vector<CSubNet> CNode::vWhitelistedRange;
CCriticalSection CNode::cs_vWhitelistedRange;
diff --git a/src/net.h b/src/net.h
index 938f2376f7..dd6fca3960 100644
--- a/src/net.h
+++ b/src/net.h
@@ -606,7 +606,10 @@ public:
// new code.
static void ClearBanned(); // needed for unit testing
static bool IsBanned(CNetAddr ip);
- static bool Ban(const CNetAddr &ip);
+ static bool Ban(const CNetAddr &ip, int64_t bantimeoffset = 0);
+ static bool Unban(const CNetAddr &ip);
+ static void GetBanned(std::map<CNetAddr, int64_t> &banmap);
+
void copyStats(CNodeStats &stats);
static bool IsWhitelistedRange(const CNetAddr &ip);