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

interfaces: merge assign and names array contents

Browse Source 
We only need one of them eventually.
This commit is contained in:
Franco Fichtner 2022-08-28 13:26:34 +02:00
parent 6a2f428e79
commit 64222bc06f
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/etc/inc/plugins.inc.d/core.inc
View File

@ -183,37 +183,39 @@ function core_devices()
'descr' => sprintf('%s (%s)', $dev['cloneif'], $dev['descr']),
'ifdescr' => sprintf('%s', $dev['descr']),
'section' => 'wireless.clone',
'name' => $dev['cloneif'],
];
}
/* also need to find implied clones that do not have explicit cloneif set */
foreach (legacy_config_get_interfaces() as $id => $conf) {
if (isset($conf['wireless']) && !isset($wlan_assign[$conf['if']])) {
$wlan_assign[$conf['if']] = [
'descr' => sprintf('%s (%s)', $conf['if'], gettext('wireless clone')),
'ifdescr' => gettext('wireless clone'),
'section' => 'wireless.clone',
'name' => $conf['if'],
];
$realif = get_real_interface($id);
if ($realif == $conf['if']) {
continue;
}
/* return both implicit and explicit clone if implicit clone was given */
$wlan_assign[$realif] = [
'descr' => sprintf('%s (%s)', $realif, gettext('wireless clone')),
'ifdescr' => gettext('wireless clone'),
'section' => 'wireless.clone',
'name' => $realif,
];
}
}
$devices[] = [
'names' => array_keys($wlan_assign),
'assign' => $wlan_assign,
'names' => core_device_names('cloneif', ['wireless', 'clone'], function ($names) {
global $config;
/* also need to find implied clones that do not have explicit cloneif set */
foreach (array_keys(get_configured_interface_with_descr()) as $if) {
if (isset($config['interfaces'][$if]['wireless'])) {
$device = get_real_interface($if);
if (!in_array($device, $names)) {
$names[] = $device;
}
}
}
return $names;
}),
'function' => null, /* XXX */
'function' => null, /* XXX needs to handle implied clones as well */
'pattern' => '_wlan',
'volatile' => true,
'type' => 'wlan',