Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-02 23:26:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

allow blocking whole subnets

Browse source
This commit is contained in:
moneromooo-monero 2019-03-29 10:47:53 +00:00
parent 515ac2951d
commit 65c4004963
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
19 changed files with 413 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/net/parse.cpp
View file

@ -58,4 +58,27 @@ namespace net
return {epee::net_utils::ipv4_network_address{ip, port}};
return make_error_code(net::error::unsupported_address);
}
expect<epee::net_utils::ipv4_network_subnet>
get_ipv4_subnet_address(const boost::string_ref address, bool allow_implicit_32)
{
uint32_t mask = 32;
const boost::string_ref::size_type slash = address.find_first_of('/');
if (slash != boost::string_ref::npos)
{
if (!epee::string_tools::get_xtype_from_string(mask, std::string{address.substr(slash + 1)}))
return make_error_code(net::error::invalid_mask);
if (mask > 32)
return make_error_code(net::error::invalid_mask);
}
else if (!allow_implicit_32)
return make_error_code(net::error::invalid_mask);
std::uint32_t ip = 0;
boost::string_ref S(address.data(), slash != boost::string_ref::npos ? slash : address.size());
if (!epee::string_tools::get_ip_int32_from_string(ip, std::string(S)))
return make_error_code(net::error::invalid_host);
return {epee::net_utils::ipv4_network_subnet{ip, (uint8_t)mask}};
}
}