From 6940edbdce86a6fec722b93875bf46d14b00c475 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 10 Jul 2009 19:11:37 +0000 Subject: [PATCH] modules/admin-full: speedup route status page by reimplementing it as template --- .../luasrc/controller/admin/status.lua | 2 +- .../luasrc/model/cbi/admin_status/routes.lua | 79 ---------------- .../luasrc/view/admin_status/routes.htm | 89 +++++++++++++++++++ 3 files changed, 90 insertions(+), 80 deletions(-) delete mode 100644 modules/admin-full/luasrc/model/cbi/admin_status/routes.lua create mode 100644 modules/admin-full/luasrc/view/admin_status/routes.htm diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua index d8fa9e9f6..57496be92 100644 --- a/modules/admin-full/luasrc/controller/admin/status.lua +++ b/modules/admin-full/luasrc/controller/admin/status.lua @@ -21,7 +21,7 @@ function index() entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("interfaces", "Interfaces"), 1) entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("a_s_ipt", "Firewall"), 2) entry({"admin", "status", "conntrack"}, form("admin_status/conntrack"), i18n("a_n_conntrack"), 3) - entry({"admin", "status", "routes"}, form("admin_status/routes"), i18n("a_n_routes"), 4) + entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("a_n_routes"), 4) entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 5) entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 6) diff --git a/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua deleted file mode 100644 index 5b147eff7..000000000 --- a/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua +++ /dev/null @@ -1,79 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2008 Steven Barth - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ -]]-- - -require("luci.tools.webadmin") -m = Map("network", translate("a_n_routes"), translate("a_n_routes1")) - -local routes = luci.sys.net.routes() -local routes6 = luci.sys.net.routes6() -local bit = require "bit" - -v = m:section(Table, routes, translate("a_n_routes_kernel4")) - -net = v:option(DummyValue, "iface", translate("network")) -function net.cfgvalue(self, section) - return luci.tools.webadmin.iface_get_network(routes[section].device) - or routes[section].device -end - -target = v:option(DummyValue, "target", translate("target")) -function target.cfgvalue(self, section) - return routes[section].dest:network():string() -end - -netmask = v:option(DummyValue, "netmask", translate("netmask")) -function netmask.cfgvalue(self, section) - return routes[section].dest:mask():string() -end - -gateway = v:option(DummyValue, "gateway", translate("gateway")) -function gateway.cfgvalue(self, section) - return routes[section].gateway:string() -end - -metric = v:option(DummyValue, "metric", translate("metric")) -function metric.cfgvalue(self, section) - return routes[section].metric -end - -if routes6 then - v = m:section(Table, routes6, translate("a_n_routes_kernel6")) - - net = v:option(DummyValue, "iface", translate("network")) - function net.cfgvalue(self, section) - return luci.tools.webadmin.iface_get_network(routes6[section].device) - or routes6[section].device - end - - target = v:option(DummyValue, "target", translate("target")) - function target.cfgvalue(self, section) - return routes6[section].dest:string() - end - - gateway = v:option(DummyValue, "gateway", translate("gateway6")) - function gateway.cfgvalue(self, section) - return routes6[section].source:string() - end - - metric = v:option(DummyValue, "metric", translate("metric")) - function metric.cfgvalue(self, section) - local metr = routes6[section].metric - local lower = bit.band(metr, 0xffff) - local higher = bit.rshift(bit.band(metr, 0xffff0000), 16) - return "%04X%04X" % {higher, lower} - end -end - - -return m diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm new file mode 100644 index 000000000..7bde82b17 --- /dev/null +++ b/modules/admin-full/luasrc/view/admin_status/routes.htm @@ -0,0 +1,89 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008-2009 Steven Barth +Copyright 2008-2009 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +-%> + +<%- + require "bit" + require "luci.fs" + require "luci.sys" + require "luci.tools.webadmin" + + local style = true +-%> + +<%+header%> + +
+

<%:a_n_routes%>

+
<%:a_n_routes1%>
+ +
+ <%:a_n_routes_kernel4%> + +
+ + + + + + + + + <% luci.sys.net.routes(function(rt) %> + + + + + + + + <% style = not style; end) %> +
<%:network%><%:target%><%:netmask%><%:gateway%><%:metric%>
<%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%><%=rt.dest:network():string()%><%=rt.dest:mask():string()%><%=rt.gateway:string()%><%=rt.metric%>
+
+
+
+ + <% if luci.fs.access("/proc/net/ipv6_route") then style = true %> +
+ <%:a_n_routes_kernel6%> + +
+ + + + + + + + <% luci.sys.net.routes6(function(rt) %> + + + + + + + <% style = not style; end) %> +
<%:network%><%:target%><%:gateway6%><%:metric%>
<%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%><%=rt.dest:string()%><%=rt.source:string()%><%- + local metr = rt.metric + local lower = bit.band(metr, 0xffff) + local higher = bit.rshift(bit.band(metr, 0xffff0000), 16) + write(string.format("%04X%04X", higher, lower)) + -%>
+
+
+
+ <% end %> +
+ +<%+footer%> -- 2.25.1