aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2021-09-01 11:24:46 +0100
committerJohn Newbery <john@johnnewbery.com>2021-09-07 15:24:14 +0100
commit853c4edb70f897a6a7165abaea4a303d7d448721 (patch)
tree0f2e63ecf7e36dbf39b35505ddd35dd8d1b93000 /src
parent9fd5618610e91e3949536c5122cf31eb58c9aa6b (diff)
downloadbitcoin-853c4edb70f897a6a7165abaea4a303d7d448721.tar.xz
[net] Remove asmap argument from CNode::CopyStats()
This saves passing around a reference to the asmap std::vector<bool>.
Diffstat (limited to 'src')
-rw-r--r--src/net.cpp6
-rw-r--r--src/net.h2
-rw-r--r--src/test/fuzz/net.cpp6
3 files changed, 5 insertions, 9 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 35376b89ac..c8a6e2c763 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -552,14 +552,13 @@ Network CNode::ConnectedThroughNetwork() const
#undef X
#define X(name) stats.name = name
-void CNode::CopyStats(CNodeStats& stats, const std::vector<bool>& asmap)
+void CNode::CopyStats(CNodeStats& stats)
{
stats.nodeid = this->GetId();
X(nServices);
X(addr);
X(addrBind);
stats.m_network = ConnectedThroughNetwork();
- stats.m_mapped_as = addr.GetMappedAS(asmap);
if (m_tx_relay != nullptr) {
LOCK(m_tx_relay->cs_filter);
stats.fRelayTxes = m_tx_relay->fRelayTxes;
@@ -2804,7 +2803,8 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats) const
vstats.reserve(vNodes.size());
for (CNode* pnode : vNodes) {
vstats.emplace_back();
- pnode->CopyStats(vstats.back(), addrman.GetAsmap());
+ pnode->CopyStats(vstats.back());
+ vstats.back().m_mapped_as = pnode->addr.GetMappedAS(addrman.GetAsmap());
}
}
diff --git a/src/net.h b/src/net.h
index e7ad959fd9..1479861bc2 100644
--- a/src/net.h
+++ b/src/net.h
@@ -652,7 +652,7 @@ public:
void CloseSocketDisconnect();
- void CopyStats(CNodeStats& stats, const std::vector<bool>& asmap);
+ void CopyStats(CNodeStats& stats);
ServiceFlags GetLocalServices() const
{
diff --git a/src/test/fuzz/net.cpp b/src/test/fuzz/net.cpp
index 0929376045..bd1bb79d0e 100644
--- a/src/test/fuzz/net.cpp
+++ b/src/test/fuzz/net.cpp
@@ -39,12 +39,8 @@ FUZZ_TARGET_INIT(net, initialize_net)
node.CloseSocketDisconnect();
},
[&] {
- const std::vector<bool> asmap = ConsumeRandomLengthBitVector(fuzzed_data_provider);
- if (!SanityCheckASMap(asmap, 128)) {
- return;
- }
CNodeStats stats;
- node.CopyStats(stats, asmap);
+ node.CopyStats(stats);
},
[&] {
const CNode* add_ref_node = node.AddRef();