diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-07-12 20:11:34 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-07-12 20:11:34 -0500 |
| commit | 6c947c1daa86f77a820d2912a8ba30720f39a0cf (patch) | |
| tree | a069218a9b6992e8a4d0e40a0a989613753b75b3 /src/etc | |
| parent | b9212b1535fc0d2548121827c448c8a72486f7cf (diff) | |
| parent | 0987677ac58ba5e22c9d26f4d1af509b3010a5d6 (diff) | |
| download | pfsense-6c947c1daa86f77a820d2912a8ba30720f39a0cf.zip pfsense-6c947c1daa86f77a820d2912a8ba30720f39a0cf.tar.gz | |
Merge pull request #3007 from stilez/patch-34
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/util.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index c83fd9c..1682914 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -839,12 +839,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; } |
