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

modules/freifunk: use getiwinfo() instead of getiwconfig()

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-08-08 20:07:39 +00:00
parent 30597efafb
commit a521cddcf8
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/freifunk/luasrc/controller/freifunk/freifunk.lua
View file

@ -219,7 +219,6 @@ function jsonstatus()
root.network = {} root.network = {}
root.wireless = {devices = {}, interfaces = {}, status = {}} root.wireless = {devices = {}, interfaces = {}, status = {}}
local wifs = root.wireless.interfaces local wifs = root.wireless.interfaces
local wifidata = luci.sys.wifi.getiwconfig() or {}
local netdata = luci.sys.net.deviceinfo() or {} local netdata = luci.sys.net.deviceinfo() or {}
for _, vif in ipairs(ffwifs) do for _, vif in ipairs(ffwifs) do
@ -229,7 +228,18 @@ function jsonstatus()
if s.device == vif and s.network == vif then if s.device == vif and s.network == vif then
wifs[#wifs+1] = s wifs[#wifs+1] = s
if s.ifname then if s.ifname then
root.wireless.status[s.ifname] = wifidata[s.ifname] local iwinfo = luci.sys.wifi.getiwinfo(s.ifname)
if iwinfo then
root.wireless.status[s.ifname] = { }
local _, f
for _, f in ipairs({
"channel", "txpower", "bitrate", "signal", "noise",
"quality", "quality_max", "mode", "ssid", "bssid", "encryption", "ifname"
}) do
root.wireless.status[s.ifname][f] = iwinfo[f]
end
end
end end
end end
end) end)