diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2020-09-01 16:49:40 -0400 |
|---|---|---|
| committer | Suhas Daftuar <sdaftuar@gmail.com> | 2020-12-10 08:41:57 -0500 |
| commit | 3cc8a7a0f5fa183cd7f0cf5e56f16f9a9d1f2441 (patch) | |
| tree | 34d30352ed590be09d0a8a785a9fd75a04ceb31a /src/net_processing.cpp | |
| parent | 91d61952a82af3e8887e8ae532ecc19d87fe9073 (diff) | |
| download | bitcoin-3cc8a7a0f5fa183cd7f0cf5e56f16f9a9d1f2441.tar.xz | |
Use conn_type to identify block-relay peers, rather than m_tx_relay == nullptr
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 243ac6a34b..ffbd2c17f9 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2466,7 +2466,7 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat LogPrintf("New outbound peer connected: version: %d, blocks=%d, peer=%d%s (%s)\n", pfrom.nVersion.load(), pfrom.nStartingHeight, pfrom.GetId(), (fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToString()) : ""), - pfrom.m_tx_relay == nullptr ? "block-relay" : "full-relay"); + pfrom.IsBlockOnlyConn() ? "block-relay" : "full-relay"); } if (pfrom.GetCommonVersion() >= SENDHEADERS_VERSION) { @@ -3923,13 +3923,11 @@ void PeerManager::EvictExtraOutboundPeers(int64_t time_in_seconds) AssertLockHeld(::cs_main); // Ignore non-outbound peers, or nodes marked for disconnect already - if (!pnode->IsOutboundOrBlockRelayConn() || pnode->fDisconnect) return; + if (!pnode->IsFullOutboundConn() || pnode->fDisconnect) return; CNodeState *state = State(pnode->GetId()); if (state == nullptr) return; // shouldn't be possible, but just in case // Don't evict our protected peers if (state->m_chain_sync.m_protect) return; - // Don't evict our block-relay-only peers. - if (pnode->m_tx_relay == nullptr) return; if (state->m_last_block_announcement < oldest_block_announcement || (state->m_last_block_announcement == oldest_block_announcement && pnode->GetId() > worst_peer)) { worst_peer = pnode->GetId(); oldest_block_announcement = state->m_last_block_announcement; |