Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-03 23:15:52 +00:00
Code Issues Projects Releases Wiki Activity
5d897781ef
lokinet/llarp/net/ip_range.cpp

63 lines
1.3 KiB
C++
Raw Normal View History

standardize include format and pragma once All #ifndef guards on headers have been removed, I think, in favor of #pragma once Headers are now included as `#include "filename"` if the included file resides in the same directory as the file including it, or any subdirectory therein. Otherwise they are included as `#include <project/top/dir/relative/path/filename>` The above does not include system/os headers.
2021-03-09 22:24:35 +00:00
#include "ip_range.hpp"
Move IPRange out of net.hpp; free up TruncateV6 etc. - Move IPRange into its own net/ip_range.hpp - Move the static net::IPPacket::TruncateV6, etc. functions to free net::TruncateV6, etc. functions (now from net/ip.hpp instead of net/ip_packet.hpp). - Make net::TruncateV6 and net::ExpandV4 constexpr. - Add IPRange::FromIPv4 factory function (to replace the iprange_ipv4 free function)
2020-05-20 19:14:05 +00:00
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())
{
* rework exit codepath to allow multiple exits * 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
2020-06-24 13:24:07 +00:00
const auto bits = stoi(bitsstr);
Move IPRange out of net.hpp; free up TruncateV6 etc. - Move IPRange into its own net/ip_range.hpp - Move the static net::IPPacket::TruncateV6, etc. functions to free net::TruncateV6, etc. functions (now from net/ip.hpp instead of net/ip_packet.hpp). - Make net::TruncateV6 and net::ExpandV4 constexpr. - Add IPRange::FromIPv4 factory function (to replace the iprange_ipv4 free function)
2020-05-20 19:14:05 +00:00
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
* rework exit codepath to allow multiple exits * 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
2020-06-24 13:24:07 +00:00
IPRange::BaseAddressString() const
Move IPRange out of net.hpp; free up TruncateV6 etc. - Move IPRange into its own net/ip_range.hpp - Move the static net::IPPacket::TruncateV6, etc. functions to free net::TruncateV6, etc. functions (now from net/ip.hpp instead of net/ip_packet.hpp). - Make net::TruncateV6 and net::ExpandV4 constexpr. - Add IPRange::FromIPv4 factory function (to replace the iprange_ipv4 free function)
2020-05-20 19:14:05 +00:00
{
* rework exit codepath to allow multiple exits * 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
2020-06-24 13:24:07 +00:00
if (IsV4())
Move IPRange out of net.hpp; free up TruncateV6 etc. - Move IPRange into its own net/ip_range.hpp - Move the static net::IPPacket::TruncateV6, etc. functions to free net::TruncateV6, etc. functions (now from net/ip.hpp instead of net/ip_packet.hpp). - Make net::TruncateV6 and net::ExpandV4 constexpr. - Add IPRange::FromIPv4 factory function (to replace the iprange_ipv4 free function)
2020-05-20 19:14:05 +00:00
{
* rework exit codepath to allow multiple exits * 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
2020-06-24 13:24:07 +00:00
const huint32_t addr4 = net::TruncateV6(addr);
return addr4.ToString();
Move IPRange out of net.hpp; free up TruncateV6 etc. - Move IPRange into its own net/ip_range.hpp - Move the static net::IPPacket::TruncateV6, etc. functions to free net::TruncateV6, etc. functions (now from net/ip.hpp instead of net/ip_packet.hpp). - Make net::TruncateV6 and net::ExpandV4 constexpr. - Add IPRange::FromIPv4 factory function (to replace the iprange_ipv4 free function)
2020-05-20 19:14:05 +00:00
}
* rework exit codepath to allow multiple exits * 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
2020-06-24 13:24:07 +00:00
return addr.ToString();
Move IPRange out of net.hpp; free up TruncateV6 etc. - Move IPRange into its own net/ip_range.hpp - Move the static net::IPPacket::TruncateV6, etc. functions to free net::TruncateV6, etc. functions (now from net/ip.hpp instead of net/ip_packet.hpp). - Make net::TruncateV6 and net::ExpandV4 constexpr. - Add IPRange::FromIPv4 factory function (to replace the iprange_ipv4 free function)
2020-05-20 19:14:05 +00:00
}
} // namespace llarp
Reference in New Issue Copy Permalink