$Id$
]]--
-require("luci.tools.webadmin")
+
+local wa = require "luci.tools.webadmin"
+local nw = require "luci.model.network"
+local ww = require "luci.model.wireless"
+local fs = require "nixio.fs"
+
arg[1] = arg[1] or ""
+arg[2] = arg[2] or ""
+
+m = Map("wireless", translate("Networks"), translate("You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."))
+m:chain("network")
+
+local ifsection
-m = Map("wireless", translate("networks"), translate("a_w_networks1"))
+function m.on_commit(map)
+ nw.init(map.uci)
+ ww.init(map.uci)
+
+ local wnet = ww:get_network(arg[2])
+ if ifsection and wnet then
+ ifsection.section = wnet.sid
+ end
+end
-s = m:section(NamedSection, arg[1], "wifi-device", translate("device") .. " " .. arg[1])
+nw.init(m.uci)
+ww.init(m.uci)
+
+
+local iw = nil
+local tx_powers = nil
+
+m.uci:foreach("wireless", "wifi-iface",
+ function(s)
+ if s.device == arg[1] and not iw then
+ iw = luci.sys.wifi.getiwinfo(s.ifname or s.device)
+ tx_powers = iw.txpwrlist or { }
+ end
+ end)
+
+s = m:section(NamedSection, arg[1], "wifi-device", translate("Device") .. " " .. arg[1])
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")
+]]
-
-en = s:option(Flag, "disabled", translate("enable"))
+en = s:taboption("general", Flag, "disabled", translate("enable"))
en.enabled = "0"
en.disabled = "1"
+en.rmempty = false
function en.cfgvalue(self, section)
return Flag.cfgvalue(self, section) or "0"
end
-s:option(DummyValue, "type", translate("type"))
+s:taboption("general", DummyValue, "type", translate("Type"))
+
local hwtype = m:get(arg[1], "type")
-- NanoFoo
local nsantenna = m:get(arg[1], "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)")
+ch = s:taboption("general", Value, "channel", translate("Channel"))
+ch:value("auto", translate("auto"))
+for c, f in luci.util.kspairs(luci.sys.wifi.channels()) do
+ ch:value(c, "%i (%.3f GHz)" %{ c, f })
end
-for i=100, 140, 4 do
- ch:value(i, i .. " (5 GHz)")
-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
+ for _, p in ipairs(iw and iw.txpwrlist or {}) do
+ tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
+ end
end
------------------- Madwifi Device ------------------
if hwtype == "atheros" then
- mode = s:option(ListValue, "hwmode", translate("mode"))
- mode:value("", translate("wifi_auto"))
+ 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"))
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"))
+ mode:value("11gst", "802.11g + Turbo")
+ mode:value("11ast", "802.11a + Turbo")
+ 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
------------------- 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
+
+ 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"))
+
+ 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(Flag, "frameburst", translate("wifi_bursting")).optional = true
+ s:taboption("advanced", Flag, "frameburst", translate("Frame Bursting"))
- s:option(Value, "distance", translate("wifi_distance")).optional = true
- --s:option(Value, "slottime", translate("wifi_slottime")).optional = true
+ s:taboption("advanced", Value, "distance", translate("Distance Optimization"))
+ --s:option(Value, "slottime", translate("Slot time"))
- s:option(Value, "country", translate("wifi_country")).optional = true
- s:option(Value, "maxassoc", translate("wifi_maxassoc")).optional = true
+ 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.anonymous = true
-s:depends("device", arg[1])
-s.defaults.device = arg[1]
-
-s:option(Value, "ssid", translate("wifi_essid"))
-
-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)
-
-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 wnet = ww:get_network(arg[2])
+
+if wnet then
+ s = m:section(NamedSection, wnet.sid, "wifi-iface", ww:get_i18n(wnet))
+ ifsection = s
+ s.addremove = false
+ s.anonymous = true
+ s.defaults.device = arg[1]
+
+ 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:taboption("general", Value, "ssid", translate("<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+
+ 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("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
+
+ network = s:taboption("general", Value, "network", translate("Network"), translate("Add the Wifi network to physical network"))
+ network.rmempty = true
+ network.template = "cbi/network_netlist"
+ network.widget = "radio"
+
+ function network.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, {type="bridge", 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
-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"))
+ end
--------------------- MAC80211 Interface ----------------------
-if hwtype == "mac80211" then
- mode:value("ahdemo", translate("a_w_ahdemo"))
- mode:value("monitor", translate("a_w_monitor"))
- bssid:depends({mode="adhoc"})
- 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
-end
+ -------------------- Madwifi Interface ----------------------
+
+ if hwtype == "atheros" then
+ 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"})
+
+ s:taboption("advanced", Flag, "doth", "802.11h")
+ hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+ hidden:depends({mode="ap"})
+ hidden:depends({mode="adhoc"})
+ 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"})
+ 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: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:taboption("advanced", Flag, "bursting", translate("Frame Bursting"))
+ s:taboption("advanced", Flag, "turbo", translate("Turbo Mode"))
+ s:taboption("advanced", Flag, "ff", translate("Fast Frames"))
+
+ 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:taboption("advanced", Flag, "sw_merge", translate("Disable HW-Beacon timer"))
+ swm:depends({mode="adhoc"})
+
+ local nos = s:taboption("advanced", Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
+ nos:depends({mode="sta"})
+ nos:depends({mode="sta-wds"})
+
+ local probereq = s:taboption("advanced", Flag, "probereq", translate("Do not send probe responses"))
+ probereq.enabled = "0"
+ probereq.disabled = "1"
+ end
--------------------- Madwifi Interface ----------------------
-if hwtype == "atheros" then
- mode:value("ahdemo", translate("a_w_ahdemo"))
- mode:value("monitor", translate("a_w_monitor"))
-
- bssid:depends({mode="adhoc"})
- bssid:depends({mode="ahdemo"})
-
- 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"))
- 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: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"))
- 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: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: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
-
- local swm = s:option(Flag, "sw_merge", translate("wifi_nosbeacon"))
- swm:depends({mode="adhoc"})
- swm.optional = true
-
- local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon"))
- nos:depends({mode="sta"})
- nos.optional = true
-
- local probereq = s:option(Flag, "probereq", translate("wifi_noprobereq"))
- probereq.optional = true
- probereq.enabled = "0"
- probereq.disabled = "1"
-end
+ -------------------- Broadcom Interface ----------------------
+ if hwtype == "broadcom" then
+ mode:value("wds", translate("WDS"))
+ mode:value("monitor", translate("Monitor"))
--------------------- Broadcom Interface ----------------------
+ hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+ hidden:depends({mode="ap"})
+ hidden:depends({mode="adhoc"})
+ hidden:depends({mode="wds"})
-if hwtype == "broadcom" then
- mode:value("wds", translate("a_w_wds"))
- mode:value("monitor", translate("a_w_monitor"))
+ isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
+ translate("Prevents client-to-client communication"))
+ isolate:depends({mode="ap"})
- s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+ s:taboption("advanced", Flag, "doth", "802.11h")
+ s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
- hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
- hidden:depends({mode="ap"})
- hidden:depends({mode="adhoc"})
- hidden:depends({mode="wds"})
- hidden.optional = true
+ bssid:depends({mode="wds"})
+ bssid:depends({mode="adhoc"})
+ end
- isolate = s:option(Flag, "isolate", translate("wifi_isolate"),
- translate("wifi_isolate_desc"))
- isolate:depends({mode="ap"})
- isolate.optional = true
- bssid:depends({mode="wds"})
-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 <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+ hidden:depends({mode="ap"})
+ hidden:depends({mode="adhoc"})
+ hidden:depends({mode="wds"})
-------------------- WiFI-Encryption -------------------
+ bssid:depends({mode="sta"})
-encr = s:option(ListValue, "encryption", translate("encryption"))
-encr.override_values = true
-encr:depends({mode="ap"})
-encr:depends({mode="sta"})
-encr:depends({mode="adhoc"})
-encr:depends({mode="ahdemo"})
-encr:depends({mode="wds"})
+ 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"})
-encr:value("none", "No Encryption")
-encr:value("wep", "WEP")
+ 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
-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 hostapd and supplicant then
+ ------------------- WiFI-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="ap-wds"})
+ encr:depends({mode="sta-wds"})
+ encr:depends({mode="mesh"})
+
+ encr:value("none", "No Encryption")
+ encr:value("wep", "WEP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+
+ 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("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="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"}, {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(
+ "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("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
- encr:value("wpa2i", "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")
- 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")
- else
- encr.description = translate("wifi_wpareq")
+ encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
end
-elseif hwtype == "broadcom" then
- encr:value("psk", "WPA-PSK")
- encr:value("psk2", "WPA2-PSK")
-end
-encr:depends("mode", "ap")
-encr:depends("mode", "sta")
-encr:depends("mode", "wds")
-
-server = s:option(Value, "server", translate("a_w_radiussrv"))
-server:depends({mode="ap", encryption="wpa"})
-server:depends({mode="ap", encryption="wpa2i"})
-server.rmempty = true
-
-port = s:option(Value, "port", translate("a_w_radiusport"))
-port:depends({mode="ap", encryption="wpa"})
-port:depends({mode="ap", encryption="wpa2i"})
-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
-
-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
-
- 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"})
-
- 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"})
-
- 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"})
-
-
- 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"})
-
- 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"})
-
- 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"})
+ encr:depends("mode", "ap")
+ encr:depends("mode", "sta")
+ encr:depends("mode", "ap-wds")
+ encr:depends("mode", "sta-wds")
+ encr:depends("mode", "wds")
+
+ server = s:taboption("encryption", Value, "server", translate("Radius-Server"))
+ server:depends({mode="ap", encryption="wpa"})
+ server:depends({mode="ap", encryption="wpa2"})
+ server.rmempty = true
+
+ port = s:taboption("encryption", Value, "port", translate("Radius-Port"))
+ port:depends({mode="ap", encryption="wpa"})
+ port:depends({mode="ap", encryption="wpa2"})
+ port.rmempty = true
+
+ key = s:taboption("encryption", Value, "key", translate("Key"))
+ key:depends("encryption", "wep")
+ key:depends("encryption", "psk")
+ key:depends("encryption", "psk2")
+ key:depends("encryption", "psk+psk2")
+ key:depends("encryption", "psk-mixed")
+ key:depends({mode="ap", encryption="wpa"})
+ key:depends({mode="ap", encryption="wpa2"})
+ key.rmempty = true
+ key.password = true
+
+ 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.rmempty = true
+
+ eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method"))
+ eaptype:value("TLS")
+ eaptype:value("TTLS")
+ eaptype:value("PEAP")
+ eaptype:depends({mode="sta", encryption="wpa"})
+ eaptype:depends({mode="sta", encryption="wpa2"})
+
+ 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
end
-
return m
projects / project / luci.git / blobdiff