X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=7cdfb7060cbce0d9d412b36ff17e1a2aaa8804fe;hp=fdbaae4792ef836ed41202deb455994f4339b5ab;hb=d2c188278629fa51f894a836947dbac5d691a6dd;hpb=28426c25fc52d92fe3992d4eeb76563a193716bd 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 fdbaae479..7cdfb7060 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -14,13 +14,15 @@ $Id$ local wa = require "luci.tools.webadmin" local nw = require "luci.model.network" +local ut = require "luci.util" +local nt = require "luci.sys".net local fs = require "nixio.fs" arg[1] = arg[1] or "" 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 " .. + "hardware such as channel, transmit power or antenna selection which are 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.")) @@ -59,7 +61,7 @@ function m.parse(map) wdev:set("disabled", nil) nw:commit("wireless") - luci.sys.call("(env -i /sbin/wifi down; env -i /sbin/wifi up) >/dev/null 2>/dev/null") + luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null") luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", arg[1])) return @@ -141,7 +143,6 @@ end local hwtype = wdev:get("type") -local htcaps = wdev:get("ht_capab") and true or false -- NanoFoo local nsantenna = wdev:get("antenna") @@ -164,7 +165,7 @@ if has_sta then else ch = s:taboption("general", Value, "channel", translate("Channel")) ch:value("auto", translate("auto")) - for _, f in ipairs(iw and iw.freqlist or luci.sys.wifi.channels()) do + for _, f in ipairs(iw and iw.freqlist or { }) do if not f.restricted then ch:value(f.channel, "%i (%.3f GHz)" %{ f.channel, f.mhz / 1000 }) end @@ -174,42 +175,58 @@ end ------------------- MAC80211 Device ------------------ if hwtype == "mac80211" then - tp = s:taboption("general", - (#tx_power_list > 0) and ListValue or Value, - "txpower", translate("Transmit Power"), "dBm") - - tp.rmempty = true - tp.default = tx_power_cur + if #tx_power_list > 1 then + tp = s:taboption("general", ListValue, + "txpower", translate("Transmit Power"), "dBm") + tp.rmempty = true + tp.default = tx_power_cur + function tp.cfgvalue(...) + return txpower_current(Value.cfgvalue(...), tx_power_list) + end - function tp.cfgvalue(...) - return txpower_current(Value.cfgvalue(...), tx_power_list) + for _, p in ipairs(tx_power_list) do + tp:value(p.driver_dbm, "%i dBm (%i mW)" + %{ p.display_dbm, p.display_mw }) + end end - for _, p in ipairs(tx_power_list) do - tp:value(p.driver_dbm, "%i dBm (%i mW)" - %{ p.display_dbm, p.display_mw }) - end + mode = s:taboption("advanced", ListValue, "hwmode", translate("Band")) - 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 hw_modes.ac then + if hw_modes.ac then mode:value("11a", "5GHz (802.11n+ac)") 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("VHT mode (802.11ac)")) + htmode:value("", translate("disabled")) + htmode:value("VHT20", "20MHz") + htmode:value("VHT40", "40MHz") + htmode:value("VHT80", "80MHz") - htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode")) - htmode:depends("hwmode", "11na") - htmode:depends("hwmode", "11ng") + elseif hw_modes.n then + if hw_modes.g then mode:value("11g", "2.4GHz (802.11g+n)") end + if hw_modes.a then mode:value("11a", "5GHz (802.11a+n)") end + + htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode (802.11n)")) + htmode:value("", translate("disabled")) htmode:value("HT20", "20MHz") - htmode:value("HT40-", translate("40MHz 2nd channel below")) - htmode:value("HT40+", translate("40MHz 2nd channel above")) + htmode:value("HT40", "40MHz") + + function mode.cfgvalue(...) + local v = Value.cfgvalue(...) + if v == "11na" then + return "11a" + elseif v == "11ng" then + return "11g" + end + return v + end - --htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities")) - --htcapab:depends("hwmode", "11na") - --htcapab:depends("hwmode", "11ng") + noscan = s:taboption("advanced", Flag, "noscan", translate("Force 40MHz mode"), + translate("Always use 40MHz channels even if the secondary channel overlaps. Using this option does not comply with IEEE 802.11n-2009!")) + noscan:depends("htmode", "HT40") + noscan.default = noscan.disabled + else + if hw_modes.g then mode:value("11g", "2.4GHz (802.11g)") end + if hw_modes.a then mode:value("11a", "5GHz (802.11a)") end end local cl = iw and iw.countrylist @@ -226,6 +243,18 @@ if hwtype == "mac80211" then s:taboption("advanced", Value, "distance", translate("Distance Optimization"), translate("Distance to farthest network member in meters.")) + -- external antenna profiles + local eal = iw and iw.extant + if eal and #eal > 0 then + ea = s:taboption("advanced", ListValue, "extant", translate("Antenna Configuration")) + for _, eap in ipairs(eal) do + ea:value(eap.id, "%s (%s)" %{ eap.name, eap.description }) + if eap.selected then + ea.default = eap.id + end + end + end + s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold")) s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold")) end @@ -383,13 +412,13 @@ mode:value("adhoc", translate("Ad-Hoc")) bssid = s:taboption("general", Value, "bssid", translate("BSSID")) 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.")) + translate("Choose the network(s) you want to attach to this wireless interface or " .. + "fill out the create field to define a new network.")) network.rmempty = true network.template = "cbi/network_netlist" -network.widget = "radio" +network.widget = "checkbox" +network.novirtual = true function network.write(self, section, value) local i = nw:get_interface(section) @@ -404,10 +433,18 @@ function network.write(self, section, value) if n then n:del_interface(i) end end else - local n = nw:get_network(value) - if n then - n:set("type", "bridge") - n:add_interface(i) + local v + for _, v in ipairs(i:get_networks()) do + v:del_interface(i) + end + for v in ut.imatch(value) do + local n = nw:get_network(v) + if n then + if not n:is_empty() then + n:set("type", "bridge") + end + n:add_interface(i) + end end end end @@ -437,6 +474,7 @@ if hwtype == "mac80211" then ml.datatype = "macaddr" ml:depends({macfilter="allow"}) ml:depends({macfilter="deny"}) + nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end) mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")}) mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")}) @@ -470,6 +508,11 @@ if hwtype == "mac80211" then hidden = s:taboption("general", Flag, "hidden", translate("Hide ESSID")) hidden:depends({mode="ap"}) hidden:depends({mode="ap-wds"}) + + wmm = s:taboption("general", Flag, "wmm", translate("WMM Mode")) + wmm:depends({mode="ap"}) + wmm:depends({mode="ap-wds"}) + wmm.default = wmm.enabled end @@ -536,6 +579,7 @@ if hwtype == "atheros" then ml.datatype = "macaddr" ml:depends({macpolicy="allow"}) ml:depends({macpolicy="deny"}) + nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end) s:taboption("advanced", Value, "rate", translate("Transmission Rate")) s:taboption("advanced", Value, "mcast_rate", translate("Multicast Rate")) @@ -609,6 +653,7 @@ if hwtype == "prism2" then ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List")) ml:depends({macpolicy="allow"}) ml:depends({macpolicy="deny"}) + nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end) s:taboption("advanced", Value, "rate", translate("Transmission Rate")) s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold")) @@ -689,8 +734,8 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then local supplicant = fs.access("/usr/sbin/wpa_supplicant") local hostapd = fs.access("/usr/sbin/hostapd") - -- Probe EAP support - local has_ap_eap = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0) + -- Probe EAP support + local has_ap_eap = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0) local has_sta_eap = (os.execute("wpa_supplicant -veap >/dev/null 2>/dev/null") == 0) if hostapd and supplicant then @@ -869,6 +914,12 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then cacert:depends({mode="sta-wds", encryption="wpa"}) cacert:depends({mode="sta-wds", encryption="wpa2"}) + clientcert = s:taboption("encryption", FileUpload, "client_cert", translate("Path to Client-Certificate")) + clientcert:depends({mode="sta", encryption="wpa"}) + clientcert:depends({mode="sta", encryption="wpa2"}) + clientcert:depends({mode="sta-wds", encryption="wpa"}) + clientcert:depends({mode="sta-wds", 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"})