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=956bd47e36cedd5674645e897c85f158f2695914;hp=44acab4721b659723bfc3063bba842b7cffd6952;hb=ff5a74c25fa9d12670f297fab204a61f9976305e;hpb=750b02349417205cfbdfc4a0c49a858f72ab0aa5

diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index 44acab472..956bd47e3 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.
@@ -17,20 +18,21 @@ function index()
 	luci.i18n.loadc("base")
 	local i18n = luci.i18n.translate
 
-	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", "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"}, 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", "load"}, template("admin_status/load"), i18n("Realtime Load"), 7).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", "bandwidth"}, template("admin_status/bandwidth"), i18n("Realtime Traffic"), 8).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", "connections"}, template("admin_status/connections"), i18n("Realtime Connections"), 8).leaf = true
+	entry({"admin", "status", "connections_status"}, call("action_connections")).leaf = true
 end
 
 function action_syslog()
@@ -44,8 +46,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")
 		)
@@ -111,3 +117,31 @@ function action_load()
 
 	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")
+
+	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
+
+			luci.http.write("]")
+			bwc:close()
+		end
+	end
+
+	luci.http.write(" }")
+end