AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-06 07:44:57 +03:00
Code Releases Activity

Change IP structure so that IPv4 addresses are stored in RFC3493 format

Browse Source 
In addition to saving 4 bytes for each instantiation, this change makes IP-related operations faster and clearer.

https://tools.ietf.org/html/rfc3493.html#section-3.7
This commit is contained in:
Davide Beatrici
2021-04-07 21:24:55 +02:00
parent 01663f836d
commit 1708998a11
21 changed files with 295 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Cedar/Hub.c
View File

@ -6752,11 +6752,13 @@ bool IsHubIpAddress(IP *ip)
return false;
}
if (ip->addr[0] == 172 && ip->addr[1] == 31)
const BYTE *ipv4 = IPV4(ip->address);
if (ipv4[0] == 172 && ipv4[1] == 31)
{
if (ip->addr[2] >= 1 && ip->addr[2] <= 254)
if (ipv4[2] >= 1 && ipv4[2] <= 254)
{
if (ip->addr[3] >= 1 && ip->addr[3] <= 254)
if (ipv4[3] >= 1 && ipv4[3] <= 254)
{
return true;
}
@ -6810,11 +6812,7 @@ void GenHubIpAddress(IP *ip, char *name)
Sha0(hash, tmp2, StrLen(tmp2));
Zero(ip, sizeof(IP));
ip->addr[0] = 172;
ip->addr[1] = 31;
ip->addr[2] = hash[0] % 254 + 1;
ip->addr[3] = hash[1] % 254 + 1;
SetIP(ip, 172, 31, hash[0] % 254 + 1, hash[0] % 254 + 1);
}
// Generate a MAC address for the Virtual HUB