@@ -761,11 +761,6 @@ static CNodeState *State(NodeId pnode) EXCLUSIVE_LOCKS_REQUIRED(cs_main) {
761
761
return &it->second ;
762
762
}
763
763
764
- static bool RelayAddrsWithPeer (const Peer& peer)
765
- {
766
- return peer.m_addr_relay_enabled ;
767
- }
768
-
769
764
/* *
770
765
* Whether the peer supports the address. For example, a peer that does not
771
766
* implement BIP155 cannot receive Tor v3 addresses because it requires
@@ -1708,7 +1703,7 @@ void PeerManagerImpl::RelayAddress(NodeId originator,
1708
1703
LOCK (m_peer_mutex);
1709
1704
1710
1705
for (auto & [id, peer] : m_peer_map) {
1711
- if (RelayAddrsWithPeer (* peer) && id != originator && IsAddrCompatible (*peer, addr)) {
1706
+ if (peer-> m_addr_relay_enabled && id != originator && IsAddrCompatible (*peer, addr)) {
1712
1707
uint64_t hashKey = CSipHasher (hasher).Write (id).Finalize ();
1713
1708
for (unsigned int i = 0 ; i < nRelayNodes; i++) {
1714
1709
if (hashKey > best[i].first ) {
@@ -4327,7 +4322,7 @@ void PeerManagerImpl::MaybeSendPing(CNode& node_to, Peer& peer, std::chrono::mic
4327
4322
void PeerManagerImpl::MaybeSendAddr (CNode& node, Peer& peer, std::chrono::microseconds current_time)
4328
4323
{
4329
4324
// Nothing to do for non-address-relay peers
4330
- if (!RelayAddrsWithPeer ( peer) ) return ;
4325
+ if (!peer. m_addr_relay_enabled ) return ;
4331
4326
4332
4327
LOCK (peer.m_addr_send_times_mutex );
4333
4328
// Periodically advertise our local address to the peer.
@@ -4462,11 +4457,10 @@ bool PeerManagerImpl::SetupAddressRelay(CNode& node, Peer& peer)
4462
4457
// information of addr traffic to infer the link.
4463
4458
if (node.IsBlockOnlyConn ()) return false ;
4464
4459
4465
- if (!RelayAddrsWithPeer ( peer)) {
4460
+ if (!peer. m_addr_relay_enabled . exchange ( true )) {
4466
4461
// First addr message we have received from the peer, initialize
4467
4462
// m_addr_known
4468
4463
peer.m_addr_known = std::make_unique<CRollingBloomFilter>(5000 , 0.001 );
4469
- peer.m_addr_relay_enabled = true ;
4470
4464
}
4471
4465
4472
4466
return true ;
0 commit comments