highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-19 12:10:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

[net] listbanned RPC and QT should show correct banned subnets

Browse Source 
Github-Pull: #10234
Rebased-From: 77c54b270d
This commit is contained in:
John Newbery
2017-04-19 12:49:11 -04:00
committed by Luke Dashjr
parent 04226938a3
commit d289b564e3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net.cpp
View File

@@ -413,10 +413,10 @@ void CConnman::DumpBanlist()
CBanDB bandb; CBanDB bandb;
banmap_t banmap; banmap_t banmap;
SetBannedSetDirty(false);
GetBanned(banmap); GetBanned(banmap);
if (!bandb.Write(banmap)) if (bandb.Write(banmap)) {
SetBannedSetDirty(true); SetBannedSetDirty(false);
}
LogPrint("net", "Flushed %d banned node ips/subnets to banlist.dat %dms\n", LogPrint("net", "Flushed %d banned node ips/subnets to banlist.dat %dms\n",
banmap.size(), GetTimeMillis() - nStart); banmap.size(), GetTimeMillis() - nStart);
@@ -536,6 +536,8 @@ bool CConnman::Unban(const CSubNet &subNet) {
void CConnman::GetBanned(banmap_t &banMap) void CConnman::GetBanned(banmap_t &banMap)
{ {
LOCK(cs_setBanned); LOCK(cs_setBanned);
// Sweep the banlist so expired bans are not returned
SweepBanned();
banMap = setBanned; //create a thread safe copy banMap = setBanned; //create a thread safe copy
} }