phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

addrman: cap the max_pct to not exceed the maximum number of addresses

Browse source 
Co-authored-by: Vasil Dimov <vd@FreeBSD.org>
This commit is contained in:
brunoerg 2024-11-07 08:34:16 -03:00
parent 2c90f8e08c
commit 9c5775c331
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/addrman.cpp
View file

@ -812,9 +812,11 @@ nid_type AddrManImpl::GetEntry(bool use_tried, size_t bucket, size_t position) c
std::vector<CAddress> AddrManImpl::GetAddr_(size_t max_addresses, size_t max_pct, std::optional<Network> network, const bool filtered) const std::vector<CAddress> AddrManImpl::GetAddr_(size_t max_addresses, size_t max_pct, std::optional<Network> network, const bool filtered) const
{ {
AssertLockHeld(cs); AssertLockHeld(cs);
Assume(max_pct <= 100);
size_t nNodes = vRandom.size(); size_t nNodes = vRandom.size();
if (max_pct != 0) { if (max_pct != 0) {
max_pct = std::min(max_pct, size_t{100});
nNodes = max_pct * nNodes / 100; nNodes = max_pct * nNodes / 100;
} }
if (max_addresses != 0) { if (max_addresses != 0) {

2
src/addrman.h
View file

@ -166,7 +166,7 @@ public:
* Return all or many randomly selected addresses, optionally by network. * Return all or many randomly selected addresses, optionally by network.
* *
* @param[in] max_addresses Maximum number of addresses to return (0 = all). * @param[in] max_addresses Maximum number of addresses to return (0 = all).
* @param[in] max_pct Maximum percentage of addresses to return (0 = all). * @param[in] max_pct Maximum percentage of addresses to return (0 = all). Value must be from 0 to 100.
* @param[in] network Select only addresses of this network (nullopt = all). * @param[in] network Select only addresses of this network (nullopt = all).
* @param[in] filtered Select only addresses that are considered good quality (false = all). * @param[in] filtered Select only addresses that are considered good quality (false = all).
* *

2
src/net.h
View file

@ -1152,7 +1152,7 @@ public:
* Return all or many randomly selected addresses, optionally by network. * Return all or many randomly selected addresses, optionally by network.
* *
* @param[in] max_addresses Maximum number of addresses to return (0 = all). * @param[in] max_addresses Maximum number of addresses to return (0 = all).
* @param[in] max_pct Maximum percentage of addresses to return (0 = all). * @param[in] max_pct Maximum percentage of addresses to return (0 = all). Value must be from 0 to 100.
* @param[in] network Select only addresses of this network (nullopt = all). * @param[in] network Select only addresses of this network (nullopt = all).
* @param[in] filtered Select only addresses that are considered high quality (false = all). * @param[in] filtered Select only addresses that are considered high quality (false = all).
*/ */

2
src/test/fuzz/addrman.cpp
View file

@ -173,7 +173,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
network = fuzzed_data_provider.PickValueInArray(ALL_NETWORKS); network = fuzzed_data_provider.PickValueInArray(ALL_NETWORKS);
} }
auto max_addresses = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 4096); auto max_addresses = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 4096);
auto max_pct = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 4096); auto max_pct = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 100);
auto filtered = fuzzed_data_provider.ConsumeBool(); auto filtered = fuzzed_data_provider.ConsumeBool();
(void)const_addr_man.GetAddr(max_addresses, max_pct, network, filtered); (void)const_addr_man.GetAddr(max_addresses, max_pct, network, filtered);

4
src/test/fuzz/connman.cpp
View file

@ -110,13 +110,13 @@ FUZZ_TARGET(connman, .init = initialize_connman)
}, },
[&] { [&] {
auto max_addresses = fuzzed_data_provider.ConsumeIntegral<size_t>(); auto max_addresses = fuzzed_data_provider.ConsumeIntegral<size_t>();
auto max_pct = fuzzed_data_provider.ConsumeIntegral<size_t>(); auto max_pct = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 100);
auto filtered = fuzzed_data_provider.ConsumeBool(); auto filtered = fuzzed_data_provider.ConsumeBool();
(void)connman.GetAddresses(max_addresses, max_pct, /*network=*/std::nullopt, filtered); (void)connman.GetAddresses(max_addresses, max_pct, /*network=*/std::nullopt, filtered);
}, },
[&] { [&] {
auto max_addresses = fuzzed_data_provider.ConsumeIntegral<size_t>(); auto max_addresses = fuzzed_data_provider.ConsumeIntegral<size_t>();
auto max_pct = fuzzed_data_provider.ConsumeIntegral<size_t>(); auto max_pct = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 100);
(void)connman.GetAddresses(/*requestor=*/random_node, max_addresses, max_pct); (void)connman.GetAddresses(/*requestor=*/random_node, max_addresses, max_pct);
}, },
[&] { [&] {