X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fstatus.lua;h=a408bb44f4251679f224d38874dc429cb5cde428;hp=d283627ebf2be7df88676757ee10b03442af9b52;hb=18677e216b26acc148387c5414756a5b94c8a17c;hpb=ae3825387bd9b47813e0b862db38959e7000cb02

diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index d283627eb..a408bb44f 100644
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -2,6 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,15 +20,20 @@ function index()
 
 	entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true
 	entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("Interfaces"), 1)
-	entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2)
+	entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2).leaf = true
 	entry({"admin", "status", "conntrack"}, template("admin_status/conntrack"), i18n("Active Connections"), 3)
 	entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 4)
 	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 5)
 	entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("Kernel Log"), 6)
 
-	entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), i18n("Realtime Traffic"), 7).leaf = true
+	entry({"admin", "status", "load"}, template("admin_status/load"), i18n("Realtime Load"), 7).leaf = true
+	entry({"admin", "status", "load_status"}, call("action_load")).leaf = true
+
+	entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), i18n("Realtime Traffic"), 8).leaf = true
 	entry({"admin", "status", "bandwidth_status"}, call("action_bandwidth")).leaf = true
 
+	entry({"admin", "status", "connections"}, template("admin_status/connections"), i18n("Realtime Connections"), 9).leaf = true
+	entry({"admin", "status", "connections_status"}, call("action_connections")).leaf = true
 end
 
 function action_syslog()
@@ -41,8 +47,12 @@ function action_dmesg()
 end
 
 function action_iptables()
-	if luci.http.formvalue("zero") == "1" then
-		luci.util.exec("iptables -Z")
+	if luci.http.formvalue("zero") then
+		if luci.http.formvalue("zero") == "6" then
+			luci.util.exec("ip6tables -Z")
+		else
+			luci.util.exec("iptables -Z")
+		end
 		luci.http.redirect(
 			luci.dispatcher.build_url("admin", "status", "iptables")
 		)
@@ -61,10 +71,60 @@ function action_bandwidth()
 	local iface = path[#path]
 
 	local fs = require "luci.fs"
-	if fs.access("/var/lib/luci-bwc/%s" % iface) then
+	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("[")
+
+			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
+
+		return
+	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()
+		end
+
+		return
+	end
+
+	luci.http.status(404, "No data available")
+end
+
+function action_connections()
+	local fs = require "luci.fs"
+	if fs.access("/var/lib/luci-bwc/connections") then
 		luci.http.prepare_content("application/json")
 
-		local bwc = io.popen("luci-bwc -p %q 2>/dev/null" % iface)
+		local bwc = io.popen("luci-bwc -c 2>/dev/null")
 		if bwc then
 			luci.http.write("[")
 
@@ -81,5 +141,5 @@ function action_bandwidth()
 		return
 	end
 
-	luci.http.status(404, "No such interface")
+	luci.http.status(404, "No data available")
 end