From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 26 Apr 2016 18:54:52 +0000 (+0200)
Subject: luci-base: fix luci.model.network.ignore_interface()
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=4983a9b034ac3f7c9f4f228110e622d900d6198d

luci-base: fix luci.model.network.ignore_interface()

Fix the underlying _iface_ignore() function to not ignore virtual interfaces,
in order to let ignore_interface() return true for PPP and similar devices.

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

diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua
index 741daa481..880fac59e 100644
--- a/modules/luci-base/luasrc/model/network.lua
+++ b/modules/luci-base/luasrc/model/network.lua
@@ -190,7 +190,7 @@ function _iface_ignore(x)
 			return true
 		end
 	end
-	return _iface_virtual(x)
+	return false
 end
 
 
@@ -216,7 +216,7 @@ function init(cursor)
 			_tunnel[name] = true
 		end
 
-		if _tunnel[name] or not _iface_ignore(name) then
+		if _tunnel[name] or not (_iface_ignore(name) or _iface_virtual(name)) then
 			_interfaces[name] = _interfaces[name] or {
 				idx      = i.ifindex or n,
 				name     = name,
@@ -500,7 +500,7 @@ function get_interfaces(self)
 	_uci:foreach("network", "interface",
 		function(s)
 			for iface in utl.imatch(s.ifname) do
-				if not _iface_ignore(iface) and not _wifi_iface(iface) then
+				if not _iface_ignore(iface) and not _iface_virtual(iface) and not _wifi_iface(iface) then
 					seen[iface] = true
 					nfs[iface] = interface(iface)
 				end
@@ -508,7 +508,7 @@ function get_interfaces(self)
 		end)
 
 	for iface in utl.kspairs(_interfaces) do
-		if not (seen[iface] or _iface_ignore(iface) or _wifi_iface(iface)) then
+		if not (seen[iface] or (_iface_ignore(iface) or _iface_virtual(iface) or _wifi_iface(iface)) then
 			nfs[iface] = interface(iface)
 		end
 	end