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

interfaces: 'sections' are arcane now, simplify to type tag

Browse Source
This commit is contained in:
Franco Fichtner 2022-08-29 08:32:09 +02:00
parent d095546dcb
commit b9bdf760b8
6 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,6 @@ function core_devices()
$bridge_names[$dev['bridgeif']] = [
'descr' => sprintf('%s (%s)', $dev['bridgeif'], $dev['descr']),
'ifdescr' => sprintf('%s', $dev['descr']),
'section' => 'bridges.bridged',
'name' => $dev['bridgeif'],
];
}
@ -160,7 +159,6 @@ function core_devices()
$gif_names[$dev['gifif']] = [
'descr' => sprintf('%s %s (%s)', $dev['gifif'], $dev['remote-addr'], $dev['descr']),
'ifdescr' => sprintf('%s', $dev['descr']),
'section' => 'gifs.gif',
'name' => $dev['gifif'],
];
}
@ -180,7 +178,6 @@ function core_devices()
$gre_names[$dev['greif']] = [
'descr' => sprintf('%s %s (%s)', $dev['greif'], $dev['remote-addr'], $dev['descr']),
'ifdescr' => sprintf('%s', $dev['descr']),
'section' => 'gres.gre',
'name' => $dev['greif'],
];
}
@ -200,7 +197,6 @@ function core_devices()
$wlan_names[$dev['cloneif']] = [
'descr' => sprintf('%s (%s)', $dev['cloneif'], $dev['descr']),
'ifdescr' => sprintf('%s', $dev['descr']),
'section' => 'wireless.clone',
'name' => $dev['cloneif'],
];
}
@ -211,7 +207,6 @@ function core_devices()
$wlan_names[$conf['if']] = [
'descr' => sprintf('%s (%s)', $conf['if'], gettext('wireless clone')),
'ifdescr' => gettext('wireless clone'),
'section' => 'wireless.clone',
'name' => $conf['if'],
];
@ -224,7 +219,6 @@ function core_devices()
$wlan_names[$realif] = [
'descr' => sprintf('%s (%s)', $realif, gettext('wireless clone')),
'ifdescr' => gettext('wireless clone'),
'section' => 'wireless.clone',
'name' => $realif,
];
}

1
src/etc/inc/plugins.inc.d/ipsec.inc
View File

@ -218,7 +218,6 @@ function ipsec_devices()
$names[$device] = [
'descr' => sprintf('%s (%s)', $device, $details['descr']),
'ifdescr' => sprintf('%s', $details['descr']),
'section' => 'ipsec',
'name' => $device,
];
}

1
src/etc/inc/plugins.inc.d/loopback.inc
View File

@ -59,7 +59,6 @@ function loopback_devices()
'descr' => sprintf('lo%s (%s)', $loopback->deviceId, $loopback->description),
'ifdescr' => sprintf('%s', $loopback->description),
'name' => "lo{$loopback->deviceId}",
'section' => 'loopback',
];
}

1
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -114,7 +114,6 @@ function openvpn_devices()
'descr' => sprintf('ovpn%s%s (OpenVPN %s %s)', $mode[0], $settings['vpnid'], $mode == 'server' ? gettext('Server') : gettext('Client'), $settings['description']),
'ifdescr' => sprintf('%s', $settings['description']),
'name' => "ovpn{$mode[0]}{$settings['vpnid']}",
'section' => 'openvpn',
];
}
}

1
src/etc/inc/plugins.inc.d/vxlan.inc
View File

@ -42,7 +42,6 @@ function vxlan_devices()
$names["vxlan{$vxlan->deviceId}"] = [
'descr' => sprintf('vxlan%s %s (VNI %s)', $vxlan->deviceId, $vxlan->vxlanremote, $vxlan->vxlanid),
'name' => "vxlan{$vxlan->deviceId}",
'section' => 'vxlan',
];
}

9
src/www/interfaces_assign.php
View File

@ -66,7 +66,7 @@ function list_interfaces($devices)
// add physical network interfaces
foreach (get_interface_list() as $key => $intf_item) {
$interfaces[$key] = ['descr' => $key . ' (' . $intf_item['mac'] . ')', 'section' => 'interfaces'];
$interfaces[$key] = ['descr' => $key . ' (' . $intf_item['mac'] . ')', 'section' => 'hardware'];
}
// collect interfaces from defined config sections
@ -109,6 +109,7 @@ function list_interfaces($devices)
foreach ($device['names'] as $key => $values) {
if (!empty($values)) {
$interfaces[$key] = $values;
$interfaces[$key]['section'] = $device['type']; /* XXX rename to 'type' eventually */
}
}
}
@ -172,7 +173,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
case 'ppps.ppp':
$config['interfaces'][$newifname]['ipaddr'] = $interfaces[$_POST['if_add']]['type'];
break;
case 'wireless.clone':
case 'wlan':
$config['interfaces'][$newifname]['wireless'] = [];
interface_sync_wireless_clones($config['interfaces'][$newifname], false);
break;
@ -299,7 +300,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
case 'ppps.ppp':
$config['interfaces'][$ifname]['ipaddr'] = $interfaces[$ifport]['type'];
break;
case 'wireless.clone':
case 'wlan':
if (strpos($config['interfaces'][$ifname]['if'], '_wlan') === false) {
/* change from implied clone to explicit */
$config['interfaces'][$ifname]['if'] .= '_wlan0';
@ -322,7 +323,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
/* set or clear wireless configuration */
if ($interfaces[$ifport]['section'] == 'wireless.clone') {
if ($interfaces[$ifport]['section'] == 'wlan') {
config_read_array('interfaces', $ifname, 'wireless');
} elseif (isset($config['interfaces'][$ifname]['wireless'])) {
unset($config['interfaces'][$ifname]['wireless']);