X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=76c023461d4a263cab46d6cc309bd7398aa69f70;hb=98d1bef6816c5a7562e625b6e65b42f4342f1132;hp=d6abfd6ad171a59084f8ee08a63a1fa12c65f181;hpb=fc962c347c29cc9bb20d8587217f411035224201;p=project%2Fluci.git 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 d6abfd6ad..76c023461 100644 --- 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) @@ -54,16 +58,10 @@ end m.title = ww:get_i18n(wnet) -local iw = nil -local tx_powers = nil +local iw = luci.sys.wifi.getiwinfo(arg[1]) +local tx_powers = iw.txpwrlist or { } +local hw_modes = iw.hwmodelist or { } -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 Configuration")) s.addremove = false @@ -78,7 +76,11 @@ back.value = "" back.titleref = luci.dispatcher.build_url("admin", "network", "wireless") ]] -en = s:taboption("general", Flag, "disabled", translate("enable")) +st = s:taboption("general", DummyValue, "__status", translate("Status")) +st.template = "admin_network/wifi_status" +st.ifname = arg[1] + +en = s:taboption("general", Flag, "disabled", translate("Enable device")) en.enabled = "0" en.disabled = "1" en.rmempty = false @@ -87,16 +89,19 @@ function en.cfgvalue(self, section) return Flag.cfgvalue(self, section) or "0" end -s:taboption("general", DummyValue, "type", translate("Type")) local hwtype = m:get(arg[1], "type") +local htcaps = m:get(arg[1], "ht_capab") and true or false + -- NanoFoo local nsantenna = m:get(arg[1], "antenna") ch = s:taboption("general", Value, "channel", translate("Channel")) ch:value("auto", translate("auto")) -for _, f in ipairs(luci.sys.wifi.channels()) do - ch:value(f.channel, "%i (%.3f GHz)" %{ f.channel, f.mhz / 1000 }) +for _, f in ipairs(iw and iw.freqlist or luci.sys.wifi.channels()) do + if not f.restricted then + ch:value(f.channel, "%i (%.3f GHz)" %{ f.channel, f.mhz / 1000 }) + end end @@ -108,9 +113,46 @@ if hwtype == "mac80211" then "txpower", translate("Transmit Power"), "dBm") tp.rmempty = true - for _, p in ipairs(iw and iw.txpwrlist or {}) do + tp.default = tostring(iw and iw.txpower or tx_powers[#tx_powers]) + for _, p in ipairs(tx_powers 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")) + if hw_modes.b then mode:value("11b", "802.11b") end + if hw_modes.g then mode:value("11g", "802.11g") end + if hw_modes.a then mode:value("11a", "802.11a") end + + if htcaps then + if hw_modes.g and hw_modes.n then mode:value("11ng", "802.11g+n") end + if hw_modes.a and hw_modes.n then mode:value("11na", "802.11a+n") end + + 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") + end + + local cl = iw and iw.countrylist + if cl and #cl > 0 then + cc = s:taboption("advanced", ListValue, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes.")) + cc.default = tostring(iw and iw.country or "00") + for _, c in ipairs(cl) do + cc:value(c.alpha2, "%s - %s" %{ c.alpha2, c.name }) + end + else + s:taboption("advanced", Value, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes.")) + end + + s:taboption("advanced", Value, "distance", translate("Distance Optimization"), + translate("Distance to farthest network member in meters.")) end @@ -128,12 +170,12 @@ if hwtype == "atheros" then 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("11bg", "802.11b+g") - mode:value("11gst", "802.11g + Turbo") - mode:value("11ast", "802.11a + Turbo") + if hw_modes.b then mode:value("11b", "802.11b") end + if hw_modes.g then mode:value("11g", "802.11g") end + if hw_modes.a then mode:value("11a", "802.11a") end + if hw_modes.g then mode:value("11bg", "802.11b+g") end + if hw_modes.g then mode:value("11gst", "802.11g + Turbo") end + if hw_modes.a then mode:value("11ast", "802.11a + Turbo") end mode:value("fh", translate("Frequency Hopping")) s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false @@ -184,7 +226,13 @@ if hwtype == "broadcom" then tp.rmempty = true for _, p in ipairs(iw.txpwrlist) do tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw }) - end + end + + mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode")) + mode:value("11bg", "802.11b+g") + mode:value("11b", "802.11b") + mode:value("11g", "802.11g") + mode:value("11gst", "802.11g + Turbo") mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter")) mp:value("", translate("disable")) @@ -300,6 +348,39 @@ 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 + + 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 + + hidden = s:taboption("general", Flag, "hidden", translate("Hide ESSID")) + hidden:depends({mode="ap"}) + hidden:depends({mode="ap-wds"}) end @@ -544,9 +625,9 @@ if wnet then nasid.rmempty = true eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method")) - eaptype:value("TLS") - eaptype:value("TTLS") - eaptype:value("PEAP") + eaptype:value("tls") + eaptype:value("ttls") + eaptype:value("peap") eaptype:depends({mode="sta", encryption="wpa"}) eaptype:depends({mode="sta", encryption="wpa2"}) @@ -555,12 +636,12 @@ if wnet then cacert:depends({mode="sta", encryption="wpa2"}) privkey = s:taboption("encryption", FileUpload, "priv_key", translate("Path to Private Key")) - privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2"}) - privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"}) + 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("Password of Private Key")) - privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2"}) - privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"}) + 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("Authentication")) @@ -568,23 +649,23 @@ if wnet then 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"}) + 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("Identity")) - 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"}) + 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("Password")) - 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"}) + 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 end