From 6215902c4043726e633fcfac1c37c710ac398653 Mon Sep 17 00:00:00 2001 From: stilez Date: Fri, 17 Jun 2016 05:08:19 +0100 Subject: Remove subnet_expand() Function isn't used in main or packages repo, and in any case would need a complete rewrite to handle IPv6. --- src/etc/inc/util.inc | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 171483e..0b78e7f 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -877,30 +877,6 @@ function subnet_size_by_netmask($iptype, $bits, $exact=false) { } } - -function subnet_expand($subnet) { - if (is_subnetv4($subnet)) { - return subnetv4_expand($subnet); - } else if (is_subnetv6($subnet)) { - return subnetv6_expand($subnet); - } else { - return $subnet; - } -} - -function subnetv4_expand($subnet) { - $result = array(); - list ($ip, $bits) = explode("/", $subnet); - $net = ip2long($ip); - $mask = (0xffffffff << (32 - $bits)); - $net &= $mask; - $size = round(exp(log(2) * (32 - $bits))); - for ($i = 0; $i < $size; $i += 1) { - $result[] = long2ip($net | $i); - } - return $result; -} - /* find out whether two IPv4/IPv6 CIDR subnets overlap. Note: CIDR overlap implies one is identical or included so largest sn will be the same */ function check_subnets_overlap($subnet1, $bits1, $subnet2, $bits2) { -- cgit v1.1