diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-11-05 16:05:54 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-11-05 16:05:54 +0000 |
| commit | 35186b1b84cdc346a378333fb6996d509adfb700 (patch) | |
| tree | 30bb55f0ed6b4d6b493d21916a561a096a129ace | |
| parent | Merge pull request #6981 (diff) | |
| download | monero-35186b1b84cdc346a378333fb6996d509adfb700.tar.xz | |
p2p: fix endianness when checking IPv6 addresses mapping to IPv4
| -rw-r--r-- | src/p2p/net_node.inl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 725e2a22d..acd956487 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -1501,11 +1501,9 @@ namespace nodetool if (actual_ip.is_v4_mapped()) { boost::asio::ip::address_v4 v4ip = make_address_v4_from_v6(actual_ip); -#if BOOST_VERSION >= 106600 - return epee::net_utils::ipv4_network_address(v4ip.to_uint(), 0).host_str(); -#else - return epee::net_utils::ipv4_network_address(v4ip.to_ulong(), 0).host_str(); -#endif + uint32_t actual_ipv4; + memcpy(&actual_ipv4, v4ip.to_bytes().data(), sizeof(actual_ipv4)); + return epee::net_utils::ipv4_network_address(actual_ipv4, 0).host_str(); } } return address.host_str(); |