modules/admin-full: speedup route status page by reimplementing it as template

diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index d8fa9e9f60a12264ac0a172cb21dffaac34f58ff..57496be92b9e76f00f5f063c5b33417a2a9da154 100644 (file)
--- 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 (file)
index 5b147ef..0000000
--- 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 <steven@midlink.org>
-
-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 (file)
index 0000000..7bde82b
--- /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 <steven@midlink.org>
+Copyright 2008-2009 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.
+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%>
+
+<div class="cbi-map" id="cbi-network">
+       <h2><a id="content" name="content"><%:a_n_routes%></a></h2>
+       <div class="cbi-map-descr"><%:a_n_routes1%></div>
+
+       <fieldset class="cbi-section" id="cbi-table-table">
+               <legend><%:a_n_routes_kernel4%></legend>
+
+               <div class="cbi-section-node">
+                       <table class="cbi-section-table">
+                               <tr class="cbi-section-table-titles">
+                                       <th class="cbi-section-table-cell"><%:network%></th>
+                                       <th class="cbi-section-table-cell"><%:target%></th>
+                                       <th class="cbi-section-table-cell"><%:netmask%></th>
+                                       <th class="cbi-section-table-cell"><%:gateway%></th>
+                                       <th class="cbi-section-table-cell"><%:metric%></th>
+                               </tr>
+                               <% luci.sys.net.routes(function(rt) %>
+                               <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+                                       <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%></td>
+                                       <td class="cbi-value-field"><%=rt.dest:network():string()%></td>
+                                       <td class="cbi-value-field"><%=rt.dest:mask():string()%></td>
+                                       <td class="cbi-value-field"><%=rt.gateway:string()%></td>
+                                       <td class="cbi-value-field"><%=rt.metric%></td>
+                               </tr>
+                               <% style = not style; end) %>
+                       </table>
+               </div>
+       </fieldset>
+       <br />
+
+       <% if luci.fs.access("/proc/net/ipv6_route") then style = true %>
+       <fieldset class="cbi-section" id="cbi-table-table">
+               <legend><%:a_n_routes_kernel6%></legend>
+
+               <div class="cbi-section-node">
+                       <table class="cbi-section-table">
+                               <tr class="cbi-section-table-titles">
+                                       <th class="cbi-section-table-cell"><%:network%></th>
+                                       <th class="cbi-section-table-cell"><%:target%></th>
+                                       <th class="cbi-section-table-cell"><%:gateway6%></th>
+                                       <th class="cbi-section-table-cell"><%:metric%></th>
+                               </tr>
+                               <% luci.sys.net.routes6(function(rt) %>
+                               <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+                                       <td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%></td>
+                                       <td class="cbi-value-field"><%=rt.dest:string()%></td>
+                                       <td class="cbi-value-field"><%=rt.source:string()%></td>
+                                       <td class="cbi-value-field"><%- 
+                                               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))
+                                       -%></td>
+                               </tr>
+                               <% style = not style; end) %>
+                       </table>
+               </div>
+       </fieldset>
+       <br />
+       <% end %>
+</div>
+
+<%+footer%>