From: Jo-Philipp Wich Date: Fri, 17 Jun 2011 12:34:28 +0000 (+0000) Subject: modules/admin-full: display IPv4 routes in CIDR notation, filter FE80::/10 entries... X-Git-Tag: 0.11.0~2044 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70e5124557fc642e1e5fec681524f481e64c358a;p=oweals%2Fluci.git modules/admin-full: display IPv4 routes in CIDR notation, filter FE80::/10 entries in IPv6 route listing --- diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm index 52a80d98d..4e7287b70 100644 --- a/modules/admin-full/luasrc/view/admin_status/routes.htm +++ b/modules/admin-full/luasrc/view/admin_status/routes.htm @@ -58,15 +58,13 @@ $Id$ <%:Network%> <%:Target%> - <%_IPv4-Netmask%> <%_IPv4-Gateway%> <%:Metric%> <% luci.sys.net.routes(function(rt) %> <%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%> - <%=rt.dest:network():string()%> - <%=rt.dest:mask():string()%> + <%=rt.dest:string()%> <%=rt.gateway:string()%> <%=rt.metric%> @@ -76,7 +74,10 @@ $Id$
- <% 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") + %>
<%_Active IPv6-Routes%> @@ -88,7 +89,7 @@ $Id$ <%_IPv6-Gateway%> <%:Metric%> - <% luci.sys.net.routes6(function(rt) %> + <% luci.sys.net.routes6(function(rt) if fe80:contains(rt.dest) then return end %> <%=luci.tools.webadmin.iface_get_network(rt.device) or '(' .. rt.device .. ')'%> <%=rt.dest:string()%>