nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

omit station-dump if no IBSS-interface is present

Browse Source 
In case no interface of type IBSS is found, the array interfaces is empty, nevertheless the for-loop iterates once (with empty values) causing the system-call to iw to fail.
Check interfaces before the loop to avoid garbage-output from iw on the status-page if meshing on wifi is deactivated.
This commit is contained in:
Matthias 2016-01-13 13:13:24 +01:00
parent e012e67bf1
commit dc81fda059
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/status
View File

@ -73,20 +73,22 @@ io.write("<h2>Neighbours</h2>")
local interfaces = util.split(util.trim(util.exec("iw dev | egrep 'type IBSS|type mesh' -B 5 | grep Interface | cut -d' ' -f2")))
for _, ifname in ipairs(interfaces) do
io.write("<h3>" .. escape_html(ifname) .. "</h3>")
io.write("<pre>")
if interfaces ~= {} then
for _, ifname in ipairs(interfaces) do
io.write("<h3>" .. escape_html(ifname) .. "</h3>")
io.write("<pre>")
for _, line in ipairs(util.split(util.exec("iw dev " .. ifname .. " station dump"))) do
local mac = line:match("^Station (.*) %(on ")
if mac then
io.write("Station <a id=\"" .. escape_html(ifname) .. "-" .. mac .. "\">" .. mac .. "</a> (on " .. escape_html(ifname) .. ")\n")
else
io.write(escape_html(line) .. "\n")
for _, line in ipairs(util.split(util.exec("iw dev " .. ifname .. " station dump"))) do
local mac = line:match("^Station (.*) %(on ")
if mac then
io.write("Station <a id=\"" .. escape_html(ifname) .. "-" .. mac .. "\">" .. mac .. "</a> (on " .. escape_html(ifname) .. ")\n")
else
io.write(escape_html(line) .. "\n")
end
end
end
io.write("</pre>")
io.write("</pre>")
end
end
local stat, fastd_status = pcall(