Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2025-01-31 06:25:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

P2PServer: tidy up PEER_LIST_RESPONSE messages

Browse source
This commit is contained in:
SChernykh 2022-11-08 16:23:31 +01:00
parent 2e747beda6
commit bbc3d44526
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common.h
View file

@ -333,6 +333,12 @@ struct raw_ip
return (*this == localhost_ipv4) || (*this == localhost_ipv6); return (*this == localhost_ipv4) || (*this == localhost_ipv6);
} }
FORCEINLINE bool is_ipv4_prefix() const
{
alignas(8) static constexpr uint8_t ipv4_prefix[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff };
return memcmp(data, ipv4_prefix, sizeof(ipv4_prefix)) == 0;
}
}; };
static_assert(sizeof(raw_ip) == 16, "struct raw_ip has invalid size"); static_assert(sizeof(raw_ip) == 16, "struct raw_ip has invalid size");

17
src/p2p_server.cpp
View file

@ -2042,14 +2042,27 @@ bool P2PServer::P2PClient::on_peer_list_response(const uint8_t* buf) const
const uint32_t num_peers = *(buf++); const uint32_t num_peers = *(buf++);
for (uint32_t i = 0; i < num_peers; ++i) { for (uint32_t i = 0; i < num_peers; ++i) {
const bool is_v6 = *(buf++) != 0; bool is_v6 = *(buf++) != 0;
raw_ip ip; raw_ip ip;
memcpy(ip.data, buf, sizeof(ip.data)); memcpy(ip.data, buf, sizeof(ip.data));
buf += sizeof(ip.data); buf += sizeof(ip.data);
// Fill in default bytes for IPv4 addresses // Treat IPv4-mapped addresses as regular IPv4 addresses
if (is_v6 && ip.is_ipv4_prefix()) {
is_v6 = false;
}
if (!is_v6) { if (!is_v6) {
const uint32_t b = ip.data[12];
if ((b == 0) || (b >= 224)) {
// Ignore 0.0.0.0/8 (special-purpose range for "this network") and 224.0.0.0/3 (IP multicast and reserved ranges)
// Some values in these ranges will be used to enable future P2Pool binary protocol versions
buf += 2;
continue;
}
// Fill in default bytes for IPv4 addresses
memset(ip.data, 0, 10); memset(ip.data, 0, 10);
ip.data[10] = 0xFF; ip.data[10] = 0xFF;
ip.data[11] = 0xFF; ip.data[11] = 0xFF;