mirror of
https://github.com/oxen-io/lokinet
synced 2023-12-14 06:53:00 +01:00
0f21eeccb0
* rework net code for ip ranges to be cleaner * clean up endpoint auth code * refactor config to validate network configs before setting up endpoints * remove buildone from path/pathbuilder.cpp so we don't spam connection attempts
62 lines
1.3 KiB
C++
62 lines
1.3 KiB
C++
#include <net/ip_range.hpp>
|
|
|
|
namespace llarp
|
|
{
|
|
bool
|
|
IPRange::FromString(std::string str)
|
|
{
|
|
const auto colinpos = str.find(":");
|
|
const auto slashpos = str.find("/");
|
|
std::string bitsstr;
|
|
if (slashpos != std::string::npos)
|
|
{
|
|
bitsstr = str.substr(slashpos + 1);
|
|
str = str.substr(0, slashpos);
|
|
}
|
|
if (colinpos == std::string::npos)
|
|
{
|
|
huint32_t ip;
|
|
if (!ip.FromString(str))
|
|
return false;
|
|
addr = net::ExpandV4(ip);
|
|
if (!bitsstr.empty())
|
|
{
|
|
const auto bits = stoi(bitsstr);
|
|
if (bits < 0 || bits > 32)
|
|
return false;
|
|
netmask_bits = netmask_ipv6_bits(96 + bits);
|
|
}
|
|
else
|
|
netmask_bits = netmask_ipv6_bits(128);
|
|
}
|
|
else
|
|
{
|
|
if (!addr.FromString(str))
|
|
return false;
|
|
if (!bitsstr.empty())
|
|
{
|
|
auto bits = atoi(bitsstr.c_str());
|
|
if (bits < 0 || bits > 128)
|
|
return false;
|
|
netmask_bits = netmask_ipv6_bits(bits);
|
|
}
|
|
else
|
|
{
|
|
netmask_bits = netmask_ipv6_bits(128);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
std::string
|
|
IPRange::BaseAddressString() const
|
|
{
|
|
if (IsV4())
|
|
{
|
|
const huint32_t addr4 = net::TruncateV6(addr);
|
|
return addr4.ToString();
|
|
}
|
|
return addr.ToString();
|
|
}
|
|
|
|
} // namespace llarp
|