ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-14 10:48:32 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ip2net : precompute ipv6 masks

Browse Source
This commit is contained in:
bol-van 2021-09-18 21:22:29 +03:00
parent 9402cd2cf0
commit 0b8072840b
9 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/aarch64/ip2net
View File

Binary file not shown.

BIN
binaries/arm/ip2net
View File

Binary file not shown.

BIN
binaries/mips32r1-lsb/ip2net
View File

Binary file not shown.

BIN
binaries/mips32r1-msb/ip2net
View File

Binary file not shown.

BIN
binaries/mips64r2-msb/ip2net
View File

Binary file not shown.

BIN
binaries/ppc/ip2net
View File

Binary file not shown.

BIN
binaries/x86/ip2net
View File

Binary file not shown.

BIN
binaries/x86_64/ip2net
View File

Binary file not shown.

28
ip2net/ip2net.c
View File

@ -79,7 +79,7 @@ static uint32_t unique6(struct in6_addr *pu, uint32_t ct)
} }
return i; return i;
} }
static void mask_from_bitcount6(uint32_t zct, struct in6_addr *a) static void mask_from_bitcount6_make(uint32_t zct, struct in6_addr *a)
{ {
if (zct >= 128) if (zct >= 128)
memset(a->s6_addr,0x00,16); memset(a->s6_addr,0x00,16);
@ -91,6 +91,17 @@ static void mask_from_bitcount6(uint32_t zct, struct in6_addr *a)
a->s6_addr[n] = ~((1 << (zct & 7)) - 1); a->s6_addr[n] = ~((1 << (zct & 7)) - 1);
} }
} }
static struct in6_addr ip6_mask[129];
static void mask_from_bitcount6_prepare()
{
for (int zct=0;zct<=128;zct++) mask_from_bitcount6_make(zct, ip6_mask+zct);
}
static inline const struct in6_addr *mask_from_bitcount6(uint32_t zct)
{
return ip6_mask+zct;
}
// result = a & b // result = a & b
static void ip6_and(const struct in6_addr *a, const struct in6_addr *b, struct in6_addr *result) static void ip6_and(const struct in6_addr *a, const struct in6_addr *b, struct in6_addr *result)
{ {
@ -264,6 +275,7 @@ int main(int argc, char **argv)
} }
gnu_quicksort(iplist, ipct, sizeof(*iplist), cmp6, NULL); gnu_quicksort(iplist, ipct, sizeof(*iplist), cmp6, NULL);
ipct = unique6(iplist, ipct); ipct = unique6(iplist, ipct);
mask_from_bitcount6_prepare();
/* /*
for(uint32_t i=0;i<ipct;i++) for(uint32_t i=0;i<ipct;i++)
@ -273,18 +285,19 @@ int main(int argc, char **argv)
*/ */
while (pos < ipct) while (pos < ipct)
{ {
struct in6_addr mask, ip_start, ip; const struct in6_addr *mask;
struct in6_addr ip_start, ip;
uint32_t ip_ct_best = 0, zct_best = 0; uint32_t ip_ct_best = 0, zct_best = 0;
pos_end = pos + 1; pos_end = pos + 1;
// find smallest network with maximum ip coverage with no less than ip6_subnet_threshold addresses // find smallest network with maximum ip coverage with no less than ip6_subnet_threshold addresses
for (zct = params.zct_max; zct >= params.zct_min; zct--) for (zct = params.zct_max; zct >= params.zct_min; zct--)
{ {
mask_from_bitcount6(zct, &mask); mask = mask_from_bitcount6(zct);
ip6_and(iplist + pos, &mask, &ip_start); ip6_and(iplist + pos, mask, &ip_start);
for (p = pos + 1, ip_ct = 1; p < ipct; p++, ip_ct++) for (p = pos + 1, ip_ct = 1; p < ipct; p++, ip_ct++)
{ {
ip6_and(iplist + p, &mask, &ip); ip6_and(iplist + p, mask, &ip);
if (memcmp(&ip_start, &ip, sizeof(ip))) if (memcmp(&ip_start, &ip, sizeof(ip)))
break; break;
} }
@ -303,11 +316,8 @@ int main(int argc, char **argv)
} }
} }
if (zct_best) if (zct_best)
{
// network was found // network was found
mask_from_bitcount6(zct_best, &mask); ip6_and(iplist + pos, mask_from_bitcount6(zct_best), &ip_start);
ip6_and(iplist + pos, &mask, &ip_start);
}
else else
ip_start = iplist[pos], pos_end = pos + 1; // network not found, use single ip ip_start = iplist[pos], pos_end = pos + 1; // network not found, use single ip
inet_ntop(AF_INET6, &ip_start, str, sizeof(str)); inet_ntop(AF_INET6, &ip_start, str, sizeof(str));