upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-05-28 04:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

radvd: split lists, easier to read and less code #10048

Browse source
This commit is contained in:
Franco Fichtner 2026-04-07 14:30:35 +02:00
parent 72ccc1e14e
commit 7116a1f591
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/etc/inc/plugins.inc.d/radvd.inc
View file

@ -123,7 +123,8 @@ function radvd_configure_do($verbose = false, $ignorelist = [])
$ifconfig_details = legacy_interfaces_details();
$radvdconf = "# Automatically generated, do not edit\n";
/* Process all links which need the router advertise daemon */
/* process all links which need the router advertise daemon */
$manuallist = [];
$radvdifs = [];
/* handle manually configured DHCP6 server settings first */
@ -139,7 +140,7 @@ function radvd_configure_do($verbose = false, $ignorelist = [])
}
/* disable for automatic case below */
$ignorelist[$dhcpv6if] = '1';
$manuallist[$dhcpv6if] = '1';
if ($entry->enabled->isEmpty()) {
$radvdconf .= "# Skipping unset interface {$dhcpv6if}\n";
@ -365,7 +366,7 @@ function radvd_configure_do($verbose = false, $ignorelist = [])
/* handle DHCP-PD prefixes and 6RD dynamic interfaces */
foreach (array_keys(get_configured_interface_with_descr()) as $if) {
if (($config['interfaces'][$if]['ipaddrv6'] ?? 'none') != 'track6' || isset($config['interfaces'][$if]['dhcpd6track6allowoverride'])) {
if ($manuallist[$if]) {
/* handled by manual case */
continue;
} elseif (empty($config['interfaces'][$config['interfaces'][$if]['track6-interface']])) {