p2p: enable CAddrMan::GetAddr_() by network, add doxygen

This commit is contained in:
Jon Atack
2021-05-02 18:44:17 +02:00
parent 4da26fb85d
commit d35ddca91e
2 changed files with 21 additions and 5 deletions

View File

@@ -7,9 +7,11 @@
#include <hash.h>
#include <logging.h>
#include <netaddress.h>
#include <serialize.h>
#include <cmath>
#include <optional>
int CAddrInfo::GetTriedBucket(const uint256& nKey, const std::vector<bool> &asmap) const
{
@@ -481,7 +483,7 @@ int CAddrMan::Check_()
}
#endif
void CAddrMan::GetAddr_(std::vector<CAddress>& vAddr, size_t max_addresses, size_t max_pct)
void CAddrMan::GetAddr_(std::vector<CAddress>& vAddr, size_t max_addresses, size_t max_pct, std::optional<Network> network)
{
size_t nNodes = vRandom.size();
if (max_pct != 0) {
@@ -501,8 +503,14 @@ void CAddrMan::GetAddr_(std::vector<CAddress>& vAddr, size_t max_addresses, size
assert(mapInfo.count(vRandom[n]) == 1);
const CAddrInfo& ai = mapInfo[vRandom[n]];
if (!ai.IsTerrible())
vAddr.push_back(ai);
// Filter by network (optional)
if (network != std::nullopt && ai.GetNetClass() != network) continue;
// Filter for quality
if (ai.IsTerrible()) continue;
vAddr.push_back(ai);
}
}