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=67ccdb4c1c4c2c14a224589ac8e8d95dbb4292c5;hp=e2d66db334ec4d91a7b9d8242a0bd2e8290a86c6;hb=2812cb14c5f3650ac1f1d7876cff6fa66a732cc7;hpb=0ecbaa400e9bc3ee42032981fc8bdd614beace6b 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 e2d66db33..67ccdb4c1 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -14,6 +14,8 @@ $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 "" @@ -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 @@ -70,13 +72,45 @@ end m.title = luci.util.pcdata(wnet:get_i18n()) +local function txpower_list(iw) + local list = iw.txpwrlist or { } + local off = tonumber(iw.txpower_offset) or 0 + local new = { } + local prev = -1 + local _, val + for _, val in ipairs(list) do + local dbm = val.dbm + off + local mw = math.floor(10 ^ (dbm / 10)) + if mw ~= prev then + prev = mw + new[#new+1] = { + display_dbm = dbm, + display_mw = mw, + driver_dbm = val.dbm, + driver_mw = val.mw + } + end + end + return new +end + +local function txpower_current(pwr, list) + pwr = tonumber(pwr) + if pwr ~= nil then + local _, item + for _, item in ipairs(list) do + if item.driver_dbm >= pwr then + return item.driver_dbm + end + end + end + return (list[#list] and list[#list].driver_dbm) or pwr or 0 +end + local iw = luci.sys.wifi.getiwinfo(arg[1]) -local hw_modes = iw.hwmodelist or { } -local tx_powers = iw.txpwrlist or { } -local tx_power = tostring( - (iw.txpower and iw.txpower > 0 and iw.txpower) or - (#tx_powers > 0 and tx_powers[#tx_powers].dbm) -) +local hw_modes = iw.hwmodelist or { } +local tx_power_list = txpower_list(iw) +local tx_power_cur = txpower_current(wdev:get("txpower"), tx_power_list) s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration")) s.addremove = false @@ -132,7 +166,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 @@ -142,14 +176,19 @@ end ------------------- MAC80211 Device ------------------ if hwtype == "mac80211" then - tp = s:taboption("general", - (tx_powers and #tx_powers > 0) and ListValue or Value, - "txpower", translate("Transmit Power"), "dBm") + 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 - tp.rmempty = true - tp.default = tx_power - for _, p in ipairs(tx_powers or {}) do - tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw }) + 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 mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode")) @@ -169,6 +208,12 @@ if hwtype == "mac80211" then htmode:value("HT40-", translate("40MHz 2nd channel below")) htmode:value("HT40+", translate("40MHz 2nd channel above")) + 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:depends("htmode", "HT40-") + noscan.default = noscan.disabled + --htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities")) --htcapab:depends("hwmode", "11na") --htcapab:depends("hwmode", "11ng") @@ -188,6 +233,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 @@ -197,13 +254,19 @@ end if hwtype == "atheros" then tp = s:taboption("general", - (#tx_powers > 0) and ListValue or Value, + (#tx_power_list > 0) and ListValue or Value, "txpower", translate("Transmit Power"), "dBm") tp.rmempty = true - tp.default = tx_power - for _, p in ipairs(tx_powers or {}) do - tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw }) + tp.default = tx_power_cur + + function tp.cfgvalue(...) + return txpower_current(Value.cfgvalue(...), tx_power_list) + 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("Mode")) @@ -258,13 +321,19 @@ end if hwtype == "broadcom" then tp = s:taboption("general", - (#tx_powers > 0) and ListValue or Value, + (#tx_power_list > 0) and ListValue or Value, "txpower", translate("Transmit Power"), "dBm") tp.rmempty = true - tp.default = tx_power - for _, p in ipairs(tx_powers or {}) do - tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw }) + tp.default = tx_power_cur + + function tp.cfgvalue(...) + return txpower_current(Value.cfgvalue(...), tx_power_list) + 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("Mode")) @@ -333,13 +402,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) @@ -354,10 +423,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 @@ -373,6 +450,8 @@ if hwtype == "mac80211" then mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)")) mode:value("monitor", translate("Monitor")) bssid:depends({mode="adhoc"}) + bssid:depends({mode="sta"}) + bssid:depends({mode="sta-wds"}) mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter")) mp:depends({mode="ap"}) @@ -385,6 +464,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")}) @@ -418,6 +498,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 @@ -484,6 +569,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")) @@ -557,6 +643,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")) @@ -630,25 +717,33 @@ end encr:value("none", "No Encryption") -encr:value("wep-open", translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) -encr:value("wep-shared", translate("WEP Shared Key"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) +encr:value("wep-open", translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"}) +encr:value("wep-shared", translate("WEP Shared Key"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"}) 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) + local has_sta_eap = (os.execute("wpa_supplicant -veap >/dev/null 2>/dev/null") == 0) + if hostapd and supplicant 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"}, {mode="ap-wds"}, {mode="sta-wds"}) - encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) + encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) + encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) + encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) + if has_ap_eap and has_sta_eap then + encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) + encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}) + end elseif hostapd and not supplicant then - 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:value("psk", "WPA-PSK", {mode="ap"}, {mode="ap-wds"}) + encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="ap-wds"}) + encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="ap-wds"}) + if has_ap_eap then + encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="ap-wds"}) + encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="ap-wds"}) + end encr.description = translate( "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. "and ad-hoc mode) to be installed." @@ -657,8 +752,10 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then 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"}) + if has_sta_eap then + encr:value("wpa", "WPA-EAP", {mode="sta"}, {mode="sta-wds"}) + encr:value("wpa2", "WPA2-EAP", {mode="sta"}, {mode="sta-wds"}) + end encr.description = translate( "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. "and ad-hoc mode) to be installed." @@ -807,6 +904,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"})