mirror of
https://github.com/coolsnowwolf/luci
synced 2025-01-07 07:06:41 +08:00
luci-mod-admin-full: update wireless new API config
This commit is contained in:
coolsnowwolf
parent
dd457f9d1a
commit
f9dfa30704
@ -177,7 +177,7 @@ else
|
||||
|
||||
function ch.cfgvalue(self, section)
|
||||
return {
|
||||
m:get(section, "hwmode") or "",
|
||||
m:get(section, "band") or "",
|
||||
m:get(section, "channel") or "auto",
|
||||
m:get(section, "htmode") or ""
|
||||
}
|
||||
@ -185,14 +185,14 @@ else
|
||||
|
||||
function ch.formvalue(self, section)
|
||||
return {
|
||||
m:formvalue(self:cbid(section) .. ".band") or (hw_modes.g and "11g" or "11a"),
|
||||
m:formvalue(self:cbid(section) .. ".band") or ("2g" or "5g"),
|
||||
m:formvalue(self:cbid(section) .. ".channel") or "auto",
|
||||
m:formvalue(self:cbid(section) .. ".htmode") or ""
|
||||
}
|
||||
end
|
||||
|
||||
function ch.write(self, section, value)
|
||||
m:set(section, "hwmode", value[1])
|
||||
m:set(section, "band", value[1])
|
||||
m:set(section, "channel", value[2])
|
||||
m:set(section, "htmode", value[3])
|
||||
end
|
||||
@ -219,8 +219,10 @@ if hwtype == "mac80211" then
|
||||
|
||||
tp:value("", translate("auto"))
|
||||
for _, p in ipairs(tx_power_list) do
|
||||
if p.display_dbm < 50 then
|
||||
tp:value(p.driver_dbm, "%i dBm (%i mW)"
|
||||
%{ p.display_dbm, p.display_mw })
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -260,6 +262,11 @@ if hwtype == "mac80211" then
|
||||
|
||||
s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
|
||||
s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
|
||||
|
||||
o = s:taboption("advanced", Value, "beacon_int", translate('Beacon Interval'));
|
||||
o.datatype = 'range(15,65535)';
|
||||
o.placeholder = 100;
|
||||
o.rmempty = true;
|
||||
end
|
||||
|
||||
|
||||
@ -383,6 +390,11 @@ if hwtype == "mt_dbdc" then
|
||||
s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
|
||||
s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
|
||||
s:taboption("advanced", Flag, "txburst", translate("TX Bursting"))
|
||||
|
||||
o = s:taboption("advanced", Value, "beacon_int", translate('Beacon Interval'));
|
||||
o.datatype = 'range(15,65535)';
|
||||
o.placeholder = 100;
|
||||
o.rmempty = true;
|
||||
end
|
||||
|
||||
----------------------- Interface -----------------------
|
||||
@ -618,7 +630,20 @@ if hwtype == "mt_dbdc" then
|
||||
s:taboption("advanced", Flag, "doth", "802.11h")
|
||||
|
||||
disassoc_low_ack = s:taboption("general", Flag, "disassoc_low_ack", translate("Disassociate On Low Acknowledgement"),translate("Allow AP mode to disconnect STAs based on low ACK condition"))
|
||||
disassoc_low_ack.default = disassoc_low_ack.enabled
|
||||
disassoc_low_ack.default = disassoc_low_ack.disabled
|
||||
disassoc_low_ack:depends({mode="ap"})
|
||||
|
||||
rssikick= s:taboption("general", Value, "rssikick", translate("Kick low RSSI station threshold"), translate("dBm"));
|
||||
rssikick.optional = true
|
||||
rssikick.placeholder = 75
|
||||
rssikick.datatype = "range(-100,0)"
|
||||
rssikick:depends("disassoc_low_ack", "1")
|
||||
|
||||
rssiassoc= s:taboption("general", Value, "rssiassoc", translate("Station associate threshold"), translate("dBm"));
|
||||
rssiassoc.optional = true
|
||||
rssiassoc.placeholder = 60
|
||||
rssiassoc.datatype = "range(-100,0)"
|
||||
rssiassoc:depends("disassoc_low_ack", "1")
|
||||
end
|
||||
|
||||
------------------- WiFI-Encryption -------------------
|
||||
@ -760,6 +785,8 @@ elseif hwtype == "mt_dbdc" then
|
||||
encr:value("psk", "WPA-PSK")
|
||||
encr:value("psk2", "WPA2-PSK")
|
||||
encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
|
||||
encr:value("sae", "WPA3-SAE")
|
||||
encr:value("sae-mixed", "WPA2-PSK/WPA3-SAE Mixed Mode")
|
||||
end
|
||||
|
||||
auth_server = s:taboption("encryption", Value, "auth_server", translate("Radius-Authentication-Server"))
|
||||
@ -872,19 +899,8 @@ for slot=1,4 do
|
||||
end
|
||||
end
|
||||
|
||||
if hwtype == "mt_dbdc" then
|
||||
wps = s:taboption("encryption", ListValue, "wps", translate("WPS Mode"))
|
||||
wps:value("", translate("disable"))
|
||||
wps:value("pbc", translate("PBC"))
|
||||
wps:value("pin", translate("PIN"))
|
||||
pin = s:taboption("encryption", Value, "pin", translate("WPS PIN"))
|
||||
wps:depends({mode="ap", encryption="psk"})
|
||||
wps:depends({mode="ap", encryption="psk2"})
|
||||
wps:depends({mode="ap", encryption="psk-mixed"})
|
||||
pin:depends({wps="pin"})
|
||||
end
|
||||
|
||||
if hwtype == "mac80211" or hwtype == "prism2" or hwtype == "mt_dbdc" then
|
||||
if hwtype == "mac80211" or hwtype == "prism2" then
|
||||
|
||||
-- Probe 802.11k support
|
||||
ieee80211k = s:taboption("encryption", Flag, "ieee80211k", translate("802.11k"), translate("Enables The 802.11k standard provides information to discover the best available access point"))
|
||||
@ -1039,14 +1055,6 @@ if hwtype == "mac80211" or hwtype == "prism2" or hwtype == "mt_dbdc" then
|
||||
r1_key_holder.datatype = "and(hexstring,rangelength(12,12))"
|
||||
r1_key_holder.rmempty = true
|
||||
|
||||
reassociation_deadline = s:taboption("encryption", Value, "reassociation_deadline",
|
||||
translate("Reassociation Deadline"),
|
||||
translate("time units (TUs / 1.024 ms) [1000-65535]"))
|
||||
reassociation_deadline:depends({ieee80211r="1", ft_psk_generate_local=""})
|
||||
reassociation_deadline.placeholder = "1000"
|
||||
reassociation_deadline.datatype = "range(1000,65535)"
|
||||
reassociation_deadline.rmempty = true
|
||||
|
||||
pmk_r1_push = s:taboption("encryption", Flag, "pmk_r1_push", translate("PMK R1 Push"))
|
||||
pmk_r1_push:depends({ieee80211r="1", ft_psk_generate_local=""})
|
||||
pmk_r1_push.placeholder = "0"
|
||||
@ -1209,8 +1217,42 @@ if hwtype == "mac80211" or hwtype == "prism2" or hwtype == "mt_dbdc" then
|
||||
password.password = true
|
||||
end
|
||||
|
||||
if hwtype == "mt_dbdc" then
|
||||
ieee80211k = s:taboption("encryption", Flag, "ieee80211k", translate("802.11k"), translate("Enables The 802.11k standard provides information to discover the best available access point"))
|
||||
ieee80211k:depends({mode="ap", encryption="wpa"})
|
||||
ieee80211k:depends({mode="ap", encryption="wpa2"})
|
||||
ieee80211k:depends({mode="ap", encryption="psk"})
|
||||
ieee80211k:depends({mode="ap", encryption="psk2"})
|
||||
ieee80211k:depends({mode="ap", encryption="psk-mixed"})
|
||||
ieee80211k:depends({mode="ap", encryption="sae"})
|
||||
ieee80211k:depends({mode="ap", encryption="sae-mixed"})
|
||||
|
||||
ieee80211v = s:taboption("encryption", Flag, "ieee80211v", translate("802.11v"), translate("Enables 802.11v allows client devices to exchange information about the network topology,tating overall improvement of the wireless network."))
|
||||
ieee80211v:depends({mode="ap", encryption="wpa"})
|
||||
ieee80211v:depends({mode="ap", encryption="wpa2"})
|
||||
ieee80211v:depends({mode="ap", encryption="psk"})
|
||||
ieee80211v:depends({mode="ap", encryption="psk2"})
|
||||
ieee80211v:depends({mode="ap", encryption="psk-mixed"})
|
||||
ieee80211v:depends({mode="ap", encryption="sae"})
|
||||
ieee80211v:depends({mode="ap", encryption="sae-mixed"})
|
||||
ieee80211v.rmempty = true
|
||||
|
||||
ieee80211r = s:taboption("encryption", Flag, "ieee80211r",
|
||||
translate("802.11r Fast Transition"),
|
||||
translate("Enables fast roaming among access points that belong " ..
|
||||
"to the same Mobility Domain"))
|
||||
ieee80211r:depends({mode="ap", encryption="wpa"})
|
||||
ieee80211r:depends({mode="ap", encryption="wpa2"})
|
||||
ieee80211r:depends({mode="ap", encryption="psk"})
|
||||
ieee80211r:depends({mode="ap", encryption="psk2"})
|
||||
ieee80211r:depends({mode="ap", encryption="psk-mixed"})
|
||||
ieee80211r:depends({mode="ap", encryption="sae"})
|
||||
ieee80211r:depends({mode="ap", encryption="sae-mixed"})
|
||||
ieee80211r.rmempty = true
|
||||
end
|
||||
|
||||
-- ieee802.11w options
|
||||
if hwtype == "mac80211" or hwtype == "mt_dbdc" then
|
||||
if hwtype == "mac80211" then
|
||||
local has_80211w = (os.execute("hostapd -v11w 2>/dev/null || hostapd -veap 2>/dev/null") == 0)
|
||||
if has_80211w then
|
||||
ieee80211w = s:taboption("encryption", ListValue, "ieee80211w",
|
||||
@ -1269,7 +1311,7 @@ if hwtype == "mac80211" or hwtype == "mt_dbdc" then
|
||||
key_retries:depends({mode="ap-wds", encryption="sae-mixed"})
|
||||
end
|
||||
|
||||
if hwtype == "mac80211" or hwtype == "prism2" or hwtype == "mt_dbdc" then
|
||||
if hwtype == "mac80211" or hwtype == "prism2" then
|
||||
local wpasupplicant = fs.access("/usr/sbin/wpa_supplicant")
|
||||
local hostcli = fs.access("/usr/sbin/hostapd_cli")
|
||||
if hostcli and wpasupplicant then
|
||||
|
||||
@ -6,25 +6,44 @@
|
||||
var htmodes = <%= luci.http.write_json(self.htmodes) %>;
|
||||
|
||||
var channels = {
|
||||
'11g': [
|
||||
'2g': [
|
||||
'auto', 'auto', true
|
||||
],
|
||||
'11a': [
|
||||
'5g': [
|
||||
'auto', 'auto', true
|
||||
]
|
||||
],
|
||||
'6g': [
|
||||
'auto', 'auto', true
|
||||
],
|
||||
'60g': []
|
||||
};
|
||||
|
||||
for (var i = 0; i < freqlist.length; i++)
|
||||
channels[(freqlist[i].mhz > 2484) ? '11a' : '11g'].push(
|
||||
for (var i = 0; i < freqlist.length; i++) {
|
||||
var band;
|
||||
|
||||
if (freqlist[i].mhz >= 2412 && freqlist[i].mhz <= 2484)
|
||||
band = '2g';
|
||||
else if (freqlist[i].mhz >= 5160 && freqlist[i].mhz <= 5885)
|
||||
band = '5g';
|
||||
else if (freqlist[i].mhz >= 5925 && freqlist[i].mhz <= 7125)
|
||||
band = '6g';
|
||||
else if (freqlist[i].mhz >= 58320 && freqlist[i].mhz <= 69120)
|
||||
band = '60g';
|
||||
else
|
||||
continue;
|
||||
|
||||
channels[band].push(
|
||||
freqlist[i].channel,
|
||||
'%d (%d MHz)'.format(freqlist[i].channel, freqlist[i].mhz),
|
||||
!freqlist[i].restricted
|
||||
);
|
||||
}
|
||||
|
||||
var modes = [
|
||||
'', 'Legacy', true,
|
||||
'n', 'N', hwmodes.n,
|
||||
'ac', 'AC', hwmodes.ac
|
||||
'ac', 'AC', hwmodes.ac,
|
||||
'ax', 'AX', hwmodes.ax
|
||||
];
|
||||
|
||||
var htmodes = {
|
||||
@ -40,20 +59,32 @@
|
||||
'VHT40', '40 MHz', htmodes.VHT40,
|
||||
'VHT80', '80 MHz', htmodes.VHT80,
|
||||
'VHT160', '160 MHz', htmodes.VHT160
|
||||
],
|
||||
'ax': [
|
||||
'HE20', '20 MHz', htmodes.HE20,
|
||||
'HE40', '40 MHz', htmodes.HE40,
|
||||
'HE80', '80 MHz', htmodes.HE80,
|
||||
'HE160', '160 MHz', htmodes.HE160
|
||||
]
|
||||
};
|
||||
|
||||
var bands = {
|
||||
'': [
|
||||
'11g', '2.4 GHz', (channels['11g'].length > 3),
|
||||
'11a', '5 GHz', (channels['11a'].length > 3)
|
||||
'2g', '2.4 GHz', (channels['2g'].length > 3),
|
||||
'5g', '5 GHz', (channels['5g'].length > 3),
|
||||
'60g', '60 GHz', (channels['60g'].length > 0)
|
||||
],
|
||||
'n': [
|
||||
'11g', '2.4 GHz', (channels['11g'].length > 3),
|
||||
'11a', '5 GHz', (channels['11a'].length > 3)
|
||||
'2g', '2.4 GHz', (channels['2g'].length > 3),
|
||||
'5g', '5 GHz', (channels['5g'].length > 3)
|
||||
],
|
||||
'ac': [
|
||||
'11a', '5 GHz', true
|
||||
'5g', '5 GHz', true
|
||||
],
|
||||
'ax': [
|
||||
'2g', '2.4 GHz', (channels['2g'].length > 3),
|
||||
'5g', '5 GHz', (channels['5g'].length > 3),
|
||||
'6g', '6 GHz', (channels['6g'].length > 3)
|
||||
]
|
||||
};
|
||||
|
||||
@ -124,7 +155,9 @@
|
||||
|
||||
cbi_set_values(mode, modes);
|
||||
|
||||
if (/VHT20|VHT40|VHT80|VHT160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
if (/HE20|HE40|HE80|HE160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
mode.value = 'ax';
|
||||
else if (/VHT20|VHT40|VHT80|VHT160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
mode.value = 'ac';
|
||||
else if (/HT20|HT40/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
mode.value = 'n';
|
||||
@ -133,10 +166,7 @@
|
||||
|
||||
cbi_toggle_wifi_mode(id);
|
||||
|
||||
if (/a/.test(<%= luci.http.write_json(self.map:get(section, "hwmode")) %>))
|
||||
band.value = '11a';
|
||||
else
|
||||
band.value = '11g';
|
||||
band.value = <%= luci.http.write_json(self.map:get(section, "band")) %>;
|
||||
|
||||
cbi_toggle_wifi_band(id);
|
||||
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
cp -a /etc/newapi/* /
|
||||
|
||||
exit 0
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-newapi
|
||||
PKG_NAME:=luci-oldapi
|
||||
|
||||
LUCI_TYPE:=mod
|
||||
LUCI_BASENAME:=newapi
|
||||
LUCI_BASENAME:=oldapi
|
||||
|
||||
LUCI_TITLE:=LuCI NewAPI
|
||||
LUCI_TITLE:=LuCI Old API
|
||||
LUCI_DEPENDS:=+luci-base
|
||||
|
||||
include ../../luci.mk
|
||||
@ -177,7 +177,7 @@ else
|
||||
|
||||
function ch.cfgvalue(self, section)
|
||||
return {
|
||||
m:get(section, "band") or "",
|
||||
m:get(section, "hwmode") or "",
|
||||
m:get(section, "channel") or "auto",
|
||||
m:get(section, "htmode") or ""
|
||||
}
|
||||
@ -185,14 +185,14 @@ else
|
||||
|
||||
function ch.formvalue(self, section)
|
||||
return {
|
||||
m:formvalue(self:cbid(section) .. ".band") or ("2g" or "5g"),
|
||||
m:formvalue(self:cbid(section) .. ".band") or (hw_modes.g and "11g" or "11a"),
|
||||
m:formvalue(self:cbid(section) .. ".channel") or "auto",
|
||||
m:formvalue(self:cbid(section) .. ".htmode") or ""
|
||||
}
|
||||
end
|
||||
|
||||
function ch.write(self, section, value)
|
||||
m:set(section, "band", value[1])
|
||||
m:set(section, "hwmode", value[1])
|
||||
m:set(section, "channel", value[2])
|
||||
m:set(section, "htmode", value[3])
|
||||
end
|
||||
@ -219,10 +219,8 @@ if hwtype == "mac80211" then
|
||||
|
||||
tp:value("", translate("auto"))
|
||||
for _, p in ipairs(tx_power_list) do
|
||||
if p.display_dbm < 50 then
|
||||
tp:value(p.driver_dbm, "%i dBm (%i mW)"
|
||||
%{ p.display_dbm, p.display_mw })
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -262,11 +260,6 @@ if hwtype == "mac80211" then
|
||||
|
||||
s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
|
||||
s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
|
||||
|
||||
o = s:taboption("advanced", Value, "beacon_int", translate('Beacon Interval'));
|
||||
o.datatype = 'range(15,65535)';
|
||||
o.placeholder = 100;
|
||||
o.rmempty = true;
|
||||
end
|
||||
|
||||
|
||||
@ -390,11 +383,6 @@ if hwtype == "mt_dbdc" then
|
||||
s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
|
||||
s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
|
||||
s:taboption("advanced", Flag, "txburst", translate("TX Bursting"))
|
||||
|
||||
o = s:taboption("advanced", Value, "beacon_int", translate('Beacon Interval'));
|
||||
o.datatype = 'range(15,65535)';
|
||||
o.placeholder = 100;
|
||||
o.rmempty = true;
|
||||
end
|
||||
|
||||
----------------------- Interface -----------------------
|
||||
@ -630,20 +618,7 @@ if hwtype == "mt_dbdc" then
|
||||
s:taboption("advanced", Flag, "doth", "802.11h")
|
||||
|
||||
disassoc_low_ack = s:taboption("general", Flag, "disassoc_low_ack", translate("Disassociate On Low Acknowledgement"),translate("Allow AP mode to disconnect STAs based on low ACK condition"))
|
||||
disassoc_low_ack.default = disassoc_low_ack.disabled
|
||||
disassoc_low_ack:depends({mode="ap"})
|
||||
|
||||
rssikick= s:taboption("general", Value, "rssikick", translate("Kick low RSSI station threshold"), translate("dBm"));
|
||||
rssikick.optional = true
|
||||
rssikick.placeholder = 75
|
||||
rssikick.datatype = "range(-100,0)"
|
||||
rssikick:depends("disassoc_low_ack", "1")
|
||||
|
||||
rssiassoc= s:taboption("general", Value, "rssiassoc", translate("Station associate threshold"), translate("dBm"));
|
||||
rssiassoc.optional = true
|
||||
rssiassoc.placeholder = 60
|
||||
rssiassoc.datatype = "range(-100,0)"
|
||||
rssiassoc:depends("disassoc_low_ack", "1")
|
||||
disassoc_low_ack.default = disassoc_low_ack.enabled
|
||||
end
|
||||
|
||||
------------------- WiFI-Encryption -------------------
|
||||
@ -785,8 +760,6 @@ elseif hwtype == "mt_dbdc" then
|
||||
encr:value("psk", "WPA-PSK")
|
||||
encr:value("psk2", "WPA2-PSK")
|
||||
encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
|
||||
encr:value("sae", "WPA3-SAE")
|
||||
encr:value("sae-mixed", "WPA2-PSK/WPA3-SAE Mixed Mode")
|
||||
end
|
||||
|
||||
auth_server = s:taboption("encryption", Value, "auth_server", translate("Radius-Authentication-Server"))
|
||||
@ -899,8 +872,19 @@ for slot=1,4 do
|
||||
end
|
||||
end
|
||||
|
||||
if hwtype == "mt_dbdc" then
|
||||
wps = s:taboption("encryption", ListValue, "wps", translate("WPS Mode"))
|
||||
wps:value("", translate("disable"))
|
||||
wps:value("pbc", translate("PBC"))
|
||||
wps:value("pin", translate("PIN"))
|
||||
pin = s:taboption("encryption", Value, "pin", translate("WPS PIN"))
|
||||
wps:depends({mode="ap", encryption="psk"})
|
||||
wps:depends({mode="ap", encryption="psk2"})
|
||||
wps:depends({mode="ap", encryption="psk-mixed"})
|
||||
pin:depends({wps="pin"})
|
||||
end
|
||||
|
||||
if hwtype == "mac80211" or hwtype == "prism2" then
|
||||
if hwtype == "mac80211" or hwtype == "prism2" or hwtype == "mt_dbdc" then
|
||||
|
||||
-- Probe 802.11k support
|
||||
ieee80211k = s:taboption("encryption", Flag, "ieee80211k", translate("802.11k"), translate("Enables The 802.11k standard provides information to discover the best available access point"))
|
||||
@ -1055,6 +1039,14 @@ if hwtype == "mac80211" or hwtype == "prism2" then
|
||||
r1_key_holder.datatype = "and(hexstring,rangelength(12,12))"
|
||||
r1_key_holder.rmempty = true
|
||||
|
||||
reassociation_deadline = s:taboption("encryption", Value, "reassociation_deadline",
|
||||
translate("Reassociation Deadline"),
|
||||
translate("time units (TUs / 1.024 ms) [1000-65535]"))
|
||||
reassociation_deadline:depends({ieee80211r="1", ft_psk_generate_local=""})
|
||||
reassociation_deadline.placeholder = "1000"
|
||||
reassociation_deadline.datatype = "range(1000,65535)"
|
||||
reassociation_deadline.rmempty = true
|
||||
|
||||
pmk_r1_push = s:taboption("encryption", Flag, "pmk_r1_push", translate("PMK R1 Push"))
|
||||
pmk_r1_push:depends({ieee80211r="1", ft_psk_generate_local=""})
|
||||
pmk_r1_push.placeholder = "0"
|
||||
@ -1217,42 +1209,8 @@ if hwtype == "mac80211" or hwtype == "prism2" then
|
||||
password.password = true
|
||||
end
|
||||
|
||||
if hwtype == "mt_dbdc" then
|
||||
ieee80211k = s:taboption("encryption", Flag, "ieee80211k", translate("802.11k"), translate("Enables The 802.11k standard provides information to discover the best available access point"))
|
||||
ieee80211k:depends({mode="ap", encryption="wpa"})
|
||||
ieee80211k:depends({mode="ap", encryption="wpa2"})
|
||||
ieee80211k:depends({mode="ap", encryption="psk"})
|
||||
ieee80211k:depends({mode="ap", encryption="psk2"})
|
||||
ieee80211k:depends({mode="ap", encryption="psk-mixed"})
|
||||
ieee80211k:depends({mode="ap", encryption="sae"})
|
||||
ieee80211k:depends({mode="ap", encryption="sae-mixed"})
|
||||
|
||||
ieee80211v = s:taboption("encryption", Flag, "ieee80211v", translate("802.11v"), translate("Enables 802.11v allows client devices to exchange information about the network topology,tating overall improvement of the wireless network."))
|
||||
ieee80211v:depends({mode="ap", encryption="wpa"})
|
||||
ieee80211v:depends({mode="ap", encryption="wpa2"})
|
||||
ieee80211v:depends({mode="ap", encryption="psk"})
|
||||
ieee80211v:depends({mode="ap", encryption="psk2"})
|
||||
ieee80211v:depends({mode="ap", encryption="psk-mixed"})
|
||||
ieee80211v:depends({mode="ap", encryption="sae"})
|
||||
ieee80211v:depends({mode="ap", encryption="sae-mixed"})
|
||||
ieee80211v.rmempty = true
|
||||
|
||||
ieee80211r = s:taboption("encryption", Flag, "ieee80211r",
|
||||
translate("802.11r Fast Transition"),
|
||||
translate("Enables fast roaming among access points that belong " ..
|
||||
"to the same Mobility Domain"))
|
||||
ieee80211r:depends({mode="ap", encryption="wpa"})
|
||||
ieee80211r:depends({mode="ap", encryption="wpa2"})
|
||||
ieee80211r:depends({mode="ap", encryption="psk"})
|
||||
ieee80211r:depends({mode="ap", encryption="psk2"})
|
||||
ieee80211r:depends({mode="ap", encryption="psk-mixed"})
|
||||
ieee80211r:depends({mode="ap", encryption="sae"})
|
||||
ieee80211r:depends({mode="ap", encryption="sae-mixed"})
|
||||
ieee80211r.rmempty = true
|
||||
end
|
||||
|
||||
-- ieee802.11w options
|
||||
if hwtype == "mac80211" then
|
||||
if hwtype == "mac80211" or hwtype == "mt_dbdc" then
|
||||
local has_80211w = (os.execute("hostapd -v11w 2>/dev/null || hostapd -veap 2>/dev/null") == 0)
|
||||
if has_80211w then
|
||||
ieee80211w = s:taboption("encryption", ListValue, "ieee80211w",
|
||||
@ -1311,7 +1269,7 @@ if hwtype == "mac80211" then
|
||||
key_retries:depends({mode="ap-wds", encryption="sae-mixed"})
|
||||
end
|
||||
|
||||
if hwtype == "mac80211" or hwtype == "prism2" then
|
||||
if hwtype == "mac80211" or hwtype == "prism2" or hwtype == "mt_dbdc" then
|
||||
local wpasupplicant = fs.access("/usr/sbin/wpa_supplicant")
|
||||
local hostcli = fs.access("/usr/sbin/hostapd_cli")
|
||||
if hostcli and wpasupplicant then
|
||||
@ -6,44 +6,25 @@
|
||||
var htmodes = <%= luci.http.write_json(self.htmodes) %>;
|
||||
|
||||
var channels = {
|
||||
'2g': [
|
||||
'11g': [
|
||||
'auto', 'auto', true
|
||||
],
|
||||
'5g': [
|
||||
'11a': [
|
||||
'auto', 'auto', true
|
||||
],
|
||||
'6g': [
|
||||
'auto', 'auto', true
|
||||
],
|
||||
'60g': []
|
||||
]
|
||||
};
|
||||
|
||||
for (var i = 0; i < freqlist.length; i++) {
|
||||
var band;
|
||||
|
||||
if (freqlist[i].mhz >= 2412 && freqlist[i].mhz <= 2484)
|
||||
band = '2g';
|
||||
else if (freqlist[i].mhz >= 5160 && freqlist[i].mhz <= 5885)
|
||||
band = '5g';
|
||||
else if (freqlist[i].mhz >= 5925 && freqlist[i].mhz <= 7125)
|
||||
band = '6g';
|
||||
else if (freqlist[i].mhz >= 58320 && freqlist[i].mhz <= 69120)
|
||||
band = '60g';
|
||||
else
|
||||
continue;
|
||||
|
||||
channels[band].push(
|
||||
for (var i = 0; i < freqlist.length; i++)
|
||||
channels[(freqlist[i].mhz > 2484) ? '11a' : '11g'].push(
|
||||
freqlist[i].channel,
|
||||
'%d (%d MHz)'.format(freqlist[i].channel, freqlist[i].mhz),
|
||||
!freqlist[i].restricted
|
||||
);
|
||||
}
|
||||
|
||||
var modes = [
|
||||
'', 'Legacy', true,
|
||||
'n', 'N', hwmodes.n,
|
||||
'ac', 'AC', hwmodes.ac,
|
||||
'ax', 'AX', hwmodes.ax
|
||||
'ac', 'AC', hwmodes.ac
|
||||
];
|
||||
|
||||
var htmodes = {
|
||||
@ -59,32 +40,20 @@
|
||||
'VHT40', '40 MHz', htmodes.VHT40,
|
||||
'VHT80', '80 MHz', htmodes.VHT80,
|
||||
'VHT160', '160 MHz', htmodes.VHT160
|
||||
],
|
||||
'ax': [
|
||||
'HE20', '20 MHz', htmodes.HE20,
|
||||
'HE40', '40 MHz', htmodes.HE40,
|
||||
'HE80', '80 MHz', htmodes.HE80,
|
||||
'HE160', '160 MHz', htmodes.HE160
|
||||
]
|
||||
};
|
||||
|
||||
var bands = {
|
||||
'': [
|
||||
'2g', '2.4 GHz', (channels['2g'].length > 3),
|
||||
'5g', '5 GHz', (channels['5g'].length > 3),
|
||||
'60g', '60 GHz', (channels['60g'].length > 0)
|
||||
'11g', '2.4 GHz', (channels['11g'].length > 3),
|
||||
'11a', '5 GHz', (channels['11a'].length > 3)
|
||||
],
|
||||
'n': [
|
||||
'2g', '2.4 GHz', (channels['2g'].length > 3),
|
||||
'5g', '5 GHz', (channels['5g'].length > 3)
|
||||
'11g', '2.4 GHz', (channels['11g'].length > 3),
|
||||
'11a', '5 GHz', (channels['11a'].length > 3)
|
||||
],
|
||||
'ac': [
|
||||
'5g', '5 GHz', true
|
||||
],
|
||||
'ax': [
|
||||
'2g', '2.4 GHz', (channels['2g'].length > 3),
|
||||
'5g', '5 GHz', (channels['5g'].length > 3),
|
||||
'6g', '6 GHz', (channels['6g'].length > 3)
|
||||
'11a', '5 GHz', true
|
||||
]
|
||||
};
|
||||
|
||||
@ -155,9 +124,7 @@
|
||||
|
||||
cbi_set_values(mode, modes);
|
||||
|
||||
if (/HE20|HE40|HE80|HE160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
mode.value = 'ax';
|
||||
else if (/VHT20|VHT40|VHT80|VHT160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
if (/VHT20|VHT40|VHT80|VHT160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
mode.value = 'ac';
|
||||
else if (/HT20|HT40/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
|
||||
mode.value = 'n';
|
||||
@ -166,7 +133,10 @@
|
||||
|
||||
cbi_toggle_wifi_mode(id);
|
||||
|
||||
band.value = <%= luci.http.write_json(self.map:get(section, "band")) %>;
|
||||
if (/a/.test(<%= luci.http.write_json(self.map:get(section, "hwmode")) %>))
|
||||
band.value = '11a';
|
||||
else
|
||||
band.value = '11g';
|
||||
|
||||
cbi_toggle_wifi_band(id);
|
||||
|
||||
5
modules/luci-oldapi/root/etc/uci-defaults/099-oldapi-copy
Executable file
5
modules/luci-oldapi/root/etc/uci-defaults/099-oldapi-copy
Executable file
@ -0,0 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
cp -a /etc/oldapi/* /
|
||||
|
||||
exit 0
|
||||
Loading…
Reference in New Issue
Block a user