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

interface: only parse actual options, not nd6 options #5985

Browse Source
This commit is contained in:
Franco Fichtner 2022-08-23 10:16:06 +02:00
parent a785c129a2
commit dd4edff0fd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/etc/inc/interfaces.lib.inc
View File

@ -269,7 +269,7 @@ function legacy_interfaces_details($intf = null)
foreach (explode(',', $capabilities) as $capability) {
$result[$current_interface]["capabilities"][] = strtolower(trim($capability));
}
} elseif (strpos(trim($line), 'options=') !== false) {
} elseif (strpos(trim($line), 'options=') === 0) {
// parse options
$options = substr($line, strpos($line, '<') + 1, -1);
foreach (explode(',', $options) as $option) {
@ -506,13 +506,11 @@ function configure_interface_hardware($ifs, $intf_details = null)
if (!isset($hwsettings['disablevlanhwfilter']) || $hwsettings['disablevlanhwfilter'] == 1) {
// probe already selected options
$selected_opts = [];
if (!empty($intf_details['options'])) {
foreach ($intf_details['options'] as $opt) {
if ($opt == 'vlan_hwtagging') {
$selected_opts[] = 'vlanhwtag';
} else {
$selected_opts[] = str_replace('_', '', $opt);
}
foreach ($intf_details['options'] as $opt) {
if ($opt == 'vlan_hwtagging') {
$selected_opts[] = 'vlanhwtag';
} else {
$selected_opts[] = str_replace('_', '', $opt);
}
}
// set one tag at a time to avoid driver issues