From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 17 Jun 2011 12:36:38 +0000 (+0000)
Subject: luci-0.10: merge r7168
X-Git-Tag: 0.10.0~118
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c8324500a42b05c89063090e3530377c8123ebc1;p=oweals%2Fluci.git

luci-0.10: merge r7168
---

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$
 				<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>
@@ -76,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>
 
@@ -88,7 +89,7 @@ $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"><%=rt.dest:string()%></td>