highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-30 18:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

netinfo: print peer counts for all reachable networks

Browse Source 
instead of only for networks we have peer connections to.

Users reported the previous behavior caused confusion,
as no column was printed when a network was reachable
but no peers were connected. Users expected a column
to be printed with 0 peers. This commit aligns
behavior with that expectation.
This commit is contained in:
Jon Atack
2021-10-20 14:26:06 +02:00
parent f9ad4d51e3
commit 96f469f91b
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/bitcoin-cli.cpp
View File

@ -551,15 +551,26 @@ public:
} }
// Report peer connection totals by type. // Report peer connection totals by type.
result += " ipv4 ipv6 onion"; result += " ";
const bool any_i2p_peers = m_counts.at(2).at(3); // false if total i2p peers count is 0, otherwise true std::vector<int8_t> reachable_networks;
if (any_i2p_peers) result += " i2p"; for (const UniValue& network : networkinfo["networks"].getValues()) {
if (network["reachable"].get_bool()) {
const std::string& network_name{network["name"].get_str()};
const int8_t network_id{NetworkStringToId(network_name)};
if (network_id == UNKNOWN_NETWORK) continue;
result += strprintf("%8s", network_name); // column header
reachable_networks.push_back(network_id);
}
};
result += " total block"; result += " total block";
if (m_manual_peers_count) result += " manual"; if (m_manual_peers_count) result += " manual";
const std::array rows{"in", "out", "total"}; const std::array rows{"in", "out", "total"};
for (uint8_t i = 0; i < 3; ++i) { for (size_t i = 0; i < rows.size(); ++i) {
result += strprintf("\n%-5s %5i %5i %5i", rows.at(i), m_counts.at(i).at(0), m_counts.at(i).at(1), m_counts.at(i).at(2)); // ipv4/ipv6/onion peers counts result += strprintf("\n%-5s", rows[i]); // row header
if (any_i2p_peers) result += strprintf(" %5i", m_counts.at(i).at(3)); // i2p peers count for (int8_t n : reachable_networks) {
result += strprintf("%8i", m_counts.at(i).at(n)); // network peers count
}
result += strprintf(" %5i", m_counts.at(i).at(m_networks.size())); // total peers count result += strprintf(" %5i", m_counts.at(i).at(m_networks.size())); // total peers count
if (i == 1) { // the outbound row has two extra columns for block relay and manual peer counts if (i == 1) { // the outbound row has two extra columns for block relay and manual peer counts
result += strprintf(" %5i", m_block_relay_peers_count); result += strprintf(" %5i", m_block_relay_peers_count);