d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

p2p: rewrite boost's make_address_v4 to cater for < 1.66

Browse source
This commit is contained in:
moneromooo 2020-10-27 22:02:41 +00:00 • committed by wowario
parent 196c804ec9
commit dee79f861f
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/p2p/net_node.inl
View file

@ -71,6 +71,22 @@
#define MIN_WANTED_SEED_NODES 12
namespace
{
boost::asio::ip::address_v4 make_address_v4_from_v6(boost::asio::ip::v4_mapped_t m, const boost::asio::ip::address_v6& a)
{
const auto &bytes = a.to_bytes();
uint32_t v4 = 0;
v4 = (v4 << 8) | bytes[12];
v4 = (v4 << 8) | bytes[13];
v4 = (v4 << 8) | bytes[14];
v4 = (v4 << 8) | bytes[15];
return boost::asio::ip::address_v4(v4);
}
}
namespace nodetool
{
template<class t_payload_net_handler>
@ -1428,35 +1444,31 @@ namespace nodetool
const uint32_t actual_ip = na.as<const epee::net_utils::ipv4_network_address>().ip();
classB.insert(actual_ip & 0x0000ffff);
}
#if BOOST_VERSION > 106600
else if (cntxt.m_remote_address.get_type_id() == epee::net_utils::ipv6_network_address::get_type_id())
{
const epee::net_utils::network_address na = cntxt.m_remote_address;
boost::asio::ip::address_v6 actual_ip = na.as<const epee::net_utils::ipv6_network_address>().ip();
if (actual_ip.is_v4_mapped())
{
boost::asio::ip::address_v4 v4ip = make_address_v4(boost::asio::ip::v4_mapped, actual_ip);
boost::asio::ip::address_v4 v4ip = make_address_v4_from_v6(boost::asio::ip::v4_mapped, actual_ip);
uint32_t actual_ip4 = (v4ip.to_bytes()[1] << 8) | v4ip.to_bytes()[0];
classB.insert(actual_ip4 & 0x0000ffff);
}
}
#endif
return true;
});
}
auto get_host_string = [](const epee::net_utils::network_address &address) {
#if BOOST_VERSION > 106600
if (address.get_type_id() == epee::net_utils::ipv6_network_address::get_type_id())
{
boost::asio::ip::address_v6 actual_ip = address.as<const epee::net_utils::ipv6_network_address>().ip();
if (actual_ip.is_v4_mapped())
{
boost::asio::ip::address_v4 v4ip = make_address_v4(boost::asio::ip::v4_mapped, actual_ip);
boost::asio::ip::address_v4 v4ip = make_address_v4_from_v6(boost::asio::ip::v4_mapped, actual_ip);
return epee::net_utils::ipv4_network_address(v4ip.to_uint(), 0).host_str();
}
}
#endif
return address.host_str();
};
std::unordered_set<std::string> hosts_added;
@ -1476,19 +1488,17 @@ namespace nodetool
uint32_t actual_ip = na.as<const epee::net_utils::ipv4_network_address>().ip();
skip = classB.find(actual_ip & 0x0000ffff) != classB.end();
}
#if BOOST_VERSION > 106600
else if (skip_duplicate_class_B && pe.adr.get_type_id() == epee::net_utils::ipv6_network_address::get_type_id())
{
const epee::net_utils::network_address na = pe.adr;
boost::asio::ip::address_v6 actual_ip = na.as<const epee::net_utils::ipv6_network_address>().ip();
if (actual_ip.is_v4_mapped())
{
boost::asio::ip::address_v4 v4ip = make_address_v4(boost::asio::ip::v4_mapped, actual_ip);
boost::asio::ip::address_v4 v4ip = make_address_v4_from_v6(boost::asio::ip::v4_mapped, actual_ip);
uint32_t actual_ip4 = (((unsigned)v4ip.to_bytes()[1]) << 8) | (unsigned)v4ip.to_bytes()[0];
skip = classB.find(actual_ip4 & 0x0000ffff) != classB.end();
}
}
#endif
// consider each host once, to avoid giving undue inflence to hosts running several nodes
if (!skip)