Merge bitcoin/bitcoin#22616: p2p, rpc: address relay fixups

5e33f762d4 p2p, rpc: address relay fixups (Jon Atack)

Pull request description:

  Following review of new changes merged today, move a use of `statestats` in getpeerinfo to within the section guarded by `if (fStateStats)`, e.g. `PeerManagerImpl::GetNodeStateStats` true, and pass an in-param by reference to const.

ACKs for top commit:
  amitiuttarwar:
    ACK 5e33f762d4
  jnewbery:
    ACK 5e33f762d4

Tree-SHA512: b42f33c615b14079e2c4e6060209de8707d71b351dd1e11e04a2a6fc12d15747d0c5d9b24850217080fd1ef92e63f96d6925c4badf280b781edd696c349be7d6
This commit is contained in:
MarcoFalke
2021-08-04 17:17:49 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -653,7 +653,7 @@ private:
* @return True if address relay is enabled with peer
* False if address relay is disallowed
*/
bool SetupAddressRelay(CNode& node, Peer& peer);
bool SetupAddressRelay(const CNode& node, Peer& peer);
};
} // namespace
@@ -4466,7 +4466,7 @@ public:
};
}
bool PeerManagerImpl::SetupAddressRelay(CNode& node, Peer& peer)
bool PeerManagerImpl::SetupAddressRelay(const CNode& node, Peer& peer)
{
// We don't participate in addr relay with outbound block-relay-only
// connections to prevent providing adversaries with the additional