diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-06-22 11:47:46 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-06-22 11:47:46 -0400 |
commit | 24f97159c9100f48c6a8d61ad83b466aa58a1c2e (patch) | |
tree | 068f463322b4ce59427097e308ea208111efe2f1 | |
parent | 8a63f7f0724b011b9b657bc7059619bf646c41db (diff) | |
parent | 6215902c4043726e633fcfac1c37c710ac398653 (diff) | |
download | pfsense-24f97159c9100f48c6a8d61ad83b466aa58a1c2e.zip pfsense-24f97159c9100f48c6a8d61ad83b466aa58a1c2e.tar.gz |
Merge pull request #3006 from stilez/patch-33
-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 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) { |