-- Data init --
+local uci = luci.model.uci.cursor()
+if not uci:get("network", "wan") then
+ uci:section("network", "interface", "wan", {proto="none", ifname=" "})
+ uci:save("network")
+ uci:commit("network")
+end
+
local wlcursor = luci.model.uci.cursor_state()
local wireless = wlcursor:get_all("wireless")
local wifidata = luci.sys.wifi.getiwconfig()
bssid = s:option(DummyValue, "_bsiid", "BSSID")
function bssid.cfgvalue(self, section)
local ifname = self.map:get(section, "ifname")
- return (wifidata[ifname] and (wifidata[ifname].Cell
+ return (wifidata[ifname] and (wifidata[ifname].Cell
or wifidata[ifname]["Access Point"])) or "-"
end
t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1"))
function scan.write(self, section)
+ m.autoapply = false
t2.render = t2._render
local ifname = self.map:get(section, "ifname")
luci.util.update(t2.data, luci.sys.wifi.iwscan(ifname))
return self.map:get(section, "Channel")
or self.map:get(section, "Frequency")
or "-"
-end
+end
t2:option(DummyValue, "Encryption key", translate("iwscan_encr"))
-- Config Section --
s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices"))
+s.addremove = false
en = s:option(Flag, "disabled", translate("enable"))
+en.rmempty = false
en.enabled = "0"
en.disabled = "1"
local hwtype = m:get(wifidevs[1], "type")
if hwtype == "atheros" then
- mode = s:option(ListValue, "mode", translate("mode"))
+ mode = s:option(ListValue, "hwmode", translate("mode"))
mode.override_values = true
mode:value("", "auto")
mode:value("11b", "802.11b")
function (section)
table.insert(devs, section[".name"])
end)
-
+
if #devs > 1 then
device = s:option(DummyValue, "device", translate("device"))
else
function mode.write(self, section, value)
if value == "sta" then
- -- ToDo: Move this away
- if not m.uci:get("network", "wan") then
- m.uci:set("network", "wan", "proto", "none")
- m.uci:set("network", "wan", "ifname", " ")
- end
-
local oldif = m.uci:get("network", "wan", "ifname")
if oldif and oldif ~= " " then
m.uci:set("network", "wan", "_ifname", oldif)
if hostapd and supplicant then
encr:value("psk", "WPA-PSK")
encr:value("psk2", "WPA2-PSK")
+ encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
encr:value("wpa", "WPA-Radius", {mode="ap"})
encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
elseif hostapd and not supplicant then
encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})
+ encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
encr:value("wpa", "WPA-Radius", {mode="ap"})
encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
encr.description = translate("wifi_wpareq")
elseif not hostapd and supplicant then
encr:value("psk", "WPA-PSK", {mode="sta"})
encr:value("psk2", "WPA2-PSK", {mode="sta"})
+ encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
encr.description = translate("wifi_wpareq")
else
encr.description = translate("wifi_wpareq")
elseif hwtype == "broadcom" then
encr:value("psk", "WPA-PSK")
encr:value("psk2", "WPA2-PSK")
+ encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
end
key = s:option(Value, "key", translate("key"))
iso = s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1"))
iso.rmempty = true
iso:depends("mode", "ap")
-
+
hide = s:option(Flag, "hidden", translate("a_w_hideessid"))
hide.rmempty = true
hide:depends("mode", "ap")