modules/admin-full: use driver supported values in txpower control
[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / wifi.lua
index 64a4928..bbf2232 100644 (file)
@@ -11,52 +11,166 @@ 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 = true
+s.addremove = false
 
-en = s:option(Flag, "disabled", translate("enable"))
+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: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
 
-t = s:option(DummyValue, "type", translate("type"))
+s:taboption("general", DummyValue, "type", translate("type"))
 
-mode = s:option(ListValue, "mode", translate("mode"))
-mode:value("", "standard")
-mode:value("11b", "802.11b")
-mode:value("11g", "802.11g")
-mode:value("11a", "802.11a")
-mode:value("11bg", "802.11b+g")
-mode.rmempty = true
+local hwtype = m:get(arg[1], "type")
+-- NanoFoo
+local nsantenna = m:get(arg[1], "antenna")
 
-s:option(Value, "channel", translate("a_w_channel"))
+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
+
+
+------------------- 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
+       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("11gst", "802.11g + Turbo")
+       mode:value("11ast", "802.11a + Turbo")
+       mode:value("fh", translate("wifi_fh"))
+
+       s:taboption("advanced", Flag, "diversity", translate("wifi_diversity")).rmempty = false
+
+       if not nsantenna then
+               s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna"))
+               s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna"))
+       else -- NanoFoo
+               local ant = s:taboption("advanced", ListValue, "antenna", translate("wifi_txantenna"))
+               ant:value("auto")
+               ant:value("vertical")
+               ant:value("horizontal")
+               ant:value("external")
+       end
+       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"))
+end
 
-s:option(Value, "txantenna", translate("a_w_txantenna")).optional = true
 
-s:option(Value, "rxantenna", translate("a_w_rxantenna")).optional = true
 
-s:option(Value, "distance", translate("distance"),
-       translate("a_w_distance1")).optional = true
+------------------- Broadcom Device ------------------
 
-s:option(Value, "diversity", translate("a_w_diversity")):depends("type", "atheros")
-       
-country = s:option(Value, "country", translate("a_w_countrycode"))
-country.optional = true
-country:depends("type", "broadcom")
+if hwtype == "broadcom" then
+       tp = s:taboption("general",
+               (#tx_powers > 0) and ListValue or Value,
+               "txpower", translate("a_w_txpwr"), "dBm")
 
-maxassoc = s:option(Value, "maxassoc", translate("a_w_connlimit"))
-maxassoc:depends("type", "broadcom")
-maxassoc.optional = true
+       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:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist"))
+       ml:depends({macfilter="allow"})
+       ml:depends({macfilter="deny"})
 
+       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 ---------------------
+
+if hwtype == "prism2" then
+       s:taboption("advanced", Value, "txpower", translate("a_w_txpwr"), "att units").rmempty = true
+
+       s:taboption("advanced", Flag, "diversity", translate("wifi_diversity")).rmempty = false
+
+       s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna"))
+       s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna"))
+end
+
+
+----------------------- Interface -----------------------
 
 s = m:section(TypedSection, "wifi-iface", translate("interfaces"))
 s.addremove = true
@@ -64,100 +178,319 @@ s.anonymous = true
 s:depends("device", arg[1])
 s.defaults.device = arg[1]
 
-s:option(Value, "ssid", translate("a_w_netid")).maxlength = 32
+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(ListValue, "network", translate("network"), translate("a_w_network1"))
-network:value("")
-luci.tools.webadmin.cbi_add_networks(network)
+s:taboption("general", Value, "ssid", translate("wifi_essid"))
 
-mode = s:option(ListValue, "mode", translate("mode"))
+mode = s:taboption("general", ListValue, "mode", translate("mode"))
+mode.override_values = true
 mode:value("ap", translate("a_w_ap"))
-mode:value("adhoc", translate("a_w_adhoc"))
-mode:value("ahdemo", translate("a_w_ahdemo"))
 mode:value("sta", translate("a_w_client"))
-mode:value("wds", translate("a_w_wds"))
-mode:value("monitor", translate("a_w_monitor"))
+mode:value("adhoc", translate("a_w_adhoc"))
 
-s:option(Value, "bssid", "BSSID").optional = true
+bssid = s:taboption("general", Value, "bssid", translate("wifi_bssid"))
 
-s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true
+network = s:taboption("general", Value, "network", translate("network"), translate("a_w_network1"))
+network.rmempty = true
+network:value("")
+network.combobox_manual = translate("a_w_netmanual")
+wa.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)
+               end
+       end
+end
 
-s:option(Flag, "frameburst", translate("a_w_brcmburst")).optional = true
-s:option(Flag, "bursting", translate("a_w_athburst")).optional = true
 
+-------------------- MAC80211 Interface ----------------------
 
-encr = s:option(ListValue, "encryption", translate("encryption"))
-encr:value("none", "keine")
-encr:value("wep", "WEP")
-encr:value("PSK", "WPA-PSK")
-encr:value("WPA", "WPA-EAP", {mode="ap"}, {mode="sta"})
-encr:value("PSK2", "WPA2-PSK")
-encr:value("WPA2", "WPA2-EAP", {mode="ap"}, {mode="sta"})
-encr:depends("mode", "ap")
-encr:depends("mode", "sta")
-encr:depends("mode", "wds")
+if hwtype == "mac80211" then
+       if fs.access("/usr/sbin/iw") then
+               mode:value("mesh", "802.11s")
+       end
 
-server = s:option(Value, "server", translate("a_w_radiussrv"))
-server:depends({mode="ap", encryption="WPA"})
-server:depends({mode="ap", encryption="WPA2"})
-server.rmempty = true
+       mode:value("ahdemo", translate("a_w_ahdemo"))
+       mode:value("monitor", translate("a_w_monitor"))
+       bssid:depends({mode="adhoc"})
 
-port = s:option(Value, "port", translate("a_w_radiusport"))
-port:depends({mode="ap", encryption="WPA"})
-port:depends({mode="ap", encryption="WPA2"})
-port.rmempty = true
+       s:taboption("advanced", Value, "frag", translate("wifi_frag"))
+       s:taboption("advanced", Value, "rts", translate("wifi_rts"))
+end
 
-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="WPA2"})
-key.rmempty = true
 
-nasid = s:option(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:value("TLS")
-eaptype:value("PEAP")
-eaptype:depends({mode="sta", encryption="WPA"})
-eaptype:depends({mode="sta", encryption="WPA2"})
+-------------------- Madwifi Interface ----------------------
+
+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"})
+
+       wdssep = s:taboption("advanced", Flag, "wdssep", translate("wifi_wdssep"))
+       wdssep:depends({mode="ap-wds"})
+
+       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="ap-wds"})
+       hidden:depends({mode="sta-wds"})
+       isolate = s:taboption("advanced", Flag, "isolate", translate("wifi_isolate"),
+        translate("wifi_isolate_desc"))
+       isolate:depends({mode="ap"})
+       s:taboption("advanced", Flag, "bgscan", translate("wifi_bgscan"))
+
+       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, "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:taboption("advanced", Flag, "bursting", translate("wifi_bursting"))
+       s:taboption("advanced", Flag, "turbo", translate("wifi_turbo"))
+       s:taboption("advanced", Flag, "ff", translate("wifi_ff"))
+
+       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:taboption("advanced", Flag, "sw_merge", translate("wifi_nosbeacon"))
+       swm:depends({mode="adhoc"})
+
+       local nos = s:taboption("advanced", Flag, "nosbeacon", translate("wifi_nosbeacon"))
+       nos:depends({mode="sta"})
+       nos:depends({mode="sta-wds"})
+
+       local probereq = s:taboption("advanced", Flag, "probereq", translate("wifi_noprobereq"))
+       probereq.enabled  = "0"
+       probereq.disabled = "1"
+end
+
+
+-------------------- Broadcom Interface ----------------------
+
+if hwtype == "broadcom" 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"})
+
+       isolate = s:taboption("advanced", Flag, "isolate", translate("wifi_isolate"),
+        translate("wifi_isolate_desc"))
+       isolate:depends({mode="ap"})
 
-cacert = s:option(Value, "ca_cert", translate("a_w_cacert"))
-cacert:depends({mode="sta", encryption="WPA"})
-cacert:depends({mode="sta", encryption="WPA2"})
+       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"))
 
-privkey = s:option(Value, "priv_key", translate("a_w_tlsprivkey"))
-privkey:depends({mode="sta", eap_type="TLS", encryption="WPA2"})
-privkey:depends({mode="sta", eap_type="TLS", encryption="WPA"})
+       hidden = s:taboption("general", Flag, "hidden", translate("wifi_hidden"))
+       hidden:depends({mode="ap"})
+       hidden:depends({mode="adhoc"})
+       hidden:depends({mode="wds"})
 
-privkeypwd = s:option(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"})
+       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
 
-auth = s:option(Value, "auth", translate("a_w_peapauth"))
-auth:depends({mode="sta", eap_type="PEAP", encryption="WPA2"})
-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="WPA2"})
-identity:depends({mode="sta", eap_type="PEAP", encryption="WPA"})
+------------------- WiFI-Encryption -------------------
 
-password = s:option(Value, "password", translate("a_w_peappassword"))
-password:depends({mode="sta", eap_type="PEAP", encryption="WPA2"})
-password:depends({mode="sta", eap_type="PEAP", encryption="WPA"})
+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="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" 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("wifi_wpareq")
+       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("wifi_wpareq")
+       else
+               encr.description = translate("wifi_wpareq")
+       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")
 
-s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1")).optional = true
+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
 
-s:option(Flag, "hidden", translate("a_w_hideessid")).optional = true
+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: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", "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("a_w_nasid"))
+       nasid:depends({mode="ap", encryption="wpa"})
+       nasid:depends({mode="ap", encryption="wpa2"})
+       nasid.rmempty = true
+
+       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:taboption("encryption", FileUpload, "ca_cert", translate("a_w_cacert"))
+       cacert:depends({mode="sta", encryption="wpa"})
+       cacert:depends({mode="sta", encryption="wpa2"})
+
+       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: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:taboption("encryption", Value, "auth", translate("a_w_peapauth"))
+       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("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: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"})
+       password:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+end
 
 
-return m
\ No newline at end of file
+return m