✨ Sync 2026-07-12 20:20:38

This commit is contained in:
github-actions[bot] committed 2026-07-12 20:20:38 +08:00
1 parent 877893c5e3
commit e1a291c83d
38 files changed
+805 -483

No files matched your search

@@ -4393,8 +4393,8 @@ return view.extend({
const w = (bss.ht_operation.secondary_channel_offset == 'no secondary') ? 20 : 40;
uci.set('wireless', radioDev.getName(), 'htmode', 'HT'+w);
}
else {
uci.remove('wireless', radioDev.getName(), 'htmode');
else if (hwtype != 'mt_dbdc') {
uci.unset('wireless', radioDev.getName(), 'htmode');
}
uci.set('wireless', radioDev.getName(), 'channel', bss.channel);
@@ -4449,6 +4449,14 @@ return view.extend({
}
return network.addNetwork(nameval, { proto: 'dhcp' }).then(function(net) {
if (hwtype == 'mt_dbdc') {
const radioName = radioDev.getName();
const staDevice = (radioName == 'rax') ? 'apclix0' :
(radioName == 'rai') ? 'apclii0' : 'apcli0';
uci.set('network', nameval, 'device', staDevice);
}
firewall.deleteNetwork(net.getName());
const zonePromise = zoneval ?
@@ -4482,6 +4490,13 @@ return view.extend({
if (s != null && s['.type'] != 'interface')
return true;
for (const wifi of uci.sections('wireless', 'wifi-iface')) {
const networks = String(wifi.network || '').trim().split(/\s+/);
if (networks.indexOf(name) != -1)
return true;
}
const net = (s != null) ? network.instantiateNetwork(name) : null;
return (net != null && !net.isEmpty());
}
@@ -4525,7 +4540,7 @@ return view.extend({
if (bss.ssid != null) {
bssid = s2.option(form.Flag, 'bssid', _('Lock to BSSID'), _('Instead of joining any network with a matching SSID, only connect to the BSSID <code>%h</code>.').format(bss.bssid));
bssid.default = '0';
bssid.default = (uci.get('wireless', radioDev.getName(), 'type') == 'mt_dbdc') ? '1' : '0';
}
zone = s2.option(widgets.ZoneSelect, 'zone', _('Create / Assign firewall-zone'), _('Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>custom</em> field to define a new zone and attach the interface to it.'));