From 672a7cfb6f63a1db792bbab09ea36ab7544e6e34 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Sat, 17 Aug 2013 13:57:44 +0200
Subject: [PATCH] Revert "Revert "Adapt tunnels web view to new bmx6 syntax and
 options""

This reverts commit 6360d4c977b6b8fb6b0c80e0fcd29f43e0cc1cba.
---
 .../files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm
index 1b7ce42..d4cc38b 100644
--- a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm
+++ b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm
@@ -71,7 +71,8 @@
 			<th class="cbi-section-table-cell"><%:IP metric%></th>
 			<th class="cbi-section-table-cell"><%:Tun metric%></th>
 			<th class="cbi-section-table-cell"><%:Bonus%></th>
-			<th class="cbi-section-table-cell"><%:search id%></th>
+			<th class="cbi-section-table-cell"><%:Src%></th>
+			<th class="cbi-section-table-cell"><%:Search id%></th>
 		</tr>
 		<tr class="cbi-section-table-row">
 			<td colspan="10"><em><br /><%:Collecting data...%></em></td>
@@ -89,15 +90,15 @@
 		  var res = Array();
                   for ( var k in st.tunnels ){
                         var tunnel = st.tunnels[k];
-                        var nodename = tunnel.remoteId.replace(/\..+$/,'');
+                        var nodename = tunnel.remoteName.replace(/\..+$/,'');
 			var advnet = tunnel.advNet;
 			var status = '<img src="'+tunicon_dis+'"/>';
 			
 			if ( tunnel.tunName != "---" ) status = '<img src="'+tunicon+'"/>';
 			if ( advnet == "0.0.0.0/0" ) advnet = "<b>Internet</b>";
 
-			res.push([status, tunnel.name, nodename, advnet, tunnel.advBw, tunnel.searchNet, tunnel.advType,
-				tunnel.pathMtc, tunnel.ipMtc, tunnel.tunMtc, tunnel.bonus, tunnel.searchId]);
+			res.push([status, tunnel.name, nodename, advnet, tunnel.advBw, tunnel.net, tunnel.advType,
+				tunnel.pathMtc, tunnel.ipMtc, tunnel.tunMtc, tunnel.bonus, tunnel.srcIngress, tunnel.id]);
 		  }
 		  return res;
 		});
-- 
2.30.2