diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-11-04 20:57:49 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-11-04 20:57:49 -0600 |
| commit | bddd5653e1d471a718c120a129182a026762de14 (patch) | |
| tree | 3108f6b9cda7674cadc76c0032ab86fd3e8b919b | |
| parent | Merge pull request #6979 (diff) | |
| parent | p2p: make this work with boost <= 1.65 (pffff) (diff) | |
| download | monero-bddd5653e1d471a718c120a129182a026762de14.tar.xz | |
Merge pull request #6981
b36c4f3 p2p: make this work with boost <= 1.65 (pffff) (moneromooo-monero)
| -rw-r--r-- | src/p2p/net_node.inl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 43410dcbe..725e2a22d 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -1501,7 +1501,11 @@ 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 } } return address.host_str(); |