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=1decce2bff46fa9e73d7af2be5f411261fa2bddb;hb=a7e524bb7f1e230ed8e69ddcc42875704b98eaef;hpb=aed5544dc99466bcd3002bfe7715341c5ca4b760 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 1decce2bf..bbf2232c2 100644 --- 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 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 @@ -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")) @@ -102,10 +128,17 @@ 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")) @@ -152,6 +185,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 +215,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 +237,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 +312,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" @@ -296,7 +354,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 +375,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 +390,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 +417,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"))