Skip to content

Commit 96f469f

Browse files
committed
netinfo: print peer counts for all reachable networks
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.
1 parent f9ad4d5 commit 96f469f

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

src/bitcoin-cli.cpp

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -551,15 +551,26 @@ class NetinfoRequestHandler : public BaseRequestHandler
551551
}
552552

553553
// Report peer connection totals by type.
554-
result += " ipv4 ipv6 onion";
555-
const bool any_i2p_peers = m_counts.at(2).at(3); // false if total i2p peers count is 0, otherwise true
556-
if (any_i2p_peers) result += " i2p";
554+
result += " ";
555+
std::vector<int8_t> reachable_networks;
556+
for (const UniValue& network : networkinfo["networks"].getValues()) {
557+
if (network["reachable"].get_bool()) {
558+
const std::string& network_name{network["name"].get_str()};
559+
const int8_t network_id{NetworkStringToId(network_name)};
560+
if (network_id == UNKNOWN_NETWORK) continue;
561+
result += strprintf("%8s", network_name); // column header
562+
reachable_networks.push_back(network_id);
563+
}
564+
};
557565
result += " total block";
558566
if (m_manual_peers_count) result += " manual";
567+
559568
const std::array rows{"in", "out", "total"};
560-
for (uint8_t i = 0; i < 3; ++i) {
561-
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
562-
if (any_i2p_peers) result += strprintf(" %5i", m_counts.at(i).at(3)); // i2p peers count
569+
for (size_t i = 0; i < rows.size(); ++i) {
570+
result += strprintf("\n%-5s", rows[i]); // row header
571+
for (int8_t n : reachable_networks) {
572+
result += strprintf("%8i", m_counts.at(i).at(n)); // network peers count
573+
}
563574
result += strprintf(" %5i", m_counts.at(i).at(m_networks.size())); // total peers count
564575
if (i == 1) { // the outbound row has two extra columns for block relay and manual peer counts
565576
result += strprintf(" %5i", m_block_relay_peers_count);

0 commit comments

Comments
 (0)