Use correct vars for IPv6 when checking subnet start and end

This commit is contained in:
Phil Davis 2013-12-09 03:07:04 -08:00 committed by Renato Botelho
parent d8b011b8e6
commit 2c71286836

View File

@ -349,7 +349,7 @@ $config['interfaces'][$interface]['gatewayv6'] = $gwname6;
$config['interfaces'][$interface]['enable'] = true;
function console_configure_dhcpd($version = 4) {
global $g, $config, $restart_dhcpd, $fp, $interface, $dry_run, $intip, $intbits;
global $g, $config, $restart_dhcpd, $fp, $interface, $dry_run, $intip, $intbits, $intip6, $intbits6;
$label_IPvX = ($version === 6) ? "IPv6" : "IPv4";
$dhcpd = ($version === 6) ? "dhcpdv6" : "dhcpd";
@ -357,8 +357,8 @@ function console_configure_dhcpd($version = 4) {
if($g['services_dhcp_server_enable'])
$yn = prompt_for_enable_dhcp_server($version);
if ($yn == "y") {
$subnet_start = ($version === 6) ? gen_subnetv6($intip, $intbits) : gen_subnet($intip, $intbits);
$subnet_end = ($version === 6) ? gen_subnetv6_max($intip, $intbits) : gen_subnet_max($intip, $intbits);
$subnet_start = ($version === 6) ? gen_subnetv6($intip6, $intbits6) : gen_subnet($intip, $intbits);
$subnet_end = ($version === 6) ? gen_subnetv6_max($intip6, $intbits6) : gen_subnet_max($intip, $intbits);
do {
echo sprintf(gettext("Enter the start address of the %s client address range:"), $label_IPvX) . " ";
$dhcpstartip = chop(fgets($fp));