diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:18:12 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:18:47 -0400 |
| commit | 423cb37658b81b2cb8475b6fdb08b3122fee51a4 (patch) | |
| tree | c2ca9a4416cba0f30571b8462ef2987ed4c17f39 /src/net_processing.h | |
| parent | b88dd7c2dbf8daca58306afd1744c4f88049b6df (diff) | |
| parent | 66b3fc543706aad1aaccc403b4ee08f65fa5d17b (diff) | |
| download | bitcoin-423cb37658b81b2cb8475b6fdb08b3122fee51a4.tar.xz | |
Merge #14027: Skip stale tip checking if outbound connections are off or if reindexing.
66b3fc5437 Skip stale tip checking if outbound connections are off or if reindexing. (Gregory Maxwell)
Pull request description:
I got tired of the pointless stale tip notices in reindex and on nodes with connections disabled.
Tree-SHA512: eb07d9c5c787ae6dea02cdd1d67a48a36a30adc5ccc74d6f1c0c7364d404dc8848b35d2b8daf5283f7c8f36f1a3c463aacb190d70a22d1fe796a301bb1f03228
Diffstat (limited to 'src/net_processing.h')
| -rw-r--r-- | src/net_processing.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net_processing.h b/src/net_processing.h index 496c3c7b0d..88dbdf556d 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -9,6 +9,9 @@ #include <net.h> #include <validationinterface.h> #include <consensus/params.h> +#include <sync.h> + +extern CCriticalSection cs_main; /** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; @@ -65,7 +68,7 @@ public: /** Evict extra outbound peers. If we think our tip may be stale, connect to an extra outbound */ void CheckForStaleTipAndEvictPeers(const Consensus::Params &consensusParams); /** If we have extra outbound peers, try to disconnect the one with the oldest block announcement */ - void EvictExtraOutboundPeers(int64_t time_in_seconds); + void EvictExtraOutboundPeers(int64_t time_in_seconds) EXCLUSIVE_LOCKS_REQUIRED(cs_main); private: int64_t m_stale_tip_check_time; //! Next time to check for stale tip |