modules/admin-full: use firewall reload action

[project/luci.git] / modules / admin-full / luasrc / controller / admin / status.lua

diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index 956bd47..89ebda7 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -12,27 +12,33 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 module("luci.controller.admin.status", package.seeall)
 
 function index()
-       luci.i18n.loadc("base")
-       local i18n = luci.i18n.translate
+       entry({"admin", "status"}, alias("admin", "status", "overview"), _("Status"), 20).index = true
+       entry({"admin", "status", "overview"}, template("admin_status/index"), _("Overview"), 1)
+       entry({"admin", "status", "iptables"}, call("action_iptables"), _("Firewall"), 2).leaf = true
+       entry({"admin", "status", "routes"}, template("admin_status/routes"), _("Routes"), 3)
+       entry({"admin", "status", "syslog"}, call("action_syslog"), _("System Log"), 4)
+       entry({"admin", "status", "dmesg"}, call("action_dmesg"), _("Kernel Log"), 5)
+       entry({"admin", "status", "processes"}, cbi("admin_status/processes"), _("Processes"), 6)
+
+       entry({"admin", "status", "realtime"}, alias("admin", "status", "realtime", "load"), _("Realtime Graphs"), 7)
+
+       entry({"admin", "status", "realtime", "load"}, template("admin_status/load"), _("Load"), 1).leaf = true
+       entry({"admin", "status", "realtime", "load_status"}, call("action_load")).leaf = true
 
-       entry({"admin", "status"}, alias("admin", "status", "overview"), i18n("Status"), 20).index = true
-       entry({"admin", "status", "overview"}, template("admin_status/index"), i18n("Overview"), 1)
-       entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2).leaf = true
-       entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 3)
-       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 4)
-       entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("Kernel Log"), 5)
+       entry({"admin", "status", "realtime", "bandwidth"}, template("admin_status/bandwidth"), _("Traffic"), 2).leaf = true
+       entry({"admin", "status", "realtime", "bandwidth_status"}, call("action_bandwidth")).leaf = true
 
-       entry({"admin", "status", "load"}, template("admin_status/load"), i18n("Realtime Load"), 6).leaf = true
-       entry({"admin", "status", "load_status"}, call("action_load")).leaf = true
+       entry({"admin", "status", "realtime", "wireless"}, template("admin_status/wireless"), _("Wireless"), 3).leaf = true
+       entry({"admin", "status", "realtime", "wireless_status"}, call("action_wireless")).leaf = true
 
-       entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), i18n("Realtime Traffic"), 7).leaf = true
-       entry({"admin", "status", "bandwidth_status"}, call("action_bandwidth")).leaf = true
+       entry({"admin", "status", "realtime", "connections"}, template("admin_status/connections"), _("Connections"), 4).leaf = true
+       entry({"admin", "status", "realtime", "connections_status"}, call("action_connections")).leaf = true
 
-       entry({"admin", "status", "connections"}, template("admin_status/connections"), i18n("Realtime Connections"), 8).leaf = true
-       entry({"admin", "status", "connections_status"}, call("action_connections")).leaf = true
+       entry({"admin", "status", "nameinfo"}, call("action_nameinfo")).leaf = true
 end
 
 function action_syslog()
@@ -56,7 +62,7 @@ function action_iptables()
                        luci.dispatcher.build_url("admin", "status", "iptables")
                )
        elseif luci.http.formvalue("restart") == "1" then
-               luci.util.exec("/etc/init.d/firewall restart")
+               luci.util.exec("/etc/init.d/firewall reload")
                luci.http.redirect(
                        luci.dispatcher.build_url("admin", "status", "iptables")
                )
@@ -65,61 +71,61 @@ function action_iptables()
        end
 end
 
-function action_bandwidth()
-       local path  = luci.dispatcher.context.requestpath
-       local iface = path[#path]
+function action_bandwidth(iface)
+       luci.http.prepare_content("application/json")
 
-       local fs = require "luci.fs"
-       if fs.access("/var/lib/luci-bwc/if/%s" % iface) then
-               luci.http.prepare_content("application/json")
+       local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
+       if bwc then
+               luci.http.write("[")
 
-               local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
-               if bwc then
-                       luci.http.write("[")
+               while true do
+                       local ln = bwc:read("*l")
+                       if not ln then break end
+                       luci.http.write(ln)
+               end
 
-                       while true do
-                               local ln = bwc:read("*l")
-                               if not ln then break end
-                               luci.http.write(ln)
-                       end
+               luci.http.write("]")
+               bwc:close()
+       end
+end
+
+function action_wireless(iface)
+       luci.http.prepare_content("application/json")
 
-                       luci.http.write("]")
-                       bwc:close()
+       local bwc = io.popen("luci-bwc -r %q 2>/dev/null" % iface)
+       if bwc then
+               luci.http.write("[")
+
+               while true do
+                       local ln = bwc:read("*l")
+                       if not ln then break end
+                       luci.http.write(ln)
                end
 
-               return
+               luci.http.write("]")
+               bwc:close()
        end
-
-       luci.http.status(404, "No data available")
 end
 
 function action_load()
-       local fs = require "luci.fs"
-       if fs.access("/var/lib/luci-bwc/load") then
-               luci.http.prepare_content("application/json")
-
-               local bwc = io.popen("luci-bwc -l 2>/dev/null")
-               if bwc then
-                       luci.http.write("[")
-
-                       while true do
-                               local ln = bwc:read("*l")
-                               if not ln then break end
-                               luci.http.write(ln)
-                       end
-
-                       luci.http.write("]")
-                       bwc:close()
+       luci.http.prepare_content("application/json")
+
+       local bwc = io.popen("luci-bwc -l 2>/dev/null")
+       if bwc then
+               luci.http.write("[")
+
+               while true do
+                       local ln = bwc:read("*l")
+                       if not ln then break end
+                       luci.http.write(ln)
                end
 
-               return
+               luci.http.write("]")
+               bwc:close()
        end
-
-       luci.http.status(404, "No data available")
 end
 
 function action_connections()
-       local fs  = require "luci.fs"
        local sys = require "luci.sys"
 
        luci.http.prepare_content("application/json")
@@ -127,21 +133,32 @@ function action_connections()
        luci.http.write("{ connections: ")
        luci.http.write_json(sys.net.conntrack())
 
-       if fs.access("/var/lib/luci-bwc/connections") then
-               local bwc = io.popen("luci-bwc -c 2>/dev/null")
-               if bwc then
-                       luci.http.write(", statistics: [")
-
-                       while true do
-                               local ln = bwc:read("*l")
-                               if not ln then break end
-                               luci.http.write(ln)
-                       end
+       local bwc = io.popen("luci-bwc -c 2>/dev/null")
+       if bwc then
+               luci.http.write(", statistics: [")
 
-                       luci.http.write("]")
-                       bwc:close()
+               while true do
+                       local ln = bwc:read("*l")
+                       if not ln then break end
+                       luci.http.write(ln)
                end
+
+               luci.http.write("]")
+               bwc:close()
        end
 
        luci.http.write(" }")
 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
+
+       luci.http.prepare_content("application/json")
+       luci.http.write_json(rv)
+end