mirror of https://github.com/SChernykh/p2pool
Display software name in peers list
parent
1b601343ff
commit
3e4f877ec0
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
|
||||||
#pragma warning(disable : 4005 4061 4324 4365 4464 4625 4626 4668 4710 4711 4804 4820 5039 5045 5220 5246)
|
#pragma warning(disable : 4005 4061 4324 4365 4464 4619 4625 4626 4668 4710 4711 4804 4820 5039 5045 5220 5246 5264)
|
||||||
#define FORCEINLINE __forceinline
|
#define FORCEINLINE __forceinline
|
||||||
#define NOINLINE __declspec(noinline)
|
#define NOINLINE __declspec(noinline)
|
||||||
#define LIKELY(expression) expression
|
#define LIKELY(expression) expression
|
||||||
|
|
|
@ -963,17 +963,14 @@ void P2PServer::show_peers()
|
||||||
|
|
||||||
for (P2PClient* client = static_cast<P2PClient*>(m_connectedClientsList->m_next); client != m_connectedClientsList; client = static_cast<P2PClient*>(client->m_next)) {
|
for (P2PClient* client = static_cast<P2PClient*>(m_connectedClientsList->m_next); client != m_connectedClientsList; client = static_cast<P2PClient*>(client->m_next)) {
|
||||||
if (client->m_listenPort >= 0) {
|
if (client->m_listenPort >= 0) {
|
||||||
char buf[32];
|
char buf[32] = {};
|
||||||
log::Stream s(buf);
|
log::Stream s(buf);
|
||||||
if (client->m_P2PoolVersion) {
|
if (client->m_SoftwareVersion) {
|
||||||
s << "\tv" << (client->m_P2PoolVersion >> 16) << '.' << (client->m_P2PoolVersion & 0xFFFF) << "\t\0";
|
s << client->software_name() << " v" << (client->m_SoftwareVersion >> 16) << '.' << (client->m_SoftwareVersion & 0xFFFF);
|
||||||
}
|
|
||||||
else {
|
|
||||||
s << "\t \t\0";
|
|
||||||
}
|
}
|
||||||
LOGINFO(0, (client->m_isIncoming ? "I\t" : "O\t")
|
LOGINFO(0, (client->m_isIncoming ? "I\t" : "O\t")
|
||||||
<< log::pad_right(client->m_pingTime, 4) << " ms\t"
|
<< log::pad_right(client->m_pingTime, 4) << " ms\t\t"
|
||||||
<< static_cast<const char*>(buf)
|
<< log::pad_right(static_cast<const char*>(buf), 20) << '\t'
|
||||||
<< static_cast<char*>(client->m_addrString));
|
<< static_cast<char*>(client->m_addrString));
|
||||||
++n;
|
++n;
|
||||||
}
|
}
|
||||||
|
@ -1183,7 +1180,8 @@ P2PServer::P2PClient::P2PClient()
|
||||||
, m_lastPeerListRequestTime{}
|
, m_lastPeerListRequestTime{}
|
||||||
, m_peerListPendingRequests(0)
|
, m_peerListPendingRequests(0)
|
||||||
, m_protocolVersion(PROTOCOL_VERSION_1_0)
|
, m_protocolVersion(PROTOCOL_VERSION_1_0)
|
||||||
, m_P2PoolVersion(0)
|
, m_SoftwareVersion(0)
|
||||||
|
, m_SoftwareID(0)
|
||||||
, m_pingTime(-1)
|
, m_pingTime(-1)
|
||||||
, m_blockPendingRequests(0)
|
, m_blockPendingRequests(0)
|
||||||
, m_chainTipBlockRequest(false)
|
, m_chainTipBlockRequest(false)
|
||||||
|
@ -1230,7 +1228,8 @@ void P2PServer::P2PClient::reset()
|
||||||
m_lastPeerListRequestTime = {};
|
m_lastPeerListRequestTime = {};
|
||||||
m_peerListPendingRequests = 0;
|
m_peerListPendingRequests = 0;
|
||||||
m_protocolVersion = PROTOCOL_VERSION_1_0;
|
m_protocolVersion = PROTOCOL_VERSION_1_0;
|
||||||
m_P2PoolVersion = 0;
|
m_SoftwareVersion = 0;
|
||||||
|
m_SoftwareID = 0;
|
||||||
m_pingTime = -1;
|
m_pingTime = -1;
|
||||||
m_blockPendingRequests = 0;
|
m_blockPendingRequests = 0;
|
||||||
m_chainTipBlockRequest = false;
|
m_chainTipBlockRequest = false;
|
||||||
|
@ -2140,10 +2139,11 @@ bool P2PServer::P2PClient::on_peer_list_response(const uint8_t* buf)
|
||||||
// Check for protocol version message
|
// Check for protocol version message
|
||||||
if ((*reinterpret_cast<uint32_t*>(ip.data + 12) == 0xFFFFFFFFU) && (port == 0xFFFF)) {
|
if ((*reinterpret_cast<uint32_t*>(ip.data + 12) == 0xFFFFFFFFU) && (port == 0xFFFF)) {
|
||||||
m_protocolVersion = *reinterpret_cast<uint32_t*>(ip.data);
|
m_protocolVersion = *reinterpret_cast<uint32_t*>(ip.data);
|
||||||
m_P2PoolVersion = *reinterpret_cast<uint32_t*>(ip.data + 4);
|
m_SoftwareVersion = *reinterpret_cast<uint32_t*>(ip.data + 4);
|
||||||
|
m_SoftwareID = *reinterpret_cast<uint32_t*>(ip.data + 8);
|
||||||
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 P2Pool version " << (m_P2PoolVersion >> 16) << '.' << (m_P2PoolVersion & 0xFFFF)
|
<< ", runs " << software_name() << " v" << (m_SoftwareVersion >> 16) << '.' << (m_SoftwareVersion & 0xFFFF)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
@ -2346,4 +2346,16 @@ void P2PServer::P2PClient::post_handle_incoming_block(const uint32_t reset_count
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const char* P2PServer::P2PClient::software_name() const
|
||||||
|
{
|
||||||
|
switch (m_SoftwareID) {
|
||||||
|
case 0:
|
||||||
|
return "P2Pool";
|
||||||
|
case 0x624F6F47UL:
|
||||||
|
return "GoObserver";
|
||||||
|
default:
|
||||||
|
return "Unknown";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace p2pool
|
} // namespace p2pool
|
||||||
|
|
|
@ -110,6 +110,8 @@ public:
|
||||||
|
|
||||||
bool is_good() const { return m_handshakeComplete && !m_handshakeInvalid && (m_listenPort >= 0); }
|
bool is_good() const { return m_handshakeComplete && !m_handshakeInvalid && (m_listenPort >= 0); }
|
||||||
|
|
||||||
|
const char* software_name() const;
|
||||||
|
|
||||||
uint64_t m_peerId;
|
uint64_t m_peerId;
|
||||||
MessageId m_expectedMessage;
|
MessageId m_expectedMessage;
|
||||||
uint64_t m_handshakeChallenge;
|
uint64_t m_handshakeChallenge;
|
||||||
|
@ -125,7 +127,8 @@ public:
|
||||||
int m_peerListPendingRequests;
|
int m_peerListPendingRequests;
|
||||||
|
|
||||||
uint32_t m_protocolVersion;
|
uint32_t m_protocolVersion;
|
||||||
uint32_t m_P2PoolVersion;
|
uint32_t m_SoftwareVersion;
|
||||||
|
uint32_t m_SoftwareID;
|
||||||
|
|
||||||
int64_t m_pingTime;
|
int64_t m_pingTime;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue