$Id$
]]--
-require("luci.tools.webadmin")
+
+local wa = require "luci.tools.webadmin"
+local fs = require "nixio.fs"
+
arg[1] = arg[1] or ""
m = Map("wireless", translate("networks"), translate("a_w_networks1"))
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:value("auto", translate("wifi_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
+ s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+ mode = s:option(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("11ng", "802.11g+n")
+ mode:value("11na", "802.11a+n")
+
+ htmode = s:option(ListValue, "htmode", translate("wifi_htmode", "HT mode"))
+ htmode:depends("hwmode", "11na")
+ htmode:depends("hwmode", "11ng")
+ htmode:value("HT20", "20MHz")
+ htmode:value("HT40-", translate("wifi_ht40m", "40MHz - 2nd channel below"))
+ htmode:value("HT40+", translate("wifi_ht40p", "40MHz - 2nd channel above"))
+
+ --htcapab = s:option(DynamicList, "ht_capab", translate("wifi_htcapab", "HT capabilities"))
+ --htcapab:depends("hwmode", "11na")
+ --htcapab:depends("hwmode", "11ng")
+
+ s:option(Value, "country", translate("wifi_country", "Country Code"),
+ translate("wifi_country_iso3166", "Use ISO/IEC 3166 alpha2 country codes.")).optional = true
+
+ s:option(Value, "distance", translate("wifi_distance", "Distance Optimization"),
+ translate("wifi_distance_desc", "Distance to farthest network member in meters.")).optional = true
end
------------------- Madwifi Device ------------------
if hwtype == "atheros" then
+ s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+
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("11gst", "802.11g + Turbo")
+ mode:value("11ast", "802.11a + Turbo")
mode:value("fh", translate("wifi_fh"))
s:option(Flag, "diversity", translate("wifi_diversity")).rmempty = false
end
s:option(Value, "distance", translate("wifi_distance"),
translate("wifi_distance_desc")).optional = true
+ s:option(Value, "regdomain", translate("wifi_regdomain")).optional = true
+ s:option(Value, "country", translate("wifi_country")).optional = true
+ s:option(Flag, "outdoor", translate("wifi_outdoor")).optional = true
--s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")).optional = true
end
------------------- Broadcom Device ------------------
if hwtype == "broadcom" then
+ s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+
+ mode = s:option(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:option(ListValue, "macfilter", translate("wifi_macpolicy"))
mp.optional = true
mp:value("")
end
+--------------------- HostAP Device ---------------------
+
+if hwtype == "prism2" then
+ s:option(Value, "txpower", translate("a_w_txpwr"), "att units").rmempty = true
+
+ s:option(Flag, "diversity", translate("wifi_diversity")).rmempty = false
+
+ s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
+ s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
+end
+
+
----------------------- Interface -----------------------
s = m:section(TypedSection, "wifi-iface", translate("interfaces"))
network.rmempty = true
network:value("")
network.combobox_manual = translate("a_w_netmanual")
-luci.tools.webadmin.cbi_add_networks(network)
+wa.cbi_add_networks(network)
function network.write(self, section, value)
if not m.uci:get("network", value) then
-------------------- MAC80211 Interface ----------------------
if hwtype == "mac80211" then
- mode:value("ahdemo", translate("a_w_ahdemo"))
+ if fs.access("/usr/sbin/iw") then
+ mode:value("mesh", "802.11s")
+ end
+
mode:value("monitor", translate("a_w_monitor"))
bssid:depends({mode="adhoc"})
- s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+ mode:value("ap-wds", "%s (WDS)" % translate("a_w_ap"))
+ mode:value("sta-wds", "%s (WDS)" % translate("a_w_client"))
+
+ 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
+
+ hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
+ hidden:depends({mode="ap"})
+ hidden:depends({mode="ap-wds"})
+ hidden.optional = true
+
s:option(Value, "frag", translate("wifi_frag")).optional = true
s:option(Value, "rts", translate("wifi_rts")).optional = true
end
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
+ mode:value("ap-wds", "%s (WDS)" % translate("a_w_ap"))
+ mode:value("sta-wds", "%s (WDS)" % translate("a_w_client"))
+
+ 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
+
wdssep = s:option(Flag, "wdssep", translate("wifi_wdssep"))
- wdssep:depends({mode="ap", wds="1"})
+ wdssep:depends({mode="ap-wds"})
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:depends({mode="ap-wds"})
hidden.optional = true
+
isolate = s:option(Flag, "isolate", translate("wifi_isolate"),
translate("wifi_isolate_desc"))
isolate:depends({mode="ap"})
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"))
+ mp:value("allow", translate("wifi_whitelist"))
+ mp:value("deny", translate("wifi_blacklist"))
ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
ml:depends({macpolicy="allow"})
ml:depends({macpolicy="deny"})
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, "ff", translate("wifi_ff")).optional = true
s:option(Flag, "wmm", translate("wifi_wmm")).optional = true
s:option(Flag, "xr", translate("wifi_xr")).optional = true
mode:value("wds", translate("a_w_wds"))
mode:value("monitor", translate("a_w_monitor"))
- 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"})
isolate.optional = true
bssid:depends({mode="wds"})
+ bssid:depends({mode="adhoc"})
end
+----------------------- HostAP Interface ---------------------
+
+if hwtype == "prism2" then
+ mode:value("wds", translate("a_w_wds"))
+ mode:value("monitor", translate("a_w_monitor"))
+
+ 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="sta"})
+
+ mp = s:option(ListValue, "macpolicy", 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"))
+ ml:depends({macpolicy="allow"})
+ ml:depends({macpolicy="deny"})
+
+ s:option(Value, "rate", translate("wifi_rate")).optional = true
+ s:option(Value, "frag", translate("wifi_frag")).optional = true
+ s:option(Value, "rts", translate("wifi_rts")).optional = true
+end
+
------------------- WiFI-Encryption -------------------
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="wds"})
+encr:depends({mode="mesh"})
encr:value("none", "No Encryption")
encr:value("wep", "WEP")
-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("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
- encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"})
+ 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("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
encr:value("wpa", "WPA-EAP", {mode="ap"})
- encr:value("wpa2i", "WPA2-EAP", {mode="ap"})
+ encr:value("wpa2", "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("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
encr:value("wpa", "WPA-EAP", {mode="sta"})
- encr:value("wpa2i", "WPA2-EAP", {mode="sta"})
+ encr:value("wpa2", "WPA2-EAP", {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
encr:depends("mode", "ap")
server = s:option(Value, "server", translate("a_w_radiussrv"))
server:depends({mode="ap", encryption="wpa"})
-server:depends({mode="ap", encryption="wpa2i"})
+server:depends({mode="ap", encryption="wpa2"})
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:depends({mode="ap", 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: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" then
+if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
nasid = s:option(Value, "nasid", translate("a_w_nasid"))
nasid:depends({mode="ap", encryption="wpa"})
- nasid:depends({mode="ap", encryption="wpa2i"})
+ nasid:depends({mode="ap", encryption="wpa2"})
nasid.rmempty = true
eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype"))
eaptype:value("TLS")
+ eaptype:value("TTLS")
eaptype:value("PEAP")
eaptype:depends({mode="sta", encryption="wpa"})
- eaptype:depends({mode="sta", encryption="wpa2i"})
+ eaptype:depends({mode="sta", encryption="wpa2"})
cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert"))
cacert:depends({mode="sta", encryption="wpa"})
- cacert:depends({mode="sta", encryption="wpa2i"})
+ cacert:depends({mode="sta", encryption="wpa2"})
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="wpa2"})
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="wpa2"})
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: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:option(Value, "identity", translate("a_w_peapidentity"))
- identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"})
+ 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:option(Value, "password", translate("a_w_peappassword"))
- password:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"})
+ 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
projects / project / luci.git / blobdiff