From 0987677ac58ba5e22c9d26f4d1af509b3010a5d6 Mon Sep 17 00:00:00 2001 From: stilez Date: Fri, 17 Jun 2016 05:12:51 +0100 Subject: simplify subnet_size() is_ipaddr() returns the type of IP if valid. Use this to simplify the function --- src/etc/inc/util.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 171483e..fe4a3d4 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; } -- cgit v1.1