anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2025-10-13 00:49:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge adjacent CIDRs

Browse Source
This commit is contained in:
Rekryt
2024-11-02 05:23:56 +03:00
parent 9957cd8dd2
commit 09812cd3e8
4 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Domain/Entity/Site.php
View File

@@ -145,15 +145,15 @@ final class Site {
if (isset($this->external->cidr4) && $this->isUseIpv4) {
foreach ($this->external->cidr4 as $url) {
$this->cidr4 = SiteFactory::normalize(
array_merge($this->cidr4, explode("\n", file_get_contents($url))),
true
$this->cidr4 = IP4Helper::minimizeSubnets(
SiteFactory::normalize(array_merge($this->cidr4, explode("\n", file_get_contents($url))), true)
);
}
}
if (isset($this->external->cidr6) && $this->isUseIpv6) {
foreach ($this->external->cidr6 as $url) {
// todo IP6Helper::minimizeSubnets
$this->cidr6 = SiteFactory::normalize(
array_merge($this->cidr6, explode("\n", file_get_contents($url))),
true