monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5827

Browse source 
30779de fix feature not introduced until boost 1.66 (jtgrassie)
This commit is contained in:
luigi1111 2019-08-21 15:54:10 -05:00
commit cdfa2e58df
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/epee/include/net/local_ip.h
View file

@ -39,7 +39,7 @@ namespace epee
inline inline
bool is_ipv6_local(const std::string& ip) bool is_ipv6_local(const std::string& ip)
{ {
auto addr = boost::asio::ip::make_address_v6(ip); auto addr = boost::asio::ip::address_v6::from_string(ip);
// ipv6 link-local unicast addresses are fe80::/10 // ipv6 link-local unicast addresses are fe80::/10
bool is_link_local = addr.is_link_local(); bool is_link_local = addr.is_link_local();

2
src/net/parse.cpp
View file

@ -76,7 +76,7 @@ namespace net
return i2p_address::make(address, default_port); return i2p_address::make(address, default_port);
boost::system::error_code ec; boost::system::error_code ec;
boost::asio::ip::address_v6 v6 = boost::asio::ip::make_address_v6(host_str, ec); boost::asio::ip::address_v6 v6 = boost::asio::ip::address_v6::from_string(host_str, ec);
ipv6 = !ec; ipv6 = !ec;
std::uint16_t port = default_port; std::uint16_t port = default_port;