projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: filter shell arguments through shellquote() where applicable
[project/luci.git]
/
modules
/
luci-mod-admin-full
/
luasrc
/
controller
/
admin
/
status.lua
diff --git
a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
index
ad575e0
..
3a1c169
100644
(file)
--- a/
modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
+++ b/
modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
@@
-62,7
+62,9
@@
end
function action_bandwidth(iface)
luci.http.prepare_content("application/json")
function action_bandwidth(iface)
luci.http.prepare_content("application/json")
- local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
+ local bwc = io.popen("luci-bwc -i %s 2>/dev/null"
+ % luci.util.shellquote(iface))
+
if bwc then
luci.http.write("[")
if bwc then
luci.http.write("[")
@@
-80,7
+82,9
@@
end
function action_wireless(iface)
luci.http.prepare_content("application/json")
function action_wireless(iface)
luci.http.prepare_content("application/json")
- local bwc = io.popen("luci-bwc -r %q 2>/dev/null" % iface)
+ local bwc = io.popen("luci-bwc -r %s 2>/dev/null"
+ % luci.util.shellquote(iface))
+
if bwc then
luci.http.write("[")
if bwc then
luci.http.write("[")
@@
-139,14
+143,12
@@
function action_connections()
end
function action_nameinfo(...)
end
function action_nameinfo(...)
- local i
- local rv = { }
- for i = 1, select('#', ...) do
- local addr = select(i, ...)
- local fqdn = nixio.getnameinfo(addr)
- rv[addr] = fqdn or (addr:match(":") and "[%s]" % addr or addr)
- end
+ local util = require "luci.util"
luci.http.prepare_content("application/json")
luci.http.prepare_content("application/json")
- luci.http.write_json(rv)
+ luci.http.write_json(util.ubus("network.rrdns", "lookup", {
+ addrs = { ... },
+ timeout = 5000,
+ limit = 1000
+ }) or { })
end
end