mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport simplify subnet_size()

Browse Source 
Original pull request to master was #3007
This commit is contained in:
Phil Davis 2016-07-20 19:20:23 +09:30
parent c9d6b915da
commit f24e175eeb
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/etc/inc/util.inc
View File

@ -838,12 +838,9 @@ function is_subnetoralias($subnet) {
Returns 0 for bad data or if cannot represent size as an INT when $exact is set. */
function subnet_size($subnet, $exact=false) {
$parts = explode("/", $subnet);
if (count($parts) == 2) {
if (is_ipaddrv4($parts[0])) {
return subnet_size_by_netmask(4, $parts[1], $exact);
} elseif (is_ipaddrv6($parts[0])) {
return subnet_size_by_netmask(6, $parts[1], $exact);
}
$iptype = is_ipaddr($parts[0]);
if (count($parts) == 2 && $iptype) {
return subnet_size_by_netmask($iptype, $parts[1], $exact);
}
return 0;
}