aboutsummaryrefslogtreecommitdiff
path: root/src/net_processing.cpp
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2020-07-20 18:46:13 +0100
committerdergoegge <n.goeggi@gmail.com>2022-07-14 14:50:44 +0200
commitd9079fe18dc5d81ce290876353555b51125127d1 (patch)
tree9d9d45587a11737cfc7bded1126326ff97d59771 /src/net_processing.cpp
parent7d1c0369340cb752f0d78e24f4251595534bf5e9 (diff)
downloadbitcoin-d9079fe18dc5d81ce290876353555b51125127d1.tar.xz
[net processing] Remove CNode::nServices
Use Peer::m_their_services instead
Diffstat (limited to 'src/net_processing.cpp')
-rw-r--r--src/net_processing.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 8889266a02..64ce34a7b8 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -223,9 +223,7 @@ struct Peer {
*
* TODO: remove redundant CNode::nLocalServices*/
const ServiceFlags m_our_services;
- /** Services this peer offered to us.
- *
- * TODO: remove redundant CNode::nServices */
+ /** Services this peer offered to us. */
std::atomic<ServiceFlags> m_their_services{NODE_NONE};
/** Protects misbehavior data members */
@@ -1472,6 +1470,7 @@ bool PeerManagerImpl::GetNodeStateStats(NodeId nodeid, CNodeStateStats& stats) c
PeerRef peer = GetPeerRef(nodeid);
if (peer == nullptr) return false;
+ stats.their_services = peer->m_their_services;
stats.m_starting_height = peer->m_starting_height;
// It is common for nodes with good ping times to suddenly become lagged,
// due to a new block arriving or other large transfer.
@@ -2885,7 +2884,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
m_connman.PushMessage(&pfrom, msg_maker.Make(NetMsgType::VERACK));
- pfrom.nServices = nServices;
+ pfrom.m_has_all_wanted_services = HasAllDesirableServiceFlags(nServices);
peer->m_their_services = nServices;
pfrom.SetAddrLocal(addrMe);
{