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

Expose integral m_conn_type in CNodeStats, remove m_conn_type_string

Browse Source
This commit is contained in:
Jon Atack 2021-01-02 10:44:03 +01:00 committed by MarcoFalke
parent 4b8b71e630
commit faecb74562
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net.cpp
View File

@ -507,9 +507,9 @@ void CConnman::AddWhitelistPermissionFlags(NetPermissionFlags& flags, const CNet
} }
} }
std::string CNode::ConnectionTypeAsString() const std::string ConnectionTypeAsString(ConnectionType conn_type)
{ {
switch (m_conn_type) { switch (conn_type) {
case ConnectionType::INBOUND: case ConnectionType::INBOUND:
return "inbound"; return "inbound";
case ConnectionType::MANUAL: case ConnectionType::MANUAL:
@ -627,7 +627,7 @@ void CNode::copyStats(CNodeStats &stats, const std::vector<bool> &m_asmap)
CService addrLocalUnlocked = GetAddrLocal(); CService addrLocalUnlocked = GetAddrLocal();
stats.addrLocal = addrLocalUnlocked.IsValid() ? addrLocalUnlocked.ToString() : ""; stats.addrLocal = addrLocalUnlocked.IsValid() ? addrLocalUnlocked.ToString() : "";
stats.m_conn_type_string = ConnectionTypeAsString(); X(m_conn_type);
} }
#undef X #undef X

7
src/net.h
View File

@ -180,6 +180,8 @@ enum class ConnectionType {
ADDR_FETCH, ADDR_FETCH,
}; };
/** Convert ConnectionType enum to a string value */
std::string ConnectionTypeAsString(ConnectionType conn_type);
void Discover(); void Discover();
void StartMapPort(); void StartMapPort();
void InterruptMapPort(); void InterruptMapPort();
@ -273,11 +275,10 @@ public:
// Network the peer connected through // Network the peer connected through
Network m_network; Network m_network;
uint32_t m_mapped_as; uint32_t m_mapped_as;
std::string m_conn_type_string; ConnectionType m_conn_type;
}; };
/** Transport protocol agnostic message container. /** Transport protocol agnostic message container.
* Ideally it should only contain receive time, payload, * Ideally it should only contain receive time, payload,
* command and size. * command and size.
@ -765,7 +766,7 @@ public:
//! Sets the addrName only if it was not previously set //! Sets the addrName only if it was not previously set
void MaybeSetAddrName(const std::string& addrNameIn); void MaybeSetAddrName(const std::string& addrNameIn);
std::string ConnectionTypeAsString() const; std::string ConnectionTypeAsString() const { return ::ConnectionTypeAsString(m_conn_type); }
/** Whether this peer is an inbound onion, e.g. connected via our Tor onion service. */ /** Whether this peer is an inbound onion, e.g. connected via our Tor onion service. */
bool IsInboundOnion() const { return m_inbound_onion; } bool IsInboundOnion() const { return m_inbound_onion; }

2
src/rpc/net.cpp
View File

@ -249,7 +249,7 @@ static RPCHelpMan getpeerinfo()
recvPerMsgCmd.pushKV(i.first, i.second); recvPerMsgCmd.pushKV(i.first, i.second);
} }
obj.pushKV("bytesrecv_per_msg", recvPerMsgCmd); obj.pushKV("bytesrecv_per_msg", recvPerMsgCmd);
obj.pushKV("connection_type", stats.m_conn_type_string); obj.pushKV("connection_type", ConnectionTypeAsString(stats.m_conn_type));
ret.push_back(obj); ret.push_back(obj);
} }