Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 15:32:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move filtering banned addrs inside GetAddresses()

Browse Source
This commit is contained in:
Gleb Naumenko 2020-07-04 11:25:51 +03:00
parent 007e15dcd7
commit ded742bc5b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/net.cpp
View File

@ -2530,7 +2530,13 @@ void CConnman::AddNewAddresses(const std::vector<CAddress>& vAddr, const CAddres
std::vector<CAddress> CConnman::GetAddresses() std::vector<CAddress> CConnman::GetAddresses()
{ {
return addrman.GetAddr(); std::vector<CAddress> addresses = addrman.GetAddr();
if (m_banman) {
addresses.erase(std::remove_if(addresses.begin(), addresses.end(),
[this](const CAddress& addr){return m_banman->IsDiscouraged(addr) || m_banman->IsBanned(addr);}),
addresses.end());
}
return addresses;
} }
bool CConnman::AddNode(const std::string& strNode) bool CConnman::AddNode(const std::string& strNode)

5
src/net_processing.cpp
View File

@ -3480,10 +3480,7 @@ void ProcessMessage(
std::vector<CAddress> vAddr = connman.GetAddresses(); std::vector<CAddress> vAddr = connman.GetAddresses();
FastRandomContext insecure_rand; FastRandomContext insecure_rand;
for (const CAddress &addr : vAddr) { for (const CAddress &addr : vAddr) {
bool banned_or_discouraged = banman && (banman->IsDiscouraged(addr) || banman->IsBanned(addr)); pfrom.PushAddress(addr, insecure_rand);
if (!banned_or_discouraged) {
pfrom.PushAddress(addr, insecure_rand);
}
} }
return; return;
} }