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

dhcrelay: *_interfaces() is reserved and should not be used here

Browse Source
This commit is contained in:
Franco Fichtner 2024-09-17 08:26:00 +02:00
parent 2d0536c259
commit 01e3d9eccc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/etc/inc/plugins.inc.d/dhcrelay.inc
View File

@ -39,7 +39,7 @@ function dhcrelay_configure()
function dhcrelay_run()
{
return [
'dhcrelay_interfaces' => 'dhcrelay_interfaces',
'dhcrelay_interfaces' => 'dhcrelay_bound_interfaces',
];
}
@ -173,7 +173,7 @@ function dhcrelay_configure_do($verbose = false, $id = null)
service_log("done.\n", $verbose);
}
function dhcrelay_instances($family = null)
function dhcrelay_bound_instances($family = null)
{
$mdl = new \OPNsense\DHCRelay\DHCRelay();
$instances = [];
@ -203,19 +203,21 @@ function dhcrelay_instances($family = null)
return $instances;
}
function dhcrelay_interfaces($family = null)
function dhcrelay_bound_interfaces($family = null)
{
return array_keys(dhcrelay_instances($family));
return array_keys(dhcrelay_bound_instances($family));
}
function dhcrelay_configure_map($verbose = false, $interface_map = null, $family = null)
{
$instances = dhcrelay_instances($family);
/* XXX use plugins_argument_map() */
if (empty($interface_map)) {
return;
}
$instances = dhcrelay_bound_instances($family);
foreach (explode(',', $interface_map) as $interface) {
foreach ($instances[$interface] ?? [] as $id) {
dhcrelay_configure_do($verbose, $id);