anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2025-10-13 16:59: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

8
src/Domain/Factory/SiteFactory.php
View File

@@ -3,10 +3,12 @@
namespace OpenCCK\Domain\Factory;
use OpenCCK\Domain\Entity\Site;
use OpenCCK\Domain\Helper\IP4Helper;
use OpenCCK\Domain\Helper\IP6Helper;
use OpenCCK\Infrastructure\API\App;
use stdClass;
use function \OpenCCK\getEnv;
use function OpenCCK\getEnv;
class SiteFactory {
// prettier-ignore
@@ -78,8 +80,8 @@ class SiteFactory {
$domains = self::normalize($domains);
$ip4 = self::normalize($ip4, true);
$ip6 = self::normalize($ip6, true);
$cidr4 = self::normalize($cidr4, true);
$cidr6 = self::normalize($cidr6, true);
$cidr4 = IP4Helper::minimizeSubnets(self::normalize($cidr4, true));
$cidr6 = self::normalize($cidr6, true); //$cidr6 = IP6Helper::minimizeSubnets(self::normalize($cidr6, true));
return new Site($name, $group, $domains, $dns, $timeout, $ip4, $ip6, $cidr4, $cidr6, $external);
}