-- Data init --
-luci.model.uci.load_state("wireless")
-local wireless = luci.model.uci.get_all("wireless")
-luci.model.uci.unload("wireless")
-
+local wlcursor = luci.model.uci.cursor_state()
+local wireless = wlcursor:get_all("wireless")
local wifidata = luci.sys.wifi.getiwconfig()
+local wifidevs = {}
local ifaces = {}
for k, v in pairs(wireless) do
end
end
+wlcursor:foreach("wireless", "wifi-device",
+ function(section)
+ table.insert(wifidevs, section[".name"])
+ end)
+
-- Main Map --
protocol = s:option(DummyValue, "_mode", translate("protocol"))
function protocol.cfgvalue(self, section)
- return "802." .. wireless[self.map:get(section, "device")].mode
+ local mode = wireless[self.map:get(section, "device")].mode
+ return mode and "802." .. mode
end
mode = s:option(DummyValue, "mode", translate("mode"))
t2:option(DummyValue, "Quality", translate("iwscan_link"))
essid = t2:option(DummyValue, "ESSID", "ESSID")
function essid.cfgvalue(self, section)
- return luci.util.pcdata(self.map:get(section, "ESSID"))
+ return self.map:get(section, "ESSID")
end
t2:option(DummyValue, "Address", "BSSID")
t2:option(DummyValue, "Noise level", translate("iwscan_noise"))
+
+if #wifidevs < 1 then
+ return m
+end
+
-- Config Section --
-s = m:section(TypedSection, "wifi-device", translate("devices"))
+s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices"))
en = s:option(Flag, "disabled", translate("enable"))
en.enabled = "0"
end
-mode = s:option(ListValue, "mode", translate("mode"))
-mode:value("", "standard")
-mode:value("11b", "802.11b")
-mode:value("11g", "802.11g")
-mode:value("11a", "802.11a")
-mode:value("11bg", "802.11b+g")
-mode.rmempty = true
+local hwtype = m:get(wifidevs[1], "type")
+
+if hwtype == "atheros" then
+ mode = s:option(ListValue, "mode", translate("mode"))
+ mode:value("", "auto")
+ mode:value("11b", "802.11b")
+ mode:value("11g", "802.11g")
+ mode:value("11a", "802.11a")
+ mode:value("11bg", "802.11b+g")
+ mode.rmempty = true
+end
-s:option(Value, "channel", translate("a_w_channel"))
+ch = s:option(Value, "channel", translate("a_w_channel"))
+for i=1, 14 do
+ ch:value(i, i .. " (2.4 GHz)")
+end
s = m:section(TypedSection, "wifi-iface", translate("m_n_local"))
s.anonymous = true
-s:option(Value, "ssid", translate("a_w_netid")).maxlength = 32
+s:option(Value, "ssid", translate("a_w_netid"))
+
+bssid = s:option(Value, "bssid", translate("wifi_bssid"))
local devs = {}
-luci.model.uci.foreach("wireless", "wifi-device",
+luci.model.uci.cursor():foreach("wireless", "wifi-device",
function (section)
table.insert(devs, section[".name"])
end)
function mode.write(self, section, value)
if value == "sta" then
-- ToDo: Move this away
- if not luci.model.uci.get("network", "wan") then
- luci.model.uci.set("network", "wan", "proto", "none")
- luci.model.uci.set("network", "wan", "ifname", " ")
+ if not m.uci:get("network", "wan") then
+ m.uci:set("network", "wan", "proto", "none")
+ m.uci:set("network", "wan", "ifname", " ")
end
- local oldif = luci.model.uci.get("network", "wan", "ifname")
+ local oldif = m.uci:get("network", "wan", "ifname")
if oldif and oldif ~= " " then
- luci.model.uci.set("network", "wan", "_ifname", oldif)
+ m.uci:set("network", "wan", "_ifname", oldif)
end
- luci.model.uci.set("network", "wan", "ifname", " ")
+ m.uci:set("network", "wan", "ifname", " ")
self.map:set(section, "network", "wan")
else
- if luci.model.uci.get("network", "wan", "_ifname") then
- luci.model.uci.set("network", "wan", "ifname", luci.model.uci.get("network", "wan", "_ifname"))
+ if m.uci:get("network", "wan", "_ifname") then
+ m.uci:set("network", "wan", "ifname", m.uci:get("network", "wan", "_ifname"))
end
self.map:set(section, "network", "lan")
end
encr:value("none", "keine")
encr:value("wep", "WEP")
encr:value("psk", "WPA-PSK")
-encr:value("wpa", "WPA-Radius")
+encr:value("wpa", "WPA-Radius", {mode="ap"})
encr:value("psk2", "WPA2-PSK")
-encr:value("wpa2", "WPA2-Radius")
+encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
key = s:option(Value, "key", translate("key"))
key:depends("encryption", "wep")
key:depends("encryption", "psk")
key:depends("encryption", "wpa")
key:depends("encryption", "psk2")
-key:depends("encryption", "wpa2")
+key:depends("encryption", "wpa2i")
key.rmempty = true
server = s:option(Value, "server", translate("a_w_radiussrv"))
server:depends("encryption", "wpa")
-server:depends("encryption", "wpa2")
+server:depends("encryption", "wpa2i")
server.rmempty = true
port = s:option(Value, "port", translate("a_w_radiusport"))
port:depends("encryption", "wpa")
-port:depends("encryption", "wpa2")
+port:depends("encryption", "wpa2i")
port.rmempty = true
-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")
+if hwtype == "atheros" or hwtype == "broadcom" then
+ 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")
+end
+
+if hwtype == "mac80211" or hwtype == "atheros" then
+ bssid:depends({mode="adhoc"})
+end
+
+if hwtype == "broadcom" then
+ bssid:depends({mode="wds"})
+end
+
-return m
\ No newline at end of file
+return m