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

dhcp: align radvd vip code and exclude /128; closes #6531

Browse Source 
We might want to match specifically for /64 but users may have
success with other sizes despite the configuration error.  Only
make the obvious /128 not relevant here.
This commit is contained in:
Franco Fichtner 2023-06-29 14:43:54 +02:00
parent 24dd5c3a9e
commit 54f2ed4fa7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,7 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
}
foreach (config_read_array('virtualip', 'vip') as $vip) {
if ($vip['interface'] != $dhcpv6if || !is_ipaddrv6($vip['subnet'])) {
if ($vip['interface'] != $dhcpv6if || !is_ipaddrv6($vip['subnet']) || $vip['subnet_bits'] == '128') {
continue;
}
@ -497,7 +497,7 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
}
foreach (config_read_array('virtualip', 'vip') as $vip) {
if ($vip['interface'] != $if || !is_ipaddrv6($vip['subnet'])) {
if ($vip['interface'] != $if || !is_ipaddrv6($vip['subnet']) || $vip['subnet_bits'] == '128') {
continue;
}
@ -505,8 +505,9 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
continue;
}
$subnetv6 = gen_subnetv6($vip['subnet'], $vip['subnet_bits']);
$vipnetv6 = "{$subnetv6}/{$vip['subnet_bits']}";
/* force subnet to 64 as per radvd complaint "prefix length should be 64 for xzy" */
$subnetv6 = gen_subnetv6($vip['subnet'], 64);
$vipnetv6 = "{$subnetv6}/64";
if ($vipnetv6 == $networkv6) {
continue;