diff options
author | stilez <stilez@users.noreply.github.com> | 2016-06-17 05:08:19 +0100 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-06-22 11:48:08 -0400 |
commit | 7f4931408a87cd3497fee048d502a994a4ff94ac (patch) | |
tree | a5581186cb65baa89da0478e759c6ae713215010 | |
parent | 8cec6ee6c321aa7edbb381b9b6557b8375933576 (diff) | |
download | pfsense-7f4931408a87cd3497fee048d502a994a4ff94ac.zip pfsense-7f4931408a87cd3497fee048d502a994a4ff94ac.tar.gz |
Remove subnet_expand()
Function isn't used in main or packages repo, and in any case would need a complete rewrite to handle IPv6.
(cherry picked from commit 6215902c4043726e633fcfac1c37c710ac398653)
-rw-r--r-- | src/etc/inc/util.inc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 5de5bd1..15f6acf 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) { |