Page MenuHomePhabricator
Files F14864809

D10707.id.diff
No OneTemporary
Actions

D10707.id.diff
View Options

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -400,13 +400,13 @@
class NetinfoRequestHandler : public BaseRequestHandler {
private:
static constexpr int8_t UNKNOWN_NETWORK{-1};
- static constexpr size_t m_networks_size{3};
+ static constexpr uint8_t m_networks_size{3};
const std::array<std::string, m_networks_size> m_networks{
{"ipv4", "ipv6", "onion"}};
//! Peer counts by (in/out/total, networks/total/block-relay)
std::array<std::array<uint16_t, m_networks_size + 2>, 3> m_counts{{{}}};
int8_t NetworkStringToId(const std::string &str) const {
- for (size_t i = 0; i < m_networks_size; ++i) {
+ for (uint8_t i = 0; i < m_networks_size; ++i) {
if (str == m_networks.at(i)) {
return i;
}
@@ -428,19 +428,19 @@
size_t m_max_addr_length{0};
size_t m_max_id_length{2};
struct Peer {
- int id;
- int mapped_as;
- int version;
+ std::string addr;
+ std::string sub_version;
+ std::string network;
+ double min_ping;
+ double ping;
int64_t conn_time;
int64_t last_blck;
int64_t last_recv;
int64_t last_send;
int64_t last_trxn;
- double min_ping;
- double ping;
- std::string addr;
- std::string network;
- std::string sub_version;
+ int id;
+ int mapped_as;
+ int version;
bool is_block_relay;
bool is_outbound;
bool operator<(const Peer &rhs) const {
@@ -538,9 +538,9 @@
: peer["pingtime"].get_real()};
const std::string addr{peer["addr"].get_str()};
const std::string sub_version{peer["subver"].get_str()};
- m_peers.push_back({peer_id, mapped_as, version, conn_time,
- last_blck, last_recv, last_send, last_trxn,
- min_ping, ping, addr, network, sub_version,
+ m_peers.push_back({addr, sub_version, network, min_ping, ping,
+ conn_time, last_blck, last_recv, last_send,
+ last_trxn, peer_id, mapped_as, version,
is_block_relay, is_outbound});
m_max_id_length =
std::max(ToString(peer_id).length(), m_max_id_length);
@@ -561,7 +561,7 @@
if (DetailsRequested() && !m_peers.empty()) {
std::sort(m_peers.begin(), m_peers.end());
result += "Peer connections sorted by direction and min ping\n<-> "
- "relay net mping ping send recv txn blk uptime ";
+ "relay net mping ping send recv txn blk age ";
if (m_is_asmap_on) {
result += " asmap ";
}
@@ -572,7 +572,7 @@
for (const Peer &peer : m_peers) {
std::string version{ToString(peer.version) + peer.sub_version};
result += strprintf(
- "%3s %5s %5s%6s%7s%5s%5s%5s%5s%7s%*i %*s %-*s%s\n",
+ "%3s %5s %5s%7s%7s%5s%5s%5s%5s%7s%*i %*s %-*s%s\n",
peer.is_outbound ? "out" : "in",
peer.is_block_relay ? "block" : "full", peer.network,
peer.min_ping == -1 ? ""
@@ -604,13 +604,13 @@
IsVersionSelected() && version != "0" ? version : "");
}
result +=
- " ms ms sec sec min min min\n\n";
+ " ms ms sec sec min min min\n\n";
}
// Report peer connection totals by type.
result += " ipv4 ipv6 onion total block-relay\n";
const std::array<std::string, 3> rows{{"in", "out", "total"}};
- for (size_t i = 0; i < m_networks_size; ++i) {
+ for (uint8_t i = 0; i < m_networks_size; ++i) {
result += strprintf("%-5s %5i %5i %5i %5i %5i\n",
rows.at(i), m_counts.at(i).at(0),
m_counts.at(i).at(1), m_counts.at(i).at(2),

File Metadata

Mime Type
text/plain
Expires
Tue, May 20, 22:32 (18 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5863083
Default Alt Text
D10707.id.diff (4 KB)

Event Timeline