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=8ecfdda2585047ab33e1dd5ba6add144e78ec2fc;hp=0ad4362c0b6625ba6a97ea22b3bd51dd5209ee30;hb=7ae988f34299f882f5e4c7bb55fdbba3d09dd162;hpb=b50e08149c4e3dff9c5ebc6f3448a56f508d8d1c 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 0ad4362c0..8ecfdda25 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -20,9 +20,18 @@ local fs = require "nixio.fs" arg[1] = arg[1] or "" arg[2] = arg[2] or "" -m = Map("wireless", translate("Networks"), translate("You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.")) +m = Map("wireless", "", + translate("The Device Configuration section covers physical settings of the radio " .. + "hardware such as channel, transmit power or antenna selection which is shared among all " .. + "defined wireless networks (if the radio hardware is multi-SSID capable). Per network settings " .. + "like encryption or operation mode are grouped in the Interface Configuration.")) + m:chain("network") +m.breadcrumb = { + { luci.dispatcher.build_url("admin/network/wireless"), translate("Wireless Networks") } +} + local ifsection function m.on_commit(map) @@ -38,19 +47,22 @@ end nw.init(m.uci) ww.init(m.uci) +local wnet = ww:get_network(arg[2]) -local iw = nil -local tx_powers = nil +-- 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.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) +m.title = ww:get_i18n(wnet) -s = m:section(NamedSection, arg[1], "wifi-device", translate("Device") .. " " .. arg[1]) + +local iw = luci.sys.wifi.getiwinfo(arg[1]) +local tx_powers = iw.txpwrlist or { } + + +s = m:section(NamedSection, arg[1], "wifi-device", translate("Device Configuration")) s.addremove = false s:tab("general", translate("General Setup")) @@ -63,7 +75,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 @@ -72,16 +88,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 c, f in luci.util.kspairs(luci.sys.wifi.channels()) do - ch:value(c, "%i (%.3f GHz)" %{ c, f }) +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 @@ -93,9 +112,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")) + mode:value("11b", "802.11b") + mode:value("11g", "802.11g") + mode:value("11a", "802.11a") + + if htcaps then + 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") + 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 @@ -169,7 +225,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")) @@ -220,7 +282,7 @@ end local wnet = ww:get_network(arg[2]) if wnet then - s = m:section(NamedSection, wnet.sid, "wifi-iface", ww:get_i18n(wnet)) + s = m:section(NamedSection, wnet.sid, "wifi-iface", translate("Interface Configuration")) ifsection = s s.addremove = false s.anonymous = true @@ -241,7 +303,11 @@ if wnet then bssid = s:taboption("general", Value, "bssid", translate("BSSID")) - network = s:taboption("general", Value, "network", translate("Network"), translate("Add the Wifi network to physical network")) + network = s:taboption("general", Value, "network", translate("Network"), + translate("Choose the network you want to attach to this wireless interface. " .. + "Select unspecified to not attach any network or fill out the " .. + "create field to define a new network.")) + network.rmempty = true network.template = "cbi/network_netlist" network.widget = "radio" @@ -281,6 +347,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 @@ -292,6 +391,7 @@ if wnet then mode:value("monitor", translate("Monitor")) mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")}) mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")}) + mode:value("wds", translate("Static WDS")) function mode.write(self, section, value) if value == "ap-wds" then @@ -321,6 +421,7 @@ if wnet then bssid:depends({mode="adhoc"}) bssid:depends({mode="ahdemo"}) + bssid:depends({mode="wds"}) wdssep = s:taboption("advanced", Flag, "wdssep", translate("Separate WDS")) wdssep:depends({mode="ap-wds"}) @@ -427,6 +528,7 @@ if wnet then encr = s:taboption("encryption", ListValue, "encryption", translate("Encryption")) encr.override_values = true + encr.override_depends = true encr:depends({mode="ap"}) encr:depends({mode="sta"}) encr:depends({mode="adhoc"}) @@ -436,7 +538,7 @@ if wnet then encr:depends({mode="mesh"}) encr:value("none", "No Encryption") - encr:value("wep", "WEP") + encr:value("wep", "WEP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then local supplicant = fs.access("/usr/sbin/wpa_supplicant") @@ -489,11 +591,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")) @@ -504,6 +610,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 @@ -511,12 +619,14 @@ 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")) - 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"}) @@ -525,12 +635,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")) @@ -538,23 +648,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