projects / project / luci.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
modules/admin-full: prevent crash in wifi model if no tx power list is available
[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 1decce2..63c2344 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -19,6 +19,18 @@ 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 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
 
@@ -57,14 +69,28 @@ end
 ------------------- MAC80211 Device ------------------
 
 if hwtype == "mac80211" then
-       s:taboption("general", Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+       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
-       s:taboption("general", Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+       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"))
@@ -79,8 +105,20 @@ if hwtype == "atheros" then
        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"))
+               ant1 = s:taboption("advanced", ListValue, "txantenna", translate("wifi_txantenna"))
+               ant1.widget = "radio"
+               ant1:depends("diversity", "")
+               ant1:value("0", translate("wifi_auto"))
+               ant1:value("1", translate("wifi_ant1", "Antenna 1"))
+               ant1:value("2", translate("wifi_ant2", "Antenna 2"))
+
+               ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("wifi_rxantenna"))
+               ant2.widget = "radio"
+               ant2:depends("diversity", "")
+               ant2:value("0", translate("wifi_auto"))
+               ant2:value("1", translate("wifi_ant1", "Antenna 1"))
+               ant2:value("2", translate("wifi_ant2", "Antenna 2"))
+
        else -- NanoFoo
                local ant = s:taboption("advanced", ListValue, "antenna", translate("wifi_txantenna"))
                ant:value("auto")
@@ -88,6 +126,7 @@ if hwtype == "atheros" then
                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"))
@@ -102,18 +141,36 @@ end
 ------------------- Broadcom Device ------------------
 
 if hwtype == "broadcom" then
-       s:taboption("advanced", Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
+       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("")
+       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"))
+       ant1 = s:taboption("advanced", ListValue, "txantenna", translate("wifi_txantenna"))
+       ant1.widget = "radio"
+       ant1:depends("diversity", "")
+       ant1:value("3", translate("wifi_auto"))
+       ant1:value("0", translate("wifi_ant1", "Antenna 1"))
+       ant1:value("1", translate("wifi_ant2", "Antenna 2"))
+
+       ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("wifi_rxantenna"))
+       ant2.widget = "radio"
+       ant2:depends("diversity", "")
+       ant2:value("3", translate("wifi_auto"))
+       ant2:value("0", translate("wifi_ant1", "Antenna 1"))
+       ant2:value("1", translate("wifi_ant2", "Antenna 2"))
 
        s:taboption("advanced", Flag, "frameburst", translate("wifi_bursting"))
 
@@ -140,7 +197,7 @@ end
 ----------------------- Interface -----------------------
 
 s = m:section(TypedSection, "wifi-iface", translate("interfaces"))
-s.addremove = true
+s.addremove = (iw and iw.mbssid_support) and true or false
 s.anonymous = true
 s:depends("device", arg[1])
 s.defaults.device = arg[1]
@@ -152,6 +209,14 @@ s:tab("advanced", translate("a_w_advanced", "Advanced Settings"))
 
 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("")
@@ -174,15 +239,6 @@ function network.write(self, section, value)
 end
 
 
-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("sta", translate("a_w_client"))
-
-bssid = s:taboption("general", Value, "bssid", translate("wifi_bssid"))
-
-
 -------------------- MAC80211 Interface ----------------------
 
 if hwtype == "mac80211" then
@@ -205,29 +261,54 @@ 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:taboption("general", Flag, "wds", translate("a_w_wds"))
-       wds:depends({mode="ap"})
-       wds:depends({mode="sta"})
-       wds.rmempty = true
        wdssep = s:taboption("advanced", Flag, "wdssep", translate("wifi_wdssep"))
-       wdssep:depends({mode="ap", wds="1"})
+       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="wds"})
+       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("")
+       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"))
@@ -255,6 +336,7 @@ if hwtype == "atheros" then
 
        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"
@@ -277,6 +359,9 @@ if hwtype == "broadcom" then
         translate("wifi_isolate_desc"))
        isolate:depends({mode="ap"})
 
+       s:taboption("advanced", Flag, "doth", "802.11h")
+       s:taboption("advanced", Flag, "wmm", translate("wifi_wmm"))
+
        bssid:depends({mode="wds"})
        bssid:depends({mode="adhoc"})
 end
@@ -296,7 +381,7 @@ if hwtype == "prism2" then
        bssid:depends({mode="sta"})
 
        mp = s:taboption("macfilter", ListValue, "macpolicy", translate("wifi_macpolicy"))
-       mp:value("")
+       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"))
@@ -317,7 +402,8 @@ 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")
@@ -331,21 +417,21 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" 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("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("psk-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("psk-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")
@@ -358,6 +444,8 @@ 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:taboption("encryption", Value, "server", translate("a_w_radiussrv"))
@@ -375,7 +463,7 @@ key:depends("encryption", "wep")
 key:depends("encryption", "psk")
 key:depends("encryption", "psk2")
 key:depends("encryption", "psk+psk2")
-key:depends("encryption", "mixed")
+key:depends("encryption", "psk-mixed")
 key:depends({mode="ap", encryption="wpa"})
 key:depends({mode="ap", encryption="wpa2"})
 key.rmempty = true
Lua Configuration Interface (mirror)