modules/admin-full: add wireless live stats

[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 f9bfd90..3b23055 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -16,6 +16,8 @@ $Id$
 module("luci.controller.admin.status", package.seeall)
 
 function index()
+       local function _(x) return x end
+
        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
@@ -29,7 +31,10 @@ function index()
        entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), _("Realtime Traffic"), 7).leaf = true
        entry({"admin", "status", "bandwidth_status"}, call("action_bandwidth")).leaf = true
 
-       entry({"admin", "status", "connections"}, template("admin_status/connections"), _("Realtime Connections"), 8).leaf = true
+       entry({"admin", "status", "wireless"}, template("admin_status/wireless"), _("Realtime Wireless"), 8).leaf = true
+       entry({"admin", "status", "wireless_status"}, call("action_wireless")).leaf = true
+
+       entry({"admin", "status", "connections"}, template("admin_status/connections"), _("Realtime Connections"), 9).leaf = true
        entry({"admin", "status", "connections_status"}, call("action_connections")).leaf = true
 
        entry({"admin", "status", "processes"}, cbi("admin_status/processes"), _("Processes"), 20)
@@ -69,57 +74,63 @@ function action_bandwidth()
        local path  = luci.dispatcher.context.requestpath
        local iface = path[#path]
 
-       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("[")
+       luci.http.prepare_content("application/json")
 
-                       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 -i %q 2>/dev/null" % iface)
+       if bwc then
+               luci.http.write("[")
 
-                       luci.http.write("]")
-                       bwc:close()
+               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
+end
+
+function action_wireless()
+       local path  = luci.dispatcher.context.requestpath
+       local iface = path[#path]
+
+       luci.http.prepare_content("application/json")
 
-       luci.http.status(404, "No data available")
+       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
+
+               luci.http.write("]")
+               bwc:close()
+       end
 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,20 +138,18 @@ 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: [")
+       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
-
-                       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(" }")