modules/admin-full: add extended mac80211 wireless options for 11n, patch by Dennis...

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / wifi.lua

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 1d46c75..098a3a2 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -28,6 +28,10 @@ m = Map("wireless", "",
 
 m:chain("network")
 
+m.breadcrumb = {
+       { luci.dispatcher.build_url("admin/network/wireless"), translate("Wireless Networks") }
+}
+
 local ifsection
 
 function m.on_commit(map)
@@ -44,7 +48,14 @@ nw.init(m.uci)
 ww.init(m.uci)
 
 local wnet = ww:get_network(arg[2])
-m.title = wnet and ww:get_i18n(wnet) or translate("Wireless Network")
+
+-- redirect to overview page if network does not exist anymore (e.g. after a revert)
+if not wnet then
+       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+       return
+end
+
+m.title = ww:get_i18n(wnet)
 
 
 local iw = nil
@@ -104,6 +115,29 @@ if hwtype == "mac80211" then
        for _, p in ipairs(iw and iw.txpwrlist or {}) do
                tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
        end
+       
+       mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
+       mode:value("", translate("auto"))
+       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:taboption("advanced", ListValue, "htmode", translate("HT mode"))
+       htmode:depends("hwmode", "11na")
+       htmode:depends("hwmode", "11ng")
+       htmode:value("HT20", "20MHz")
+       htmode:value("HT40-", translate("40MHz 2nd channel below"))
+       htmode:value("HT40+", translate("40MHz 2nd channel above"))
+       
+       htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities"))
+       htcapab:depends("hwmode", "11na")
+       htcapab:depends("hwmode", "11ng")
+       
+       s:taboption("advanced", Value, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes."))
+       s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
+               translate("Distance to farthest network member in meters."))    
 end
 
 
@@ -293,6 +327,26 @@ if wnet then
 
                s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
                s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+               
+               mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
+               mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})              
+               
+               function mode.write(self, section, value)
+                       if value == "ap-wds" then
+                               ListValue.write(self, section, "ap")
+                               m.uci:set("wireless", section, "wds", 1)
+                       elseif value == "sta-wds" then
+                               ListValue.write(self, section, "sta")
+                               m.uci:set("wireless", section, "wds", 1)
+                       else
+                               ListValue.write(self, section, value)
+                               m.uci:delete("wireless", section, "wds")
+                       end
+               end
+               
+               hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+               hidden:depends({mode="ap"})
+               hidden:depends({mode="ap-wds"})                         
        end
 
 
@@ -504,11 +558,15 @@ if wnet then
        server = s:taboption("encryption", Value, "server", translate("Radius-Server"))
        server:depends({mode="ap", encryption="wpa"})
        server:depends({mode="ap", encryption="wpa2"})
+       server:depends({mode="ap-wds", encryption="wpa"})
+       server:depends({mode="ap-wds", encryption="wpa2"})
        server.rmempty = true
 
        port = s:taboption("encryption", Value, "port", translate("Radius-Port"))
        port:depends({mode="ap", encryption="wpa"})
        port:depends({mode="ap", encryption="wpa2"})
+       port:depends({mode="ap-wds", encryption="wpa"})
+       port:depends({mode="ap-wds", encryption="wpa2"})
        port.rmempty = true
 
        key = s:taboption("encryption", Value, "key", translate("Key"))
@@ -519,6 +577,8 @@ if wnet then
        key:depends("encryption", "psk-mixed")
        key:depends({mode="ap", encryption="wpa"})
        key:depends({mode="ap", encryption="wpa2"})
+       key:depends({mode="ap-wds", encryption="wpa"})
+       key:depends({mode="ap-wds", encryption="wpa2"})
        key.rmempty = true
        key.password = true
 
@@ -526,6 +586,8 @@ if wnet then
                nasid = s:taboption("encryption", Value, "nasid", translate("NAS ID"))
                nasid:depends({mode="ap", encryption="wpa"})
                nasid:depends({mode="ap", encryption="wpa2"})
+               nasid:depends({mode="ap-wds", encryption="wpa"})
+               nasid:depends({mode="ap-wds", encryption="wpa2"})
                nasid.rmempty = true
 
                eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method"))