lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: fix refactor issue and scope hiccup #3310

Browse Source
This commit is contained in:
Franco Fichtner 2020-02-06 17:51:27 +01:00
parent f66c3bf812
commit 5ebae48efd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/interfaces.inc
View File

@ -4570,7 +4570,7 @@ function interfaces_addresses($interfaces, $as_subnet = false, $ifconfig_details
}
$result["{$address['ipaddr']}{$scope}{$suffix}"] = array(
'family' => $proto == 'ipv4' ? 'inet' : 'inet6',
'scope' => !empty($scope),
'scope' => !empty($address['link-local']),
'name' => $realif,
);
}

8
src/etc/inc/plugins.inc.d/dhcpd.inc
View File

@ -1266,7 +1266,7 @@ function dhcpd_dhcp6_configure($verbose = false, $blacklist = array())
continue;
}
if (!empty($config['interfaces'][$ifname]['track6-interface'])) {
list ($ifcfgipv6) = dhcpd_getaddr6(get_real_interface($ifname, 'inet6'), $ifconfig_details);
list ($ifcfgipv6) = dhcpd_getaddr6($ifname, get_real_interface($ifname, 'inet6'), $ifconfig_details);
if (!is_ipaddrv6($ifcfgipv6)) {
continue;
}
@ -1420,7 +1420,7 @@ EOD;
$realif = get_real_interface($dhcpv6if, 'inet6');
list ($ifcfgipv6, $networkv6) = dhcpd_getaddr6($realif, $ifconfig_details);
list ($ifcfgipv6, $networkv6) = dhcpd_getaddr6($dhcpv6if, $realif, $ifconfig_details);
if (!is_ipaddrv6($ifcfgipv6) || !is_subnetv6($networkv6)) {
log_error("Warning! dhcpd_dhcp6_configure() found no suitable IPv6 address on {$dhcpv6if}");
continue;
@ -1846,7 +1846,7 @@ function dhcpd_dhcrelay6_configure($verbose = false)
}
}
function dhcpd_getaddr6($realif, $ifconfig_details)
function dhcpd_getaddr6($interface, $realif, $ifconfig_details = null)
{
$ifcfgipv6 = $networkv6 = null;
@ -1859,7 +1859,7 @@ function dhcpd_getaddr6($realif, $ifconfig_details)
$addrparts = explode('/', $tmpaddr);
foreach (config_read_array('virtualip', 'vip') as $vip) {
if ($vip['interface'] == $dhcpv6if && $vip['mode'] == 'ipalias' && $vip['subnet'] == $addrparts[0]) {
if ($vip['interface'] == $interface && $vip['mode'] == 'ipalias' && $vip['subnet'] == $addrparts[0]) {
/* do not care about alias */
continue 2;
}