opensourcemirror
/
opnsense-core
mirror of https://github.com/opnsense/core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dhcp: guard against primary address grab fail

This commit is contained in:
Franco Fichtner 2020-02-12 09:33:36 +01:00
parent 1c42d3462e
commit 877361d3c0
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,14 +497,22 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = array())
}
foreach (config_read_array('virtualip', 'vip') as $vip) {
if ($vip['interface'] == $if && is_ipaddrv6($vip['subnet'])) {
$subnetv6 = gen_subnetv6($vip['subnet'], $vip['subnet_bits']);
$radvdconf .= "\tprefix {$subnetv6}/{$vip['subnet_bits']} {\n";
$radvdconf .= "\t\tDeprecatePrefix on;\n";
$radvdconf .= "\t\tAdvOnLink on;\n";
$radvdconf .= "\t\tAdvAutonomous on;\n";
$radvdconf .= "\t};\n";
if ($vip['interface'] != $if || !is_ipaddrv6($vip['subnet'])) {
continue;
}
$subnetv6 = gen_subnetv6($vip['subnet'], $vip['subnet_bits']);
$vipnetv6 = "{$subnetv6}/{$vip['subnet_bits']}";
if ($vipnetv6 == $networkv6) {
continue;
}
$radvdconf .= "\tprefix {$vipnetv6} {\n";
$radvdconf .= "\t\tDeprecatePrefix on;\n";
$radvdconf .= "\t\tAdvOnLink on;\n";
$radvdconf .= "\t\tAdvAutonomous on;\n";
$radvdconf .= "\t};\n";
}
if (count($dnslist) > 0) {