diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-01-24 12:30:49 -0200 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-01-24 12:30:49 -0200 |
commit | 41b4867edaa639a819d9c998c766397c4844bad5 (patch) | |
tree | 22ee5720a38ccefec7e4335102960766345ab64e /usr/local/www/services_dhcpv6.php | |
parent | a78bf0c8b382d104638f1e02582a5a64a46800a6 (diff) | |
download | pfsense-41b4867edaa639a819d9c998c766397c4844bad5.zip pfsense-41b4867edaa639a819d9c998c766397c4844bad5.tar.gz |
Move is_inrange() to util.inc and rename it to is_inrange_v6()
Diffstat (limited to 'usr/local/www/services_dhcpv6.php')
-rw-r--r-- | usr/local/www/services_dhcpv6.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php index 315a546..0465edf 100644 --- a/usr/local/www/services_dhcpv6.php +++ b/usr/local/www/services_dhcpv6.php @@ -144,13 +144,6 @@ if(is_array($dhcrelaycfg)) { } } -function is_inrange($test, $start, $end) { - if ( (inet_pton($test) <= inet_pton($end)) && (inet_pton($test) >= inet_pton($start)) ) - return true; - else - return false; -} - if ($_POST) { unset($input_errors); @@ -218,7 +211,7 @@ if ($_POST) { if (is_array($config['virtualip']['vip'])) { foreach($config['virtualip']['vip'] as $vip) { if($vip['interface'] == $if) - if($vip['subnetv6'] && is_inrange($vip['subnetv6'], $_POST['range_from'], $_POST['range_to'])) + if($vip['subnetv6'] && is_inrange_v6($vip['subnetv6'], $_POST['range_from'], $_POST['range_to'])) $input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IPv6 address %s."),$vip['subnetv6']); } } @@ -234,8 +227,8 @@ if ($_POST) { $subnet_end = gen_subnetv6_max($ifcfgip, $ifcfgsn); if (is_ipaddrv6($ifcfgip)) { - if ((! is_inrange($_POST['range_from'], $subnet_start, $subnet_end)) || - (! is_inrange($_POST['range_to'], $subnet_start, $subnet_end))) { + if ((! is_inrange_v6($_POST['range_from'], $subnet_start, $subnet_end)) || + (! is_inrange_v6($_POST['range_to'], $subnet_start, $subnet_end))) { $input_errors[] = gettext("The specified range lies outside of the current subnet."); } } |