From 5440451927ac20d486cad52fcfac5d2efa363683 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 24 Jan 2013 12:28:33 -0200 Subject: Move is_inrange() to util.inc and rename it to is_inrange_v4() --- etc/inc/util.inc | 8 ++++++++ usr/local/www/services_dhcp.php | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 783b175..f9e18fc 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -679,6 +679,14 @@ function is_valid_shaperbw($val) { return (preg_match("/^(\d+(?:\.\d+)?)([MKG]?b|%)$/", $val)); } +/* returns true if $test is in the range between $start and $end */ +function is_inrange_v4($test, $start, $end) { + if ( (ip2ulong($test) <= ip2ulong($end)) && (ip2ulong($test) >= ip2ulong($start)) ) + return true; + else + return false; +} + /* return the configured carp interface list */ function get_configured_carp_interface_list() { global $config; diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index a0b85e7..fcaad50 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -199,13 +199,6 @@ if (is_array($dhcpdconf)) { $ifcfgip = $config['interfaces'][$if]['ipaddr']; $ifcfgsn = $config['interfaces'][$if]['subnet']; -function is_inrange($test, $start, $end) { - if ( (ip2ulong($test) <= ip2ulong($end)) && (ip2ulong($test) >= ip2ulong($start)) ) - return true; - else - return false; -} - function validate_partial_mac_list($maclist) { $macs = explode(',', $maclist); @@ -299,7 +292,7 @@ if ($_POST) { if (is_array($config['virtualip']['vip'])) { foreach($config['virtualip']['vip'] as $vip) { if($vip['interface'] == $if) - if($vip['subnet'] && is_inrange($vip['subnet'], $_POST['range_from'], $_POST['range_to'])) + if($vip['subnet'] && is_inrange_v4($vip['subnet'], $_POST['range_from'], $_POST['range_to'])) $input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IP address %s."),$vip['subnet']); } } -- cgit v1.1