modules/admin-full: display IPv4 routes in CIDR notation, filter FE80::/10 entries...

[project/luci.git] / modules / admin-full / luasrc / view / admin_status / routes.htm

diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm
index dcfb4ec..4e7287b 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -26,7 +26,29 @@ $Id$
 
 <div class="cbi-map" id="cbi-network">
        <h2><a id="content" name="content"><%:Routes%></a></h2>
-       <div class="cbi-map-descr"><%:a_n_routes1%></div>
+       <div class="cbi-map-descr"><%:The following rules are currently active on this system.%></div>
+
+       <fieldset class="cbi-section" id="cbi-table-table">
+               <legend>ARP</legend>
+               <div class="cbi-section-node">
+                       <table class="cbi-section-table">
+                               <tr class="cbi-section-table-titles">
+                                       <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></th>
+                                       <th class="cbi-section-table-cell"><%_<abbr title="Media Access Control">MAC</abbr>-Address%></th>
+                                       <th class="cbi-section-table-cell"><%:Interface%></th>
+                               </tr>
+
+                               <% luci.sys.net.arptable(function(e) %>
+                               <tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+                                       <td class="cbi-value-field"><%=e["IP address"]%></td>
+                                       <td class="cbi-value-field"><%=e["HW address"]%></td>
+                                       <td class="cbi-value-field"><%=e["Device"]%></td>
+                               </tr>
+                               <% style = not style; end) %>
+                       </table>
+               </div>
+       </fieldset>
+       <br />
 
        <fieldset class="cbi-section" id="cbi-table-table">
                <legend><%_Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend>
@@ -36,15 +58,13 @@ $Id$
                                <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"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Netmask%></th>
                                        <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-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.dest:string()%></td>
                                        <td class="cbi-value-field"><%=rt.gateway:string()%></td>
                                        <td class="cbi-value-field"><%=rt.metric%></td>
                                </tr>
@@ -54,7 +74,10 @@ $Id$
        </fieldset>
        <br />
 
-       <% if nixio.fs.access("/proc/net/ipv6_route") then style = true %>
+       <% if nixio.fs.access("/proc/net/ipv6_route") then
+               style = true
+               fe80 = luci.ip.IPv6("fe80::/10")
+       %>
        <fieldset class="cbi-section" id="cbi-table-table">
                <legend><%_Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes%></legend>
 
@@ -66,17 +89,12 @@ $Id$
                                        <th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 6">IPv6</abbr>-Gateway%></th>
                                        <th class="cbi-section-table-cell"><%:Metric%></th>
                                </tr>
-                               <% luci.sys.net.routes6(function(rt) %>
+                               <% luci.sys.net.routes6(function(rt) if fe80:contains(rt.dest) then return end %>
                                <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"><%=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>
+                                       <td class="cbi-value-field"><%=rt.metric_raw:upper()%></td>
                                </tr>
                                <% style = not style; end) %>
                        </table>