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=bbf2232c24442cb09c2d6f0728f4740b89e62536;hp=72c79b68c3ff1df32c6e36351dabefc9c1cf5a83;hb=a7e524bb7f1e230ed8e69ddcc42875704b98eaef;hpb=00f1c31b8bd70585b9954aaa41ce6f6b46e543bd 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 72c79b68c..bbf2232c2 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,40 @@ You may obtain a copy of the License at $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 iw = nil +local tx_powers = nil + +m.uci:foreach("wireless", "wifi-iface", + function(s) + if s.device == arg[1] and s.ifname and not iw then + iw = luci.sys.wifi.getiwinfo(s.ifname) + tx_powers = iw.txpwrlist or { } + end + end) + s = m:section(NamedSection, arg[1], "wifi-device", translate("device") .. " " .. arg[1]) s.addremove = false +s:tab("general", translate("a_w_general", "General Setup")) +s:tab("macfilter", translate("a_w_macfilter", "MAC-Filter")) +s:tab("advanced", translate("a_w_advanced", "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 @@ -33,64 +53,74 @@ 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)") -end -for i=100, 140, 4 do - ch:value(i, i .. " (5 GHz)") +ch = s:taboption("general", Value, "channel", translate("a_w_channel")) +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 -ch:value(147, 147 .. " (5 GHz)") -ch:value(151, 151 .. " (5 GHz)") -ch:value(155, 155 .. " (5 GHz)") -ch:value(167, 167 .. " (5 GHz)") -s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true ------------------- MAC80211 Device ------------------ if hwtype == "mac80211" then + tp = s:taboption("general", + (#tx_powers > 0) and ListValue or Value, + "txpower", translate("a_w_txpwr"), "dBm") + tp.rmempty = true + for _, p in ipairs(iw.txpwrlist) 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, "mode", translate("mode")) + tp = s:taboption("general", + (#tx_powers > 0) and ListValue or Value, + "txpower", translate("a_w_txpwr"), "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("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 + s:taboption("advanced", Flag, "diversity", translate("wifi_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 + s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna")) + s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna")) else -- NanoFoo - local ant = s:option(ListValue, "antenna", translate("wifi_txantenna")) + local ant = s:taboption("advanced", ListValue, "antenna", translate("wifi_txantenna")) 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:taboption("advanced", Value, "distance", translate("wifi_distance"), + translate("wifi_distance_desc")) + s:taboption("advanced", Value, "regdomain", translate("wifi_regdomain")) + s:taboption("advanced", Value, "country", translate("wifi_country")) + s:taboption("advanced", Flag, "outdoor", translate("wifi_outdoor")) - --s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")).optional = true + --s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")) end @@ -98,25 +128,45 @@ end ------------------- Broadcom Device ------------------ if hwtype == "broadcom" then - mp = s:option(ListValue, "macfilter", translate("wifi_macpolicy")) - mp.optional = true - mp:value("") + tp = s:taboption("general", + (#tx_powers > 0) and ListValue or Value, + "txpower", translate("a_w_txpwr"), "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("wifi_macpolicy")) + mp:value("", translate("disable")) mp:value("allow", translate("wifi_whitelist")) mp:value("deny", translate("wifi_blacklist")) - ml = s:option(DynamicList, "maclist", translate("wifi_maclist")) + ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist")) 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 + s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna")) + s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna")) + + s:taboption("advanced", Flag, "frameburst", translate("wifi_bursting")) + + s:taboption("advanced", Value, "distance", translate("wifi_distance")) + --s:option(Value, "slottime", translate("wifi_slottime")) + + s:taboption("advanced", Value, "country", translate("wifi_country")) + s:taboption("advanced", Value, "maxassoc", translate("wifi_maxassoc")) +end + + +--------------------- HostAP Device --------------------- - s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true +if hwtype == "prism2" then + s:taboption("advanced", Value, "txpower", translate("a_w_txpwr"), "att units").rmempty = true - s:option(Value, "distance", translate("wifi_distance")).optional = true - --s:option(Value, "slottime", translate("wifi_slottime")).optional = true + s:taboption("advanced", Flag, "diversity", translate("wifi_diversity")).rmempty = false - s:option(Value, "country", translate("wifi_country")).optional = true - s:option(Value, "maxassoc", translate("wifi_maxassoc")).optional = true + s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna")) + s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna")) end @@ -128,13 +178,26 @@ s.anonymous = true s:depends("device", arg[1]) s.defaults.device = arg[1] -s:option(Value, "ssid", translate("wifi_essid")) +s:tab("general", translate("a_w_general", "General Setup")) +s:tab("encryption", translate("a_w_security", "Wireless Security")) +s:tab("macfilter", translate("a_w_macfilter", "MAC-Filter")) +s:tab("advanced", translate("a_w_advanced", "Advanced Settings")) -network = s:option(Value, "network", translate("network"), translate("a_w_network1")) +s:taboption("general", Value, "ssid", translate("wifi_essid")) + +mode = s:taboption("general", ListValue, "mode", translate("mode")) +mode.override_values = true +mode:value("ap", translate("a_w_ap")) +mode:value("sta", translate("a_w_client")) +mode:value("adhoc", translate("a_w_adhoc")) + +bssid = s:taboption("general", Value, "bssid", translate("wifi_bssid")) + +network = s:taboption("general", 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) +wa.cbi_add_networks(network) function network.write(self, section, value) if not m.uci:get("network", value) then @@ -152,19 +215,10 @@ function network.write(self, section, value) end -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")) - -bssid = s:option(Value, "bssid", translate("wifi_bssid")) - - -------------------- MAC80211 Interface ---------------------- if hwtype == "mac80211" then - if luci.fs.mtime("/usr/sbin/iw") then + if fs.access("/usr/sbin/iw") then mode:value("mesh", "802.11s") end @@ -172,8 +226,8 @@ if hwtype == "mac80211" then mode:value("monitor", translate("a_w_monitor")) bssid:depends({mode="adhoc"}) - s:option(Value, "frag", translate("wifi_frag")).optional = true - s:option(Value, "rts", translate("wifi_rts")).optional = true + s:taboption("advanced", Value, "frag", translate("wifi_frag")) + s:taboption("advanced", Value, "rts", translate("wifi_rts")) end @@ -183,65 +237,84 @@ end if hwtype == "atheros" then mode:value("ahdemo", translate("a_w_ahdemo")) mode:value("monitor", translate("a_w_monitor")) + mode:value("ap-wds", "%s (%s)" % {translate("a_w_ap"), translate("a_w_wds")}) + mode:value("sta-wds", "%s (%s)" % {translate("a_w_client"), translate("a_w_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"}) - 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 + wdssep = s:taboption("advanced", Flag, "wdssep", translate("wifi_wdssep")) + wdssep:depends({mode="ap-wds"}) - s:option(Flag, "doth", "802.11h").optional = true - hidden = s:option(Flag, "hidden", translate("wifi_hidden")) + s:taboption("advanced", Flag, "doth", "802.11h") + hidden = s:taboption("general", 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"), + hidden:depends({mode="ap-wds"}) + hidden:depends({mode="sta-wds"}) + isolate = s:taboption("advanced", 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 + s:taboption("advanced", Flag, "bgscan", translate("wifi_bgscan")) - mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy")) - mp.optional = true - mp:value("") + mp = s:taboption("macfilter", ListValue, "macpolicy", translate("wifi_macpolicy")) + mp:value("", translate("disable")) mp:value("deny", translate("wifi_whitelist")) mp:value("allow", translate("wifi_blacklist")) - ml = s:option(DynamicList, "maclist", translate("wifi_maclist")) + ml = s:taboption("macfilter", 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:taboption("advanced", Value, "rate", translate("wifi_rate")) + s:taboption("advanced", Value, "mcast_rate", translate("wifi_mcast_rate")) + s:taboption("advanced", Value, "frag", translate("wifi_frag")) + s:taboption("advanced", Value, "rts", translate("wifi_rts")) + s:taboption("advanced", Value, "minrate", translate("wifi_minrate")) + s:taboption("advanced", Value, "maxrate", translate("wifi_maxrate")) + s:taboption("advanced", Flag, "compression", translate("wifi_compression")) - s:option(Flag, "bursting", translate("wifi_bursting")).optional = true - s:option(Flag, "turbo", translate("wifi_turbo")).optional = true - s:option(Flag, "ff", translate("wifi_ff")).optional = true + s:taboption("advanced", Flag, "bursting", translate("wifi_bursting")) + s:taboption("advanced", Flag, "turbo", translate("wifi_turbo")) + s:taboption("advanced", Flag, "ff", translate("wifi_ff")) - 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("wifi_wmm")) + s:taboption("advanced", Flag, "xr", translate("wifi_xr")) + s:taboption("advanced", Flag, "ar", translate("wifi_ar")) - local swm = s:option(Flag, "sw_merge", translate("wifi_nosbeacon")) + local swm = s:taboption("advanced", Flag, "sw_merge", translate("wifi_nosbeacon")) swm:depends({mode="adhoc"}) - swm.optional = true - local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")) + local nos = s:taboption("advanced", Flag, "nosbeacon", translate("wifi_nosbeacon")) 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("wifi_noprobereq")) probereq.enabled = "0" probereq.disabled = "1" end @@ -253,60 +326,85 @@ if hwtype == "broadcom" then mode:value("wds", translate("a_w_wds")) mode:value("monitor", translate("a_w_monitor")) - hidden = s:option(Flag, "hidden", translate("wifi_hidden")) + hidden = s:taboption("general", 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"), + isolate = s:taboption("advanced", Flag, "isolate", translate("wifi_isolate"), translate("wifi_isolate_desc")) isolate:depends({mode="ap"}) - 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:taboption("general", Flag, "hidden", translate("wifi_hidden")) + hidden:depends({mode="ap"}) + hidden:depends({mode="adhoc"}) + hidden:depends({mode="wds"}) + + bssid:depends({mode="sta"}) + + mp = s:taboption("macfilter", ListValue, "macpolicy", translate("wifi_macpolicy")) + mp:value("", translate("disable")) + mp:value("deny", translate("wifi_whitelist")) + mp:value("allow", translate("wifi_blacklist")) + ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist")) + ml:depends({macpolicy="allow"}) + ml:depends({macpolicy="deny"}) + + s:taboption("advanced", Value, "rate", translate("wifi_rate")) + s:taboption("advanced", Value, "frag", translate("wifi_frag")) + s:taboption("advanced", Value, "rts", translate("wifi_rts")) +end + ------------------- WiFI-Encryption ------------------- -encr = s:option(ListValue, "encryption", translate("encryption")) +encr = s:taboption("encryption", 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"}) +encr:depends({mode="ap-wds"}) +encr:depends({mode="sta-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("mixed", "WPA-PSK/WPA2-PSK Mixed Mode") - encr:value("wpa", "WPA-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("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"}) - encr:value("wpa", "WPA-EAP", {mode="ap"}) - encr:value("wpa2", "WPA2-EAP", {mode="ap"}) + 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("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:value("wpa", "WPA-EAP", {mode="sta"}) - encr:value("wpa2", "WPA2-EAP", {mode="sta"}) + 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("wifi_wpareq") else encr.description = translate("wifi_wpareq") @@ -319,53 +417,58 @@ 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("a_w_radiussrv")) server:depends({mode="ap", encryption="wpa"}) server:depends({mode="ap", encryption="wpa2"}) server.rmempty = true -port = s:option(Value, "port", translate("a_w_radiusport")) +port = s:taboption("encryption", Value, "port", translate("a_w_radiusport")) port:depends({mode="ap", encryption="wpa"}) port:depends({mode="ap", encryption="wpa2"}) port.rmempty = true -key = s:option(Value, "key", translate("key")) +key = s:taboption("encryption", Value, "key", translate("key")) key:depends("encryption", "wep") key:depends("encryption", "psk") -key:depends({mode="ap", encryption="wpa"}) key:depends("encryption", "psk2") +key:depends("encryption", "psk+psk2") +key:depends("encryption", "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 - nasid = s:option(Value, "nasid", translate("a_w_nasid")) +if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then + nasid = s:taboption("encryption", Value, "nasid", translate("a_w_nasid")) nasid:depends({mode="ap", encryption="wpa"}) nasid:depends({mode="ap", encryption="wpa2"}) nasid.rmempty = true - eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype")) + eaptype = s:taboption("encryption", 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="wpa2"}) - cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert")) + cacert = s:taboption("encryption", FileUpload, "ca_cert", translate("a_w_cacert")) cacert:depends({mode="sta", encryption="wpa"}) cacert:depends({mode="sta", encryption="wpa2"}) - privkey = s:option(FileUpload, "priv_key", translate("a_w_tlsprivkey")) + privkey = s:taboption("encryption", FileUpload, "priv_key", translate("a_w_tlsprivkey")) 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 = s:taboption("encryption", Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd")) 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 = s:taboption("encryption", Value, "auth", translate("a_w_peapauth")) auth:value("PAP") auth:value("CHAP") auth:value("MSCHAP") @@ -376,13 +479,13 @@ if hwtype == "atheros" or hwtype == "mac80211" then auth:depends({mode="sta", eap_type="TTLS", encryption="wpa"}) - identity = s:option(Value, "identity", translate("a_w_peapidentity")) + identity = s:taboption("encryption", Value, "identity", translate("a_w_peapidentity")) 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 = s:taboption("encryption", Value, "password", translate("a_w_peappassword")) 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"})