aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2020-11-04 23:01:23 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2020-12-03 00:31:32 +0000
commit67f2bec2dfa463aa3b4fbd115132b6cd4ca495e5 (patch)
tree21998bd9cec9cc89f3ac376fa045e01ad50fb6b2
parentp2p: rewrite boost's make_address_v4 to cater for < 1.66 (diff)
downloadmonero-67f2bec2dfa463aa3b4fbd115132b6cd4ca495e5.tar.xz
p2p: make this work with boost <= 1.65 (pffff)
-rw-r--r--src/p2p/net_node.inl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index c3d594c99..7976b6fa0 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -1518,7 +1518,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();