Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6983 

35186b1 p2p: fix endianness when checking IPv6 addresses mapping to IPv4 (moneromooo-monero)
This commit is contained in:
luigi1111 2020-11-05 19:09:43 -06:00
parent bddd5653e1 35186b1b84
commit 33dc825d6f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p2p/net_node.inl
View File

@ -1501,11 +1501,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();