highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-20 17:02:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

cli: add NetType enum struct and NetTypeEnumToString()

Browse Source
This commit is contained in:
Jon Atack 2020-08-13 16:49:39 +02:00
parent c227100919
commit 3a0ab93e1c
No known key found for this signature in database
GPG Key ID: 4F5721B3D0E3921D
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bitcoin-cli.cpp
View File

@ -315,6 +315,20 @@ private:
(onion_pos == addr_len - ONION_LEN || onion_pos == addr.find_last_of(":") - ONION_LEN); (onion_pos == addr_len - ONION_LEN || onion_pos == addr.find_last_of(":") - ONION_LEN);
} }
bool m_verbose{false}; //!< Whether user requested verbose -netinfo report bool m_verbose{false}; //!< Whether user requested verbose -netinfo report
enum struct NetType {
ipv4,
ipv6,
onion,
};
std::string NetTypeEnumToString(NetType t)
{
switch (t) {
case NetType::ipv4: return "ipv4";
case NetType::ipv6: return "ipv6";
case NetType::onion: return "onion";
} // no default case, so the compiler can warn about missing cases
assert(false);
}
std::string ChainToString() const std::string ChainToString() const
{ {
if (gArgs.GetChainName() == CBaseChainParams::TESTNET) return " testnet"; if (gArgs.GetChainName() == CBaseChainParams::TESTNET) return " testnet";
@ -354,10 +368,13 @@ public:
const int mapped_as{peer["mapped_as"].isNull() ? 0 : peer["mapped_as"].get_int()}; const int mapped_as{peer["mapped_as"].isNull() ? 0 : peer["mapped_as"].get_int()};
const bool is_block_relay{!peer["relaytxes"].get_bool()}; const bool is_block_relay{!peer["relaytxes"].get_bool()};
const bool is_inbound{peer["inbound"].get_bool()}; const bool is_inbound{peer["inbound"].get_bool()};
NetType net_type{NetType::ipv4};
if (is_inbound) { if (is_inbound) {
if (IsAddrIPv6(addr)) { if (IsAddrIPv6(addr)) {
net_type = NetType::ipv6;
++ipv6_i; ++ipv6_i;
} else if (IsInboundOnion(addr_local, mapped_as)) { } else if (IsInboundOnion(addr_local, mapped_as)) {
net_type = NetType::onion;
++onion_i; ++onion_i;
} else { } else {
++ipv4_i; ++ipv4_i;
@ -365,8 +382,10 @@ public:
if (is_block_relay) ++block_relay_i; if (is_block_relay) ++block_relay_i;
} else { } else {
if (IsAddrIPv6(addr)) { if (IsAddrIPv6(addr)) {
net_type = NetType::ipv6;
++ipv6_o; ++ipv6_o;
} else if (IsOutboundOnion(addr, mapped_as)) { } else if (IsOutboundOnion(addr, mapped_as)) {
net_type = NetType::onion;
++onion_o; ++onion_o;
} else { } else {
++ipv4_o; ++ipv4_o;