diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-04-01 15:51:05 +0200 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-04-01 16:36:22 +0200 |
| commit | 086226d98ae8c194a0a38b2fbfffd0dc3773e879 (patch) | |
| tree | e902132d836647b814dd495c7274aa62c5775d7d /src/net_processing.cpp | |
| parent | 6e22b522f9505d6a3c71ef9972aea6ae3fb10d2e (diff) | |
| parent | 5ed535a02f8f0a6f65bbe19f48a8c81f43298393 (diff) | |
| download | bitcoin-086226d98ae8c194a0a38b2fbfffd0dc3773e879.tar.xz | |
Merge #21198: net: Address outstanding review comments from PR20721
5ed535a02f8f0a6f65bbe19f48a8c81f43298393 [net] Changes to RunInactivityChecks (John Newbery)
Pull request description:
Updates the RunInactivityChecks() function:
- rename to ShouldRunInactivityChecks (https://github.com/bitcoin/bitcoin/pull/20721#discussion_r576394790)
- take optional time now (https://github.com/bitcoin/bitcoin/pull/20721#discussion_r575895661)
- call from within InactivityChecks (https://github.com/bitcoin/bitcoin/pull/20721#discussion_r575894665)
- update comment (https://github.com/bitcoin/bitcoin/pull/20721#discussion_r575894343)
- change ordering of inequality (https://github.com/bitcoin/bitcoin/pull/20721#discussion_r574925129)
- ~make inline (https://github.com/bitcoin/bitcoin/pull/20721#discussion_r574903578)~
ACKs for top commit:
laanwj:
Code review ACK 5ed535a02f8f0a6f65bbe19f48a8c81f43298393
Tree-SHA512: e6ac8e8cce5cddc84a52a40c908634c25f58be74512d642840d7bd7fa65c3d90a0f46cc19e4865b3fae7c933138247f58356167a60a5c519305cfd6d05e51f51
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 17d7619ff5..4108de2c8a 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -4109,7 +4109,7 @@ void PeerManagerImpl::CheckForStaleTipAndEvictPeers() void PeerManagerImpl::MaybeSendPing(CNode& node_to, Peer& peer, std::chrono::microseconds now) { - if (m_connman.RunInactivityChecks(node_to) && peer.m_ping_nonce_sent && + if (m_connman.ShouldRunInactivityChecks(node_to) && peer.m_ping_nonce_sent && now > peer.m_ping_start.load() + std::chrono::seconds{TIMEOUT_INTERVAL}) { LogPrint(BCLog::NET, "ping timeout: %fs peer=%d\n", 0.000001 * count_microseconds(now - peer.m_ping_start.load()), peer.m_id); node_to.fDisconnect = true; |