highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-04 17:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#23175: Add CJDNS network to -addrinfo and -netinfo

Browse Source 
7b6528746a cli: hoist networks class data members to a constant (Jon Atack)
5bd40a3e84 cli: add cjdns network to -addrinfo and -netinfo (Jon Atack)

Pull request description:

  Follow-up to #23077 and #23324.
  ```
  $ ./src/bitcoin-cli -addrinfo
  {
    "addresses_known": {
      "ipv4": 47782,
      "ipv6": 10307,
      "onion": 8030,
      "i2p": 41,
      "cjdns": 1,
      "total": 66161
    }
  }
  $ ./src/bitcoin-cli -netinfo
  Bitcoin Core client v22.99.0-deb6223d4c55 - server 70016/Satoshi:22.99.0(jon)/

          ipv4    ipv6   onion     i2p   cjdns   total   block  manual
  in         0       5      12       5       1      23
  out        2       2       9       5       2      20       2      10
  total      2       7      21      10       3      43
  ```
  ```
  $ ./src/bitcoin-cli -netinfo 1
  ```

  ![Screenshot from 2021-10-10 12-01-58](https://user-images.githubusercontent.com/2415484/136691258-8b3fa7aa-3edb-4428-854a-adadfef302e3.png)

ACKs for top commit:
  laanwj:
    Code review ACK 7b6528746a

Tree-SHA512: 9c740d394d9842d38a1c01a824271b25277baac11ed090f0430daa15b580c2bf3d114ac6b8254b19d6aaee57cbe1ca6a414996e6994e0bf4a577bed771382eca
This commit is contained in:
W. J. van der Laan
2021-11-15 22:20:29 +01:00
parent 5ccab7187b 7b6528746a
commit caf8b26b52
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/bitcoin-cli.cpp
View File

@@ -49,6 +49,7 @@ static constexpr int DEFAULT_WAIT_CLIENT_TIMEOUT = 0;
static const bool DEFAULT_NAMED=false; static const bool DEFAULT_NAMED=false;
static const int CONTINUE_EXECUTION=-1; static const int CONTINUE_EXECUTION=-1;
static constexpr int8_t UNKNOWN_NETWORK{-1}; static constexpr int8_t UNKNOWN_NETWORK{-1};
static constexpr std::array NETWORKS{"ipv4", "ipv6", "onion", "i2p", "cjdns"};
/** Default number of blocks to generate for RPC generatetoaddress. */ /** Default number of blocks to generate for RPC generatetoaddress. */
static const std::string DEFAULT_NBLOCKS = "1"; static const std::string DEFAULT_NBLOCKS = "1";
@@ -242,11 +243,10 @@ public:
class AddrinfoRequestHandler : public BaseRequestHandler class AddrinfoRequestHandler : public BaseRequestHandler
{ {
private: private:
static constexpr std::array m_networks{"ipv4", "ipv6", "onion", "i2p"};
int8_t NetworkStringToId(const std::string& str) const int8_t NetworkStringToId(const std::string& str) const
{ {
for (size_t i = 0; i < m_networks.size(); ++i) { for (size_t i = 0; i < NETWORKS.size(); ++i) {
if (str == m_networks.at(i)) return i; if (str == NETWORKS[i]) return i;
} }
return UNKNOWN_NETWORK; return UNKNOWN_NETWORK;
} }
@@ -269,7 +269,7 @@ public:
throw std::runtime_error("-addrinfo requires bitcoind server to be running v22.0 and up"); throw std::runtime_error("-addrinfo requires bitcoind server to be running v22.0 and up");
} }
// Count the number of peers known to our node, by network. // Count the number of peers known to our node, by network.
std::array<uint64_t, m_networks.size()> counts{{}}; std::array<uint64_t, NETWORKS.size()> counts{{}};
for (const UniValue& node : nodes) { for (const UniValue& node : nodes) {
std::string network_name{node["network"].get_str()}; std::string network_name{node["network"].get_str()};
const int8_t network_id{NetworkStringToId(network_name)}; const int8_t network_id{NetworkStringToId(network_name)};
@@ -279,8 +279,8 @@ public:
// Prepare result to return to user. // Prepare result to return to user.
UniValue result{UniValue::VOBJ}, addresses{UniValue::VOBJ}; UniValue result{UniValue::VOBJ}, addresses{UniValue::VOBJ};
uint64_t total{0}; // Total address count uint64_t total{0}; // Total address count
for (size_t i = 0; i < m_networks.size(); ++i) { for (size_t i = 0; i < NETWORKS.size(); ++i) {
addresses.pushKV(m_networks.at(i), counts.at(i)); addresses.pushKV(NETWORKS[i], counts.at(i));
total += counts.at(i); total += counts.at(i);
} }
addresses.pushKV("total", total); addresses.pushKV("total", total);
@@ -363,14 +363,13 @@ class NetinfoRequestHandler : public BaseRequestHandler
{ {
private: private:
static constexpr uint8_t MAX_DETAIL_LEVEL{4}; static constexpr uint8_t MAX_DETAIL_LEVEL{4};
static constexpr std::array m_networks{"ipv4", "ipv6", "onion", "i2p"}; std::array<std::array<uint16_t, NETWORKS.size() + 1>, 3> m_counts{{{}}}; //!< Peer counts by (in/out/total, networks/total)
std::array<std::array<uint16_t, m_networks.size() + 1>, 3> m_counts{{{}}}; //!< Peer counts by (in/out/total, networks/total)
uint8_t m_block_relay_peers_count{0}; uint8_t m_block_relay_peers_count{0};
uint8_t m_manual_peers_count{0}; uint8_t m_manual_peers_count{0};
int8_t NetworkStringToId(const std::string& str) const int8_t NetworkStringToId(const std::string& str) const
{ {
for (size_t i = 0; i < m_networks.size(); ++i) { for (size_t i = 0; i < NETWORKS.size(); ++i) {
if (str == m_networks.at(i)) return i; if (str == NETWORKS[i]) return i;
} }
return UNKNOWN_NETWORK; return UNKNOWN_NETWORK;
} }
@@ -471,10 +470,10 @@ public:
const bool is_outbound{!peer["inbound"].get_bool()}; const bool is_outbound{!peer["inbound"].get_bool()};
const bool is_block_relay{!peer["relaytxes"].get_bool()}; const bool is_block_relay{!peer["relaytxes"].get_bool()};
const std::string conn_type{peer["connection_type"].get_str()}; const std::string conn_type{peer["connection_type"].get_str()};
++m_counts.at(is_outbound).at(network_id); // in/out by network ++m_counts.at(is_outbound).at(network_id); // in/out by network
++m_counts.at(is_outbound).at(m_networks.size()); // in/out overall ++m_counts.at(is_outbound).at(NETWORKS.size()); // in/out overall
++m_counts.at(2).at(network_id); // total by network ++m_counts.at(2).at(network_id); // total by network
++m_counts.at(2).at(m_networks.size()); // total overall ++m_counts.at(2).at(NETWORKS.size()); // total overall
if (conn_type == "block-relay-only") ++m_block_relay_peers_count; if (conn_type == "block-relay-only") ++m_block_relay_peers_count;
if (conn_type == "manual") ++m_manual_peers_count; if (conn_type == "manual") ++m_manual_peers_count;
if (DetailsRequested()) { if (DetailsRequested()) {
@@ -571,7 +570,7 @@ public:
for (int8_t n : reachable_networks) { for (int8_t n : reachable_networks) {
result += strprintf("%8i", m_counts.at(i).at(n)); // network peers count 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(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);
if (m_manual_peers_count) result += strprintf(" %5i", m_manual_peers_count); if (m_manual_peers_count) result += strprintf(" %5i", m_manual_peers_count);