p2p: fix endianness when checking IPv6 addresses mapping to IPv4

This commit is contained in:
moneromooo-monero 2020-11-05 16:05:54 +00:00 committed by wowario
parent c40d8f5672
commit 9e86c1c90d
No known key found for this signature in database
GPG Key ID: 24DCBE762DE9C111
1 changed files with 3 additions and 5 deletions

View File

@ -1497,11 +1497,9 @@ namespace nodetool
if (actual_ip.is_v4_mapped()) if (actual_ip.is_v4_mapped())
{ {
boost::asio::ip::address_v4 v4ip = make_address_v4_from_v6(actual_ip); boost::asio::ip::address_v4 v4ip = make_address_v4_from_v6(actual_ip);
#if BOOST_VERSION >= 106600 uint32_t actual_ipv4;
return epee::net_utils::ipv4_network_address(v4ip.to_uint(), 0).host_str(); memcpy(&actual_ipv4, v4ip.to_bytes().data(), sizeof(actual_ipv4));
#else return epee::net_utils::ipv4_network_address(actual_ipv4, 0).host_str();
return epee::net_utils::ipv4_network_address(v4ip.to_ulong(), 0).host_str();
#endif
} }
} }
return address.host_str(); return address.host_str();