From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 6 Nov 2019 12:22:10 +0000 (+0100)
Subject: luci-base: network.js: prevent duplicate wan interface reporting
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8a76978298ba1cfddadbb48da73fa2abde82692;p=oweals%2Fluci.git

luci-base: network.js: prevent duplicate wan interface reporting

Fixes: #3269
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 7c5d2b974..b29a100e9 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -1471,10 +1471,14 @@ Network = L.Class.extend(/** @lends LuCI.Network.prototype */ {
 	 */
 	getWANNetworks: function() {
 		return this.getStatusByRoute('0.0.0.0', 0).then(L.bind(function(statuses) {
-			var rv = [];
+			var rv = [], seen = {};
 
-			for (var i = 0; i < statuses.length; i++)
-				rv.push(this.instantiateNetwork(statuses[i].interface, statuses[i].proto));
+			for (var i = 0; i < statuses.length; i++) {
+				if (!seen.hasOwnProperty(statuses[i].interface)) {
+					rv.push(this.instantiateNetwork(statuses[i].interface, statuses[i].proto));
+					seen[statuses[i].interface] = true;
+				}
+			}
 
 			return rv;
 		}, this));
@@ -1492,10 +1496,14 @@ Network = L.Class.extend(/** @lends LuCI.Network.prototype */ {
 	 */
 	getWAN6Networks: function() {
 		return this.getStatusByRoute('::', 0).then(L.bind(function(statuses) {
-			var rv = [];
+			var rv = [], seen = {};
 
-			for (var i = 0; i < statuses.length; i++)
-				rv.push(this.instantiateNetwork(statuses[i].interface, statuses[i].proto));
+			for (var i = 0; i < statuses.length; i++) {
+				if (!seen.hasOwnProperty(statuses[i].interface)) {
+					rv.push(this.instantiateNetwork(statuses[i].interface, statuses[i].proto));
+					seen[statuses[i].interface] = true;
+				}
+			}
 
 			return rv;
 		}, this));