upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-06-09 08:56:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

interfaces: a few "foreach ($config" iterations switched to config_read_array()

Browse source
This commit is contained in:
Franco Fichtner 2026-04-22 10:19:31 +02:00
parent 138bff55b5
commit 7caec8a921
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/opnsense/scripts/interfaces/reconfigure_vips.php
View file

@ -86,15 +86,19 @@ foreach (glob("/tmp/delete_vip_*.todo") as $filename) {
unlink($filename);
}
$virtualip_vips = config_read_array('virtualip', 'vip', false);
// diff model and actual ifconfig
if (!empty($config['virtualip']['vip'])) {
if (count($virtualip_vips)) {
$interfaces = [];
foreach (legacy_config_get_interfaces() as $interfaceKey => $itf) {
if (!empty($itf['if']) && ($itf['type'] ?? '') != 'group') {
$interfaces[$interfaceKey] = $itf['if'];
}
}
foreach ($config['virtualip']['vip'] as $vipent) {
foreach ($virtualip_vips as $vipent) {
if (!empty($vipent['interface']) && !empty($interfaces[$vipent['interface']])) {
$if = $interfaces[$vipent['interface']];
$subnet = $vipent['subnet'];

13
src/opnsense/scripts/interfaces/reconfigure_vlans.php
View file

@ -50,15 +50,14 @@ if (file_exists($vfilename) && filesize($vfilename) > 0) {
flock($handle, LOCK_UN);
}
}
/* merge configured vlans */
if (!empty($config['vlans']['vlan'])) {
foreach ($config['vlans']['vlan'] as $vlan) {
$all_vlans[$vlan['vlanif']] = $vlan;
if (!isset($all_parents[$vlan['if']])) {
$all_parents[$vlan['if']] = 0;
}
$all_parents[$vlan['if']]++;
foreach (config_read_array('vlans', 'vlan', false) as $vlan) {
$all_vlans[$vlan['vlanif']] = $vlan;
if (!isset($all_parents[$vlan['if']])) {
$all_parents[$vlan['if']] = 0;
}
$all_parents[$vlan['if']]++;
}
/* handle existing vlans */