Merge pull request #6981

b36c4f3 p2p: make this work with boost <= 1.65 (pffff) (moneromooo-monero)
This commit is contained in:
luigi1111 2020-11-04 20:57:49 -06:00
commit bddd5653e1
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -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();