Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-22 11:29:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed software version display

Browse source
This commit is contained in:
SChernykh 2024-05-29 10:47:03 +02:00
parent 59b693d2f3
commit 70e889ebdb
2 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/p2p_server.cpp
View file

@ -1047,7 +1047,7 @@ void P2PServer::show_peers() const
char buf[32] = {}; char buf[32] = {};
if (client->m_SoftwareVersion) { if (client->m_SoftwareVersion) {
log::Stream s(buf); log::Stream s(buf);
s << client->software_name() << " v" << (client->m_SoftwareVersion >> 16) << '.' << (client->m_SoftwareVersion & 0xFFFF); s << P2PClient::SoftwareDisplayName(client->m_SoftwareID, client->m_SoftwareVersion);
} }
LOGINFO(0, (client->m_isIncoming ? "I\t" : "O\t") LOGINFO(0, (client->m_isIncoming ? "I\t" : "O\t")
<< log::pad_right(log::Duration(cur_time - client->m_connectedTime), 16) << '\t' << log::pad_right(log::Duration(cur_time - client->m_connectedTime), 16) << '\t'
@ -1392,7 +1392,7 @@ void P2PServer::api_update_local_stats()
char buf[32] = {}; char buf[32] = {};
log::Stream s1(buf); log::Stream s1(buf);
if (client->m_SoftwareVersion) { if (client->m_SoftwareVersion) {
s1 << client->software_name() << " v" << (client->m_SoftwareVersion >> 16) << '.' << (client->m_SoftwareVersion & 0xFFFF); s1 << P2PClient::SoftwareDisplayName(client->m_SoftwareID, client->m_SoftwareVersion);
} }
if (!first) { if (!first) {
@ -2413,7 +2413,7 @@ void P2PServer::P2PClient::on_peer_list_response(const uint8_t* buf)
LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(m_addrString) << log::NoColor() LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(m_addrString) << log::NoColor()
<< " supports protocol version " << (m_protocolVersion >> 16) << '.' << (m_protocolVersion & 0xFFFF) << " supports protocol version " << (m_protocolVersion >> 16) << '.' << (m_protocolVersion & 0xFFFF)
<< ", runs " << software_name() << " v" << (m_SoftwareVersion >> 16) << '.' << (m_SoftwareVersion & 0xFFFF) << ", runs " << P2PClient::SoftwareDisplayName(m_SoftwareID, m_SoftwareVersion)
); );
if (m_SoftwareID == SoftwareID::Unknown) { if (m_SoftwareID == SoftwareID::Unknown) {
@ -2682,16 +2682,35 @@ void P2PServer::P2PClient::post_handle_incoming_block(p2pool* pool, const PoolBl
} }
} }
const char* P2PServer::P2PClient::software_name() const template<> struct log::Stream::Entry<P2PServer::P2PClient::SoftwareDisplayName>
{ {
switch (m_SoftwareID) { static NOINLINE void put(P2PServer::P2PClient::SoftwareDisplayName value, Stream* wrapper)
case SoftwareID::P2Pool: {
return "P2Pool"; switch (value.m_id) {
case SoftwareID::GoObserver: case SoftwareID::P2Pool:
return "GoObserver"; *wrapper << "P2Pool v";
default: if (value.m_version <= 0x3000A) {
return "Unknown"; // Encoding for versions <= 3.10
*wrapper << (value.m_version >> 16) << '.' << (value.m_version & 0xFFFF);
}
else {
// Encoding for versions > 3.10
*wrapper << (value.m_version >> 16) << '.' << ((value.m_version >> 8) & 0xFF);
if (value.m_version & 0xFF) {
*wrapper << '.' << (value.m_version & 0xFF);
}
}
break;
case SoftwareID::GoObserver:
*wrapper << "GoObserver v" << (value.m_version >> 16) << '.' << (value.m_version & 0xFFFF);
break;
default:
*wrapper << "Unknown v" << (value.m_version >> 16) << '.' << (value.m_version & 0xFFFF);
break;
}
} }
} };
} // namespace p2pool } // namespace p2pool

11
src/p2p_server.h
View file

@ -120,8 +120,6 @@ public:
[[nodiscard]] bool is_good() const { return m_handshakeComplete && !m_handshakeInvalid && (m_listenPort >= 0); } [[nodiscard]] bool is_good() const { return m_handshakeComplete && !m_handshakeInvalid && (m_listenPort >= 0); }
[[nodiscard]] const char* software_name() const;
alignas(8) char m_p2pReadBuf[P2P_BUF_SIZE]; alignas(8) char m_p2pReadBuf[P2P_BUF_SIZE];
uint64_t m_peerId; uint64_t m_peerId;
@ -154,6 +152,15 @@ public:
hash m_broadcastedHashes[8]; hash m_broadcastedHashes[8];
uint32_t m_broadcastedHashesIndex; uint32_t m_broadcastedHashesIndex;
// log::Stream wrapper
struct SoftwareDisplayName
{
FORCEINLINE SoftwareDisplayName(SoftwareID id, uint32_t version) : m_id(id), m_version(version) {}
SoftwareID m_id;
uint32_t m_version;
};
}; };
void broadcast(const PoolBlock& block, const PoolBlock* parent); void broadcast(const PoolBlock& block, const PoolBlock* parent);