izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize IPv4-mapped IPv4 addresses before checking PC/LAN/WAN type

Browse Source
This commit is contained in:
Cameron Gutman
2024-01-14 19:55:09 -06:00
parent 3d6e7f447a
commit 6b5a712506
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ namespace net {
net_e net_e
from_address(const std::string_view &view) { from_address(const std::string_view &view) {
auto addr = ip::make_address(view); auto addr = normalize_address(ip::make_address(view));
if (addr.is_v6()) { if (addr.is_v6()) {
for (auto &range : pc_ips_v6) { for (auto &range : pc_ips_v6) {
src/network.h
+9
View File
@@ -58,6 +58,15 @@ namespace net {
std::string_view std::string_view
af_to_any_address_string(af_e af); af_to_any_address_string(af_e af);
/**
* @brief Converts an address to a normalized form.
* @details Normalization converts IPv4-mapped IPv6 addresses into IPv4 addresses.
* @param address The address to normalize.
* @return Normalized address.
*/
boost::asio::ip::address
normalize_address(boost::asio::ip::address address);
/** /**
* @brief Returns the given address in normalized string form. * @brief Returns the given address in normalized string form.
* @details Normalization converts IPv4-mapped IPv6 addresses into IPv4 addresses. * @details Normalization converts IPv4-mapped IPv6 addresses into IPv4 addresses.