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 #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
parent 1ba4c8dbc2 b36c4f354b
commit bddd5653e1
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p2p/net_node.inl
View File

@ -1501,7 +1501,11 @@ 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
return epee::net_utils::ipv4_network_address(v4ip.to_uint(), 0).host_str(); 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(); return address.host_str();