diff options
author | MacroFake <falke.marco@gmail.com> | 2022-05-10 09:08:49 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-07-13 15:21:12 +0200 |
commit | fa74e726c414f5f7a1e63126a69463491f66e0ec (patch) | |
tree | 63e6cb2d5b8e5fda4050c5476aeb4f192f0a4eab /src/net.cpp | |
parent | fa3b3cb9b5d944d34b1d5ac3e102ac333482a475 (diff) | |
download | bitcoin-fa74e726c414f5f7a1e63126a69463491f66e0ec.tar.xz |
refactor: Make FEELER_SLEEP_WINDOW type safe (std::chrono)
Diffstat (limited to 'src/net.cpp')
-rw-r--r-- | src/net.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net.cpp b/src/net.cpp index c37d90519c..18e02353ca 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -86,8 +86,8 @@ static constexpr int DNSSEEDS_DELAY_PEER_THRESHOLD = 1000; // "many" vs "few" pe /** The default timeframe for -maxuploadtarget. 1 day. */ static constexpr std::chrono::seconds MAX_UPLOAD_TIMEFRAME{60 * 60 * 24}; -// We add a random period time (0 to 1 seconds) to feeler connections to prevent synchronization. -#define FEELER_SLEEP_WINDOW 1 +// A random time period (0 to 1 seconds) is added to feeler connections to prevent synchronization. +static constexpr auto FEELER_SLEEP_WINDOW{1s}; /** Used to pass flags to the Bind() function */ enum BindFlags { @@ -1574,6 +1574,7 @@ int CConnman::GetExtraBlockRelayCount() const void CConnman::ThreadOpenConnections(const std::vector<std::string> connect) { SetSyscallSandboxPolicy(SyscallSandboxPolicy::NET_OPEN_CONNECTION); + FastRandomContext rng; // Connect to specific addresses if (!connect.empty()) { @@ -1827,12 +1828,11 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect) } if (addrConnect.IsValid()) { - if (fFeeler) { // Add small amount of random noise before connection to avoid synchronization. - int randsleep = GetRand<int>(FEELER_SLEEP_WINDOW * 1000); - if (!interruptNet.sleep_for(std::chrono::milliseconds(randsleep))) + if (!interruptNet.sleep_for(rng.rand_uniform_duration<CThreadInterrupt::Clock>(FEELER_SLEEP_WINDOW))) { return; + } LogPrint(BCLog::NET, "Making feeler connection to %s\n", addrConnect.ToString()); } |