incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix up local/external address handling

Browse Source
This commit is contained in:
Martin Michelsen
2024-11-10 16:20:11 -08:00
parent 8cb7b465da
commit a59a2d7cd3
6 changed files with 129 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NetworkAddresses.cc
+9 -2
View File
@@ -66,9 +66,16 @@ map<string, uint32_t> get_local_addresses() {
return ret;
}
bool is_loopback_address(uint32_t addr) {
return ((addr & 0xFF000000) == 0x7F000000); // 127.0.0.0/8
}
bool is_local_address(uint32_t addr) {
uint8_t net = (addr >> 24) & 0xFF;
return ((net == 127) || (net == 172) || (net == 10) || (net == 192));
return is_loopback_address(addr) || // 127.0.0.0/8
((addr & 0xFF000000) == 0x0A000000) || // 10.0.0.0/8
((addr & 0xFFF00000) == 0xAC100000) || // 172.16.0.0/12
((addr & 0xFFFF0000) == 0xC0A80000) || // 192.168.0.0/16
((addr & 0xFFFF0000) == 0xA9FE0000); // 169.254.0.0/16
}
bool is_local_address(const sockaddr_storage& daddr) {