X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=fdeea99e9a39e9e33c79c781a1f59d14cea73fa3;hp=f436689a6deb52b358ff4308ce564ed9fc3f9311;hb=5d426cf4acd3c2fb70cd9939d3171d560e588c61;hpb=55ed5c897855d6597bbbd8e8ff4a3a4de285b73f
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index f436689a6..fdeea99e9 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -11,20 +11,68 @@ You may obtain a copy of the License at
$Id$
]]--
-require("luci.tools.webadmin")
+
+local wa = require "luci.tools.webadmin"
+local nw = require "luci.model.network"
+local fs = require "nixio.fs"
+
arg[1] = arg[1] or ""
-m = Map("wireless", translate("networks"), translate("a_w_networks1"))
+m = Map("wireless", "",
+ translate("The Device Configuration section covers physical settings of the radio " ..
+ "hardware such as channel, transmit power or antenna selection which is shared among all " ..
+ "defined wireless networks (if the radio hardware is multi-SSID capable). Per network settings " ..
+ "like encryption or operation mode are grouped in the Interface Configuration."))
+
+m:chain("network")
+
+local ifsection
+
+function m.on_commit(map)
+ local wnet = nw:get_wifinet(arg[1])
+ if ifsection and wnet then
+ ifsection.section = wnet.sid
+ m.title = luci.util.pcdata(wnet:get_i18n())
+ end
+end
+
+nw.init(m.uci)
+
+local wnet = nw:get_wifinet(arg[1])
+local wdev = wnet and wnet:get_device()
+
+-- redirect to overview page if network does not exist anymore (e.g. after a revert)
+if not wnet or not wdev then
+ luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+ return
+end
+
+m.title = luci.util.pcdata(wnet:get_i18n())
+
+
+local iw = luci.sys.wifi.getiwinfo(arg[1])
+local tx_powers = iw.txpwrlist or { }
+local hw_modes = iw.hwmodelist or { }
+
-s = m:section(NamedSection, arg[1], "wifi-device", translate("device") .. " " .. arg[1])
+s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration"))
s.addremove = false
-back = s:option(DummyValue, "_overview", translate("overview"))
+s:tab("general", translate("General Setup"))
+s:tab("macfilter", translate("MAC-Filter"))
+s:tab("advanced", translate("Advanced Settings"))
+
+--[[
+back = s:option(DummyValue, "_overview", translate("Overview"))
back.value = ""
back.titleref = luci.dispatcher.build_url("admin", "network", "wireless")
+]]
+st = s:taboption("general", DummyValue, "__status", translate("Status"))
+st.template = "admin_network/wifi_status"
+st.ifname = arg[1]
-en = s:option(Flag, "disabled", translate("enable"))
+en = s:taboption("general", Flag, "disabled", translate("Enable device"))
en.enabled = "0"
en.disabled = "1"
en.rmempty = false
@@ -33,62 +81,129 @@ function en.cfgvalue(self, section)
return Flag.cfgvalue(self, section) or "0"
end
-s:option(DummyValue, "type", translate("type"))
-local hwtype = m:get(arg[1], "type")
+
+local hwtype = wdev:get("type")
+local htcaps = wdev:get("ht_capab") and true or false
+
-- NanoFoo
-local nsantenna = m:get(arg[1], "antenna")
+local nsantenna = wdev:get("antenna")
-ch = s:option(Value, "channel", translate("a_w_channel"))
-for i=1, 14 do
- ch:value(i, i .. " (2.4 GHz)")
-end
-for i=36, 64, 4 do
- ch:value(i, i .. " (5 GHz)")
-end
-for i=100, 140, 4 do
- ch:value(i, i .. " (5 GHz)")
+ch = s:taboption("general", Value, "channel", translate("Channel"))
+ch:value("auto", translate("auto"))
+for _, f in ipairs(iw and iw.freqlist or luci.sys.wifi.channels()) do
+ if not f.restricted then
+ ch:value(f.channel, "%i (%.3f GHz)" %{ f.channel, f.mhz / 1000 })
+ end
end
-ch:value(147, 147 .. " (5 GHz)")
-ch:value(151, 151 .. " (5 GHz)")
-ch:value(155, 155 .. " (5 GHz)")
-ch:value(167, 167 .. " (5 GHz)")
+
------------------- MAC80211 Device ------------------
if hwtype == "mac80211" then
+ tp = s:taboption("general",
+ (tx_powers and #tx_powers > 0) and ListValue or Value,
+ "txpower", translate("Transmit Power"), "dBm")
+
+ tp.rmempty = true
+ tp.default = tostring(iw and iw.txpower or tx_powers[#tx_powers])
+ for _, p in ipairs(tx_powers or {}) do
+ tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
+ end
+
+ mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
+ mode:value("", translate("auto"))
+ if hw_modes.b then mode:value("11b", "802.11b") end
+ if hw_modes.g then mode:value("11g", "802.11g") end
+ if hw_modes.a then mode:value("11a", "802.11a") end
+
+ if htcaps then
+ if hw_modes.g and hw_modes.n then mode:value("11ng", "802.11g+n") end
+ if hw_modes.a and hw_modes.n then mode:value("11na", "802.11a+n") end
+
+ htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode"))
+ htmode:depends("hwmode", "11na")
+ htmode:depends("hwmode", "11ng")
+ htmode:value("HT20", "20MHz")
+ htmode:value("HT40-", translate("40MHz 2nd channel below"))
+ htmode:value("HT40+", translate("40MHz 2nd channel above"))
+
+ --htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities"))
+ --htcapab:depends("hwmode", "11na")
+ --htcapab:depends("hwmode", "11ng")
+ end
+
+ local cl = iw and iw.countrylist
+ if cl and #cl > 0 then
+ cc = s:taboption("advanced", ListValue, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes."))
+ cc.default = tostring(iw and iw.country or "00")
+ for _, c in ipairs(cl) do
+ cc:value(c.alpha2, "%s - %s" %{ c.alpha2, c.name })
+ end
+ else
+ s:taboption("advanced", Value, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes."))
+ end
+ s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
+ translate("Distance to farthest network member in meters."))
end
------------------- Madwifi Device ------------------
if hwtype == "atheros" then
- mode = s:option(ListValue, "hwmode", translate("mode"))
- mode:value("", translate("wifi_auto"))
- mode:value("11b", "802.11b")
- mode:value("11g", "802.11g")
- mode:value("11a", "802.11a")
- mode:value("11bg", "802.11b+g")
- mode:value("11gdt", "802.11adt")
- mode:value("11adt", "802.11adt")
- mode:value("fh", translate("wifi_fh"))
+ tp = s:taboption("general",
+ (#tx_powers > 0) and ListValue or Value,
+ "txpower", translate("Transmit Power"), "dBm")
+
+ tp.rmempty = true
+ for _, p in ipairs(iw.txpwrlist) do
+ tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
+ end
+
+ mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
+ mode:value("", translate("auto"))
+ if hw_modes.b then mode:value("11b", "802.11b") end
+ if hw_modes.g then mode:value("11g", "802.11g") end
+ if hw_modes.a then mode:value("11a", "802.11a") end
+ if hw_modes.g then mode:value("11bg", "802.11b+g") end
+ if hw_modes.g then mode:value("11gst", "802.11g + Turbo") end
+ if hw_modes.a then mode:value("11ast", "802.11a + Turbo") end
+ mode:value("fh", translate("Frequency Hopping"))
- s:option(Flag, "diversity", translate("wifi_diversity")).rmempty = false
+ s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
if not nsantenna then
- s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
- s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
+ ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
+ ant1.widget = "radio"
+ ant1.orientation = "horizontal"
+ ant1:depends("diversity", "")
+ ant1:value("0", translate("auto"))
+ ant1:value("1", translate("Antenna 1"))
+ ant1:value("2", translate("Antenna 2"))
+
+ ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
+ ant2.widget = "radio"
+ ant2.orientation = "horizontal"
+ ant2:depends("diversity", "")
+ ant2:value("0", translate("auto"))
+ ant2:value("1", translate("Antenna 1"))
+ ant2:value("2", translate("Antenna 2"))
+
else -- NanoFoo
- local ant = s:option(ListValue, "antenna", translate("wifi_txantenna"))
+ local ant = s:taboption("advanced", ListValue, "antenna", translate("Transmitter Antenna"))
ant:value("auto")
ant:value("vertical")
ant:value("horizontal")
ant:value("external")
end
- s:option(Value, "distance", translate("wifi_distance"),
- translate("wifi_distance_desc")).optional = true
- --s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")).optional = true
+ s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
+ translate("Distance to farthest network member in meters."))
+ s:taboption("advanced", Value, "regdomain", translate("Regulatory Domain"))
+ s:taboption("advanced", Value, "country", translate("Country Code"))
+ s:taboption("advanced", Flag, "outdoor", translate("Outdoor Channels"))
+
+ --s:option(Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
end
@@ -96,79 +211,165 @@ end
------------------- Broadcom Device ------------------
if hwtype == "broadcom" then
- mp = s:option(ListValue, "macfilter", translate("wifi_macpolicy"))
- mp.optional = true
- mp:value("")
- mp:value("allow", translate("wifi_whitelist"))
- mp:value("deny", translate("wifi_blacklist"))
- ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
+ tp = s:taboption("general",
+ (#tx_powers > 0) and ListValue or Value,
+ "txpower", translate("Transmit Power"), "dBm")
+
+ tp.rmempty = true
+ for _, p in ipairs(iw.txpwrlist) do
+ tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
+ end
+
+ mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
+ mode:value("11bg", "802.11b+g")
+ mode:value("11b", "802.11b")
+ mode:value("11g", "802.11g")
+ mode:value("11gst", "802.11g + Turbo")
+
+ mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter"))
+ mp:value("", translate("disable"))
+ mp:value("allow", translate("Allow listed only"))
+ mp:value("deny", translate("Allow all except listed"))
+ ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
ml:depends({macfilter="allow"})
ml:depends({macfilter="deny"})
- s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
- s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
+ ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
+ ant1.widget = "radio"
+ ant1:depends("diversity", "")
+ ant1:value("3", translate("auto"))
+ ant1:value("0", translate("Antenna 1"))
+ ant1:value("1", translate("Antenna 2"))
- s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true
+ ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
+ ant2.widget = "radio"
+ ant2:depends("diversity", "")
+ ant2:value("3", translate("auto"))
+ ant2:value("0", translate("Antenna 1"))
+ ant2:value("1", translate("Antenna 2"))
- s:option(Value, "distance", translate("wifi_distance")).optional = true
- --s:option(Value, "slottime", translate("wifi_slottime")).optional = true
+ s:taboption("advanced", Flag, "frameburst", translate("Frame Bursting"))
- s:option(Value, "country", translate("wifi_country")).optional = true
- s:option(Value, "maxassoc", translate("wifi_maxassoc")).optional = true
+ s:taboption("advanced", Value, "distance", translate("Distance Optimization"))
+ --s:option(Value, "slottime", translate("Slot time"))
+
+ s:taboption("advanced", Value, "country", translate("Country Code"))
+ s:taboption("advanced", Value, "maxassoc", translate("Connection Limit"))
+end
+
+
+--------------------- HostAP Device ---------------------
+
+if hwtype == "prism2" then
+ s:taboption("advanced", Value, "txpower", translate("Transmit Power"), "att units").rmempty = true
+
+ s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
+
+ s:taboption("advanced", Value, "txantenna", translate("Transmitter Antenna"))
+ s:taboption("advanced", Value, "rxantenna", translate("Receiver Antenna"))
end
----------------------- Interface -----------------------
-s = m:section(TypedSection, "wifi-iface", translate("interfaces"))
-s.addremove = true
+s = m:section(NamedSection, wnet.sid, "wifi-iface", translate("Interface Configuration"))
+ifsection = s
+s.addremove = false
s.anonymous = true
-s:depends("device", arg[1])
-s.defaults.device = arg[1]
+s.defaults.device = wdev:name()
+
+s:tab("general", translate("General Setup"))
+s:tab("encryption", translate("Wireless Security"))
+s:tab("macfilter", translate("MAC-Filter"))
+s:tab("advanced", translate("Advanced Settings"))
-s:option(Value, "ssid", translate("wifi_essid"))
+s:taboption("general", Value, "ssid", translate("ESSID"))
+
+mode = s:taboption("general", ListValue, "mode", translate("Mode"))
+mode.override_values = true
+mode:value("ap", translate("Access Point"))
+mode:value("sta", translate("Client"))
+mode:value("adhoc", translate("Ad-Hoc"))
+
+bssid = s:taboption("general", Value, "bssid", translate("BSSID"))
+
+network = s:taboption("general", Value, "network", translate("Network"),
+ translate("Choose the network you want to attach to this wireless interface. " ..
+ "Select unspecified to not attach any network or fill out the " ..
+ "create field to define a new network."))
-network = s:option(Value, "network", translate("network"), translate("a_w_network1"))
network.rmempty = true
-network:value("")
-network.combobox_manual = translate("a_w_netmanual")
-luci.tools.webadmin.cbi_add_networks(network)
+network.template = "cbi/network_netlist"
+network.widget = "radio"
function network.write(self, section, value)
- if not m.uci:get("network", value) then
- -- avoid "value not defined in enum" because network is not known yet
- s.override_scheme = true
-
- m:chain("network")
- m.uci:set("network", value, "interface")
- Value.write(self, section, value)
- else
- if m.uci:get("network", value) == "interface" then
- Value.write(self, section, value)
+ local i = nw:get_interface(section)
+ if i then
+ if value == '-' then
+ value = m:formvalue(self:cbid(section) .. ".newnet")
+ if value and #value > 0 then
+ local n = nw:add_network(value, {proto="none"})
+ if n then n:add_interface(i) end
+ else
+ local n = i:get_network()
+ if n then n:del_interface(i) end
+ end
+ else
+ local n = nw:get_network(value)
+ if n then
+ n:type("bridge")
+ n:add_interface(i)
+ end
end
end
end
+-------------------- MAC80211 Interface ----------------------
-mode = s:option(ListValue, "mode", translate("mode"))
-mode.override_values = true
-mode:value("ap", translate("a_w_ap"))
-mode:value("adhoc", translate("a_w_adhoc"))
-mode:value("sta", translate("a_w_client"))
+if hwtype == "mac80211" then
+ if fs.access("/usr/sbin/iw") then
+ mode:value("mesh", "802.11s")
+ end
-bssid = s:option(Value, "bssid", translate("wifi_bssid"))
+ mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
+ mode:value("monitor", translate("Monitor"))
+ bssid:depends({mode="adhoc"})
+ s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+ s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+
+ mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
+ mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
+
+ function mode.write(self, section, value)
+ if value == "ap-wds" then
+ ListValue.write(self, section, "ap")
+ m.uci:set("wireless", section, "wds", 1)
+ elseif value == "sta-wds" then
+ ListValue.write(self, section, "sta")
+ m.uci:set("wireless", section, "wds", 1)
+ else
+ ListValue.write(self, section, value)
+ m.uci:delete("wireless", section, "wds")
+ end
+ end
--------------------- MAC80211 Interface ----------------------
+ function mode.cfgvalue(self, section)
+ local mode = ListValue.cfgvalue(self, section)
+ local wds = m.uci:get("wireless", section, "wds") == "1"
-if hwtype == "mac80211" then
- mode:value("ahdemo", translate("a_w_ahdemo"))
- mode:value("monitor", translate("a_w_monitor"))
- bssid:depends({mode="adhoc"})
+ if mode == "ap" and wds then
+ return "ap-wds"
+ elseif mode == "sta" and wds then
+ return "sta-wds"
+ else
+ return mode
+ end
+ end
- s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
- s:option(Value, "frag", translate("wifi_frag")).optional = true
- s:option(Value, "rts", translate("wifi_rts")).optional = true
+ hidden = s:taboption("general", Flag, "hidden", translate("Hide ESSID"))
+ hidden:depends({mode="ap"})
+ hidden:depends({mode="ap-wds"})
end
@@ -176,68 +377,88 @@ end
-------------------- Madwifi Interface ----------------------
if hwtype == "atheros" then
- mode:value("ahdemo", translate("a_w_ahdemo"))
- mode:value("monitor", translate("a_w_monitor"))
+ mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
+ mode:value("monitor", translate("Monitor"))
+ mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
+ mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
+ mode:value("wds", translate("Static WDS"))
+
+ function mode.write(self, section, value)
+ if value == "ap-wds" then
+ ListValue.write(self, section, "ap")
+ m.uci:set("wireless", section, "wds", 1)
+ elseif value == "sta-wds" then
+ ListValue.write(self, section, "sta")
+ m.uci:set("wireless", section, "wds", 1)
+ else
+ ListValue.write(self, section, value)
+ m.uci:delete("wireless", section, "wds")
+ end
+ end
+
+ function mode.cfgvalue(self, section)
+ local mode = ListValue.cfgvalue(self, section)
+ local wds = m.uci:get("wireless", section, "wds") == "1"
+
+ if mode == "ap" and wds then
+ return "ap-wds"
+ elseif mode == "sta" and wds then
+ return "sta-wds"
+ else
+ return mode
+ end
+ end
bssid:depends({mode="adhoc"})
bssid:depends({mode="ahdemo"})
+ bssid:depends({mode="wds"})
+
+ wdssep = s:taboption("advanced", Flag, "wdssep", translate("Separate WDS"))
+ wdssep:depends({mode="ap-wds"})
- wds = s:option(Flag, "wds", translate("a_w_wds"))
- wds:depends({mode="ap"})
- wds:depends({mode="sta"})
- wds.rmempty = true
- wdssep = s:option(Flag, "wdssep", translate("wifi_wdssep"))
- wdssep:depends({mode="ap", wds="1"})
- wdssep.optional = true
-
- s:option(Flag, "doth", "802.11h").optional = true
- s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
- hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
+ s:taboption("advanced", Flag, "doth", "802.11h")
+ hidden = s:taboption("general", Flag, "hidden", translate("Hide ESSID"))
hidden:depends({mode="ap"})
hidden:depends({mode="adhoc"})
- hidden:depends({mode="wds"})
- hidden.optional = true
- isolate = s:option(Flag, "isolate", translate("wifi_isolate"),
- translate("wifi_isolate_desc"))
+ hidden:depends({mode="ap-wds"})
+ hidden:depends({mode="sta-wds"})
+ isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
+ translate("Prevents client-to-client communication"))
isolate:depends({mode="ap"})
- isolate.optional = true
- s:option(Flag, "bgscan", translate("wifi_bgscan")).optional = true
-
- mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy"))
- mp.optional = true
- mp:value("")
- mp:value("deny", translate("wifi_whitelist"))
- mp:value("allow", translate("wifi_blacklist"))
- ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
+ s:taboption("advanced", Flag, "bgscan", translate("Background Scan"))
+
+ mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
+ mp:value("", translate("disable"))
+ mp:value("deny", translate("Allow listed only"))
+ mp:value("allow", translate("Allow all except listed"))
+ ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
ml:depends({macpolicy="allow"})
ml:depends({macpolicy="deny"})
- s:option(Value, "rate", translate("wifi_rate")).optional = true
- s:option(Value, "mcast_rate", translate("wifi_mcast_rate")).optional = true
- s:option(Value, "frag", translate("wifi_frag")).optional = true
- s:option(Value, "rts", translate("wifi_rts")).optional = true
- s:option(Value, "minrate", translate("wifi_minrate")).optional = true
- s:option(Value, "maxrate", translate("wifi_maxrate")).optional = true
- s:option(Flag, "compression", translate("wifi_compression")).optional = true
+ s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
+ s:taboption("advanced", Value, "mcast_rate", translate("Multicast Rate"))
+ s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+ s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+ s:taboption("advanced", Value, "minrate", translate("Minimum Rate"))
+ s:taboption("advanced", Value, "maxrate", translate("Maximum Rate"))
+ s:taboption("advanced", Flag, "compression", translate("Compression"))
- s:option(Flag, "bursting", translate("wifi_bursting")).optional = true
- s:option(Flag, "turbo", translate("wifi_turbo")).optional = true
- s:option(Value, "ff", translate("wifi_ff")).optional = true
+ s:taboption("advanced", Flag, "bursting", translate("Frame Bursting"))
+ s:taboption("advanced", Flag, "turbo", translate("Turbo Mode"))
+ s:taboption("advanced", Flag, "ff", translate("Fast Frames"))
- s:option(Flag, "wmm", translate("wifi_wmm")).optional = true
- s:option(Flag, "xr", translate("wifi_xr")).optional = true
- s:option(Flag, "ar", translate("wifi_ar")).optional = true
+ s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
+ s:taboption("advanced", Flag, "xr", translate("XR Support"))
+ s:taboption("advanced", Flag, "ar", translate("AR Support"))
- local swm = s:option(Flag, "sw_merge", translate("wifi_nosbeacon"))
+ local swm = s:taboption("advanced", Flag, "sw_merge", translate("Disable HW-Beacon timer"))
swm:depends({mode="adhoc"})
- swm.optional = true
- local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon"))
+ local nos = s:taboption("advanced", Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
nos:depends({mode="sta"})
- nos.optional = true
+ nos:depends({mode="sta-wds"})
- local probereq = s:option(Flag, "probereq", translate("wifi_noprobereq"))
- probereq.optional = true
+ local probereq = s:taboption("advanced", Flag, "probereq", translate("Do not send probe responses"))
probereq.enabled = "0"
probereq.disabled = "1"
end
@@ -246,128 +467,247 @@ end
-------------------- Broadcom Interface ----------------------
if hwtype == "broadcom" then
- mode:value("wds", translate("a_w_wds"))
- mode:value("monitor", translate("a_w_monitor"))
+ mode:value("wds", translate("WDS"))
+ mode:value("monitor", translate("Monitor"))
- s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
-
- hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
+ hidden = s:taboption("general", Flag, "hidden", translate("Hide ESSID"))
hidden:depends({mode="ap"})
hidden:depends({mode="adhoc"})
hidden:depends({mode="wds"})
- hidden.optional = true
- isolate = s:option(Flag, "isolate", translate("wifi_isolate"),
- translate("wifi_isolate_desc"))
+ isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
+ translate("Prevents client-to-client communication"))
isolate:depends({mode="ap"})
- isolate.optional = true
+
+ s:taboption("advanced", Flag, "doth", "802.11h")
+ s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
bssid:depends({mode="wds"})
+ bssid:depends({mode="adhoc"})
end
+----------------------- HostAP Interface ---------------------
+
+if hwtype == "prism2" then
+ mode:value("wds", translate("WDS"))
+ mode:value("monitor", translate("Monitor"))
+
+ hidden = s:taboption("general", Flag, "hidden", translate("Hide ESSID"))
+ hidden:depends({mode="ap"})
+ hidden:depends({mode="adhoc"})
+ hidden:depends({mode="wds"})
+
+ bssid:depends({mode="sta"})
+
+ mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
+ mp:value("", translate("disable"))
+ mp:value("deny", translate("Allow listed only"))
+ mp:value("allow", translate("Allow all except listed"))
+ ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
+ ml:depends({macpolicy="allow"})
+ ml:depends({macpolicy="deny"})
+
+ s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
+ s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+ s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+end
+
------------------- WiFI-Encryption -------------------
-encr = s:option(ListValue, "encryption", translate("encryption"))
+encr = s:taboption("encryption", ListValue, "encryption", translate("Encryption"))
encr.override_values = true
+encr.override_depends = true
encr:depends({mode="ap"})
encr:depends({mode="sta"})
encr:depends({mode="adhoc"})
encr:depends({mode="ahdemo"})
-encr:depends({mode="wds"})
+encr:depends({mode="ap-wds"})
+encr:depends({mode="sta-wds"})
+encr:depends({mode="mesh"})
encr:value("none", "No Encryption")
-encr:value("wep", "WEP")
+encr:value("wep-open", translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+encr:value("wep-shared", translate("WEP Shared Key"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
-if hwtype == "atheros" or hwtype == "mac80211" then
- local supplicant = luci.fs.mtime("/usr/sbin/wpa_supplicant")
- local hostapd = luci.fs.mtime("/usr/sbin/hostapd")
+if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
+ local supplicant = fs.access("/usr/sbin/wpa_supplicant")
+ local hostapd = fs.access("/usr/sbin/hostapd")
if hostapd and supplicant then
encr:value("psk", "WPA-PSK")
encr:value("psk2", "WPA2-PSK")
- encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
- encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"})
+ encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
+ encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+ encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"})
elseif hostapd and not supplicant then
- encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
- encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
- encr:value("wpa", "WPA-EAP", {mode="ap"})
- encr:value("wpa2i", "WPA2-EAP", {mode="ap"})
- encr.description = translate("wifi_wpareq")
+ encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="ap-wds"}, {mode="adhoc"}, {mode="ahdemo"})
+ encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="ap-wds"}, {mode="adhoc"}, {mode="ahdemo"})
+ encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="ap-wds"}, {mode="adhoc"}, {mode="ahdemo"})
+ encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="ap-wds"})
+ encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="ap-wds"})
+ encr.description = translate(
+ "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+ "and ad-hoc mode) to be installed."
+ )
elseif not hostapd and supplicant then
- encr:value("psk", "WPA-PSK", {mode="sta"})
- encr:value("psk2", "WPA2-PSK", {mode="sta"})
- encr:value("wpa", "WPA-EAP", {mode="sta"})
- encr:value("wpa2i", "WPA2-EAP", {mode="sta"})
- encr.description = translate("wifi_wpareq")
+ encr:value("psk", "WPA-PSK", {mode="sta"}, {mode="sta-wds"})
+ encr:value("psk2", "WPA2-PSK", {mode="sta"}, {mode="sta-wds"})
+ encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"}, {mode="sta-wds"})
+ encr:value("wpa", "WPA-EAP", {mode="sta"}, {mode="sta-wds"})
+ encr:value("wpa2", "WPA2-EAP", {mode="sta"}, {mode="sta-wds"})
+ encr.description = translate(
+ "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+ "and ad-hoc mode) to be installed."
+ )
else
- encr.description = translate("wifi_wpareq")
+ encr.description = translate(
+ "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+ "and ad-hoc mode) to be installed."
+ )
end
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
encr:depends("mode", "ap")
encr:depends("mode", "sta")
+encr:depends("mode", "ap-wds")
+encr:depends("mode", "sta-wds")
encr:depends("mode", "wds")
-server = s:option(Value, "server", translate("a_w_radiussrv"))
+server = s:taboption("encryption", Value, "server", translate("Radius-Server"))
server:depends({mode="ap", encryption="wpa"})
-server:depends({mode="ap", encryption="wpa2i"})
+server:depends({mode="ap", encryption="wpa2"})
+server:depends({mode="ap-wds", encryption="wpa"})
+server:depends({mode="ap-wds", encryption="wpa2"})
server.rmempty = true
-port = s:option(Value, "port", translate("a_w_radiusport"))
+port = s:taboption("encryption", Value, "port", translate("Radius-Port"))
port:depends({mode="ap", encryption="wpa"})
-port:depends({mode="ap", encryption="wpa2i"})
+port:depends({mode="ap", encryption="wpa2"})
+port:depends({mode="ap-wds", encryption="wpa"})
+port:depends({mode="ap-wds", encryption="wpa2"})
port.rmempty = true
-key = s:option(Value, "key", translate("key"))
-key:depends("encryption", "wep")
-key:depends("encryption", "psk")
-key:depends({mode="ap", encryption="wpa"})
-key:depends("encryption", "psk2")
-key:depends({mode="ap", encryption="wpa2i"})
-key.rmempty = true
+wpakey = s:taboption("encryption", Value, "_wpa_key", translate("Key"))
+wpakey:depends("encryption", "psk")
+wpakey:depends("encryption", "psk2")
+wpakey:depends("encryption", "psk+psk2")
+wpakey:depends("encryption", "psk-mixed")
+wpakey:depends({mode="ap", encryption="wpa"})
+wpakey:depends({mode="ap", encryption="wpa2"})
+wpakey:depends({mode="ap-wds", encryption="wpa"})
+wpakey:depends({mode="ap-wds", encryption="wpa2"})
+wpakey.datatype = "wpakey"
+wpakey.rmempty = true
+wpakey.password = true
+
+wpakey.cfgvalue = function(self, section, value)
+ local key = m.uci:get("wireless", section, "key")
+ if key == "1" or key == "2" or key == "3" or key == "4" then
+ return nil
+ end
+ return key
+end
-if hwtype == "atheros" or hwtype == "mac80211" then
- nasid = s:option(Value, "nasid", translate("a_w_nasid"))
- nasid:depends({mode="ap", encryption="wpa"})
- nasid:depends({mode="ap", encryption="wpa2i"})
- nasid.rmempty = true
+wpakey.write = function(self, section, value)
+ self.map.uci:set("wireless", section, "key", value)
+ self.map.uci:delete("wireless", section, "key1")
+end
- eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype"))
- eaptype:value("TLS")
- eaptype:value("PEAP")
- eaptype:depends({mode="sta", encryption="wpa"})
- eaptype:depends({mode="sta", encryption="wpa2i"})
- cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert"))
- cacert:depends({mode="sta", encryption="wpa"})
- cacert:depends({mode="sta", encryption="wpa2i"})
+wepslot = s:taboption("encryption", ListValue, "_wep_key", translate("Used Key Slot"))
+wepslot:depends("encryption", "wep-open")
+wepslot:depends("encryption", "wep-shared")
+wepslot:value("1", translatef("Key #%d", 1))
+wepslot:value("2", translatef("Key #%d", 2))
+wepslot:value("3", translatef("Key #%d", 3))
+wepslot:value("4", translatef("Key #%d", 4))
- privkey = s:option(FileUpload, "priv_key", translate("a_w_tlsprivkey"))
- privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2i"})
- privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"})
+wepslot.cfgvalue = function(self, section)
+ local slot = tonumber(m.uci:get("wireless", section, "key"))
+ if not slot or slot < 1 or slot > 4 then
+ return 1
+ end
+ return slot
+end
- privkeypwd = s:option(Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd"))
- privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2i"})
- privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"})
+wepslot.write = function(self, section, value)
+ self.map.uci:set("wireless", section, "key", value)
+end
+
+local slot
+for slot=1,4 do
+ wepkey = s:taboption("encryption", Value, "key" .. slot, translatef("Key #%d", slot))
+ wepkey:depends("encryption", "wep-open")
+ wepkey:depends("encryption", "wep-shared")
+ wepkey.datatype = "wepkey"
+ wepkey.rmempty = true
+ wepkey.password = true
+
+ function wepkey.write(self, section, value)
+ if value and (#value == 5 or #value == 13) then
+ value = "s:" .. value
+ end
+ return Value.write(self, section, value)
+ end
+end
- auth = s:option(Value, "auth", translate("a_w_peapauth"))
- auth:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"})
- auth:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
+ nasid = s:taboption("encryption", Value, "nasid", translate("NAS ID"))
+ nasid:depends({mode="ap", encryption="wpa"})
+ nasid:depends({mode="ap", encryption="wpa2"})
+ nasid:depends({mode="ap-wds", encryption="wpa"})
+ nasid:depends({mode="ap-wds", encryption="wpa2"})
+ nasid.rmempty = true
- identity = s:option(Value, "identity", translate("a_w_peapidentity"))
- identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"})
- identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+ eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method"))
+ eaptype:value("tls", "TLS")
+ eaptype:value("ttls", "TTLS")
+ eaptype:value("peap", "PEAP")
+ eaptype:depends({mode="sta", encryption="wpa"})
+ eaptype:depends({mode="sta", encryption="wpa2"})
- password = s:option(Value, "password", translate("a_w_peappassword"))
- password:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"})
- password:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+ cacert = s:taboption("encryption", FileUpload, "ca_cert", translate("Path to CA-Certificate"))
+ cacert:depends({mode="sta", encryption="wpa"})
+ cacert:depends({mode="sta", encryption="wpa2"})
+
+ privkey = s:taboption("encryption", FileUpload, "priv_key", translate("Path to Private Key"))
+ privkey:depends({mode="sta", eap_type="tls", encryption="wpa2"})
+ privkey:depends({mode="sta", eap_type="tls", encryption="wpa"})
+
+ privkeypwd = s:taboption("encryption", Value, "priv_key_pwd", translate("Password of Private Key"))
+ privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa2"})
+ privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa"})
+
+
+ auth = s:taboption("encryption", Value, "auth", translate("Authentication"))
+ auth:value("PAP")
+ auth:value("CHAP")
+ auth:value("MSCHAP")
+ auth:value("MSCHAPV2")
+ auth:depends({mode="sta", eap_type="peap", encryption="wpa2"})
+ auth:depends({mode="sta", eap_type="peap", encryption="wpa"})
+ auth:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
+ auth:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+
+
+ identity = s:taboption("encryption", Value, "identity", translate("Identity"))
+ identity:depends({mode="sta", eap_type="peap", encryption="wpa2"})
+ identity:depends({mode="sta", eap_type="peap", encryption="wpa"})
+ identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
+ identity:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+
+ password = s:taboption("encryption", Value, "password", translate("Password"))
+ password:depends({mode="sta", eap_type="peap", encryption="wpa2"})
+ password:depends({mode="sta", eap_type="peap", encryption="wpa"})
+ password:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
+ password:depends({mode="sta", eap_type="ttls", encryption="wpa"})
end
-
return m