sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#27577: give seednodes time before falling back to fixed seeds

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2023-05-04 14:59:29 -04:00
parent eb4f01f931
commit dccd395a4e
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/net.cpp
View File

@ -2402,6 +2402,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, CDe
auto next_extra_block_relay = GetExponentialRand(start, EXTRA_BLOCK_RELAY_ONLY_PEER_INTERVAL); auto next_extra_block_relay = GetExponentialRand(start, EXTRA_BLOCK_RELAY_ONLY_PEER_INTERVAL);
const bool dnsseed = gArgs.GetBoolArg("-dnsseed", DEFAULT_DNSSEED); const bool dnsseed = gArgs.GetBoolArg("-dnsseed", DEFAULT_DNSSEED);
bool add_fixed_seeds = gArgs.GetBoolArg("-fixedseeds", DEFAULT_FIXEDSEEDS); bool add_fixed_seeds = gArgs.GetBoolArg("-fixedseeds", DEFAULT_FIXEDSEEDS);
const bool use_seednodes{gArgs.IsArgSet("-seednode")};
if (!add_fixed_seeds) { if (!add_fixed_seeds) {
LogPrintf("Fixed seeds are disabled\n"); LogPrintf("Fixed seeds are disabled\n");
@ -2431,12 +2432,12 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, CDe
LogPrintf("Adding fixed seeds as 60 seconds have passed and addrman is empty for at least one reachable network\n"); LogPrintf("Adding fixed seeds as 60 seconds have passed and addrman is empty for at least one reachable network\n");
} }
// Checking !dnsseed is cheaper before locking 2 mutexes. // Perform cheap checks before locking a mutex.
if (!add_fixed_seeds_now && !dnsseed) { else if (!dnsseed && !use_seednodes) {
LOCK2(m_addr_fetches_mutex, m_added_nodes_mutex); LOCK(m_added_nodes_mutex);
if (m_addr_fetches.empty() && m_added_nodes.empty()) { if (m_added_nodes.empty()) {
add_fixed_seeds_now = true; add_fixed_seeds_now = true;
LogPrintf("Adding fixed seeds as -dnsseed=0 (or IPv4/IPv6 connections are disabled via -onlynet), -addnode is not provided and all -seednode(s) attempted\n"); LogPrintf("Adding fixed seeds as -dnsseed=0 (or IPv4/IPv6 connections are disabled via -onlynet) and neither -addnode nor -seednode are provided\n");
} }
} }

2
test/functional/feature_config_args.py
View File

@ -181,7 +181,7 @@ class ConfArgsTest(BitcoinTestFramework):
with self.nodes[0].assert_debug_log(expected_msgs=[ with self.nodes[0].assert_debug_log(expected_msgs=[
"Loaded 0 addresses from peers.dat", "Loaded 0 addresses from peers.dat",
"DNS seeding disabled", "DNS seeding disabled",
"Adding fixed seeds as -dnsseed=0 (or IPv4/IPv6 connections are disabled via -onlynet), -addnode is not provided and all -seednode(s) attempted\n", "Adding fixed seeds as -dnsseed=0 (or IPv4/IPv6 connections are disabled via -onlynet) and neither -addnode nor -seednode are provided\n",
]): ]):
self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1']) self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1'])
assert time.time() - start < 60 assert time.time() - start < 60