Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-full: use luci.sys.net.mac_hints() in wifi maclist config

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-08-08 15:20:10 +00:00
parent acb289083c
commit f0a99dd6c7
1 changed files with 4 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -15,6 +15,7 @@ $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 ""
@ -106,33 +107,6 @@ local function txpower_current(pwr, list)
return (list[#list] and list[#list].driver_dbm) or pwr or 0
end
local function arplist(opt)
local _, e, mac, ip, name
local arp = { }
for _, e in ipairs(luci.sys.net.arptable()) do
arp[e["HW address"]:upper()] = { e["IP address"] }
end
if fs.access("/etc/ethers") then
for e in io.lines("/etc/ethers") do
mac, ip = e:match("^([a-f0-9]%S+) (%S+)")
if mac and ip then arp[mac:upper()] = { ip } end
end
end
if fs.access("/var/dhcp.leases") then
for e in io.lines("/var/dhcp.leases") do
mac, ip, name = e:match("^%d+ (%S+) (%S+) (%S+)")
if mac and ip then arp[mac:upper()] = { ip, name ~= "*" and name } end
end
end
for mac, e in luci.util.kspairs(arp) do
opt:value(mac, "%s (%s)" %{ mac, e[2] or e[1] })
end
end
local iw = luci.sys.wifi.getiwinfo(arg[1])
local hw_modes = iw.hwmodelist or { }
local tx_power_list = txpower_list(iw)
@ -473,7 +447,7 @@ if hwtype == "mac80211" then
ml.datatype = "macaddr"
ml:depends({macfilter="allow"})
ml:depends({macfilter="deny"})
arplist(ml)
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")})
@ -578,7 +552,7 @@ if hwtype == "atheros" then
ml.datatype = "macaddr"
ml:depends({macpolicy="allow"})
ml:depends({macpolicy="deny"})
arplist(ml)
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"))
@ -652,7 +626,7 @@ if hwtype == "prism2" then
ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
ml:depends({macpolicy="allow"})
ml:depends({macpolicy="deny"})
arplist(ml)
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"))