X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fcore%2Fluasrc%2Fmodel%2Fnetwork.lua;h=bb98f822338ccafbbd1fbc349d6162dadb34cd9a;hb=95886d45851f34baf0d66a31f217661f21a81f88;hp=ed40dc2ff932b47f4ba2b3fce3edf6642a3e2249;hpb=ddd1ba088ed3b93b3485e34d05c427d43306c744;p=project%2Fluci.git

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index ed40dc2ff..bb98f8223 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -93,16 +93,6 @@ function _stror(s1, s2)
 	end
 end
 
-function _strlist(x)
-	if x == nil then
-		x = ""
-	elseif type(x) == "table" then
-		x = table.concat(x, " ")
-	end
-
-	return x:gmatch("%S+")
-end
-
 function _get(c, s, o)
 	return uci_r:get(c, s, o)
 end
@@ -619,7 +609,7 @@ function network.get_interfaces(self)
 		ifaces = { interface(ifn) }
 	else
 		local nfs = { }
-		for ifn in _strlist(self:get("ifname")) do
+		for ifn in utl.imatch(self:get("ifname")) do
 			ifn = ifn:match("[^:]+")
 			nfs[ifn] = interface(ifn)
 		end
@@ -661,7 +651,7 @@ function network.contains_interface(self, ifname)
 		ifn = self:proto() .. "-" .. self.sid
 		return ifname == ifn
 	else
-		for ifn in _strlist(self:get("ifname")) do
+		for ifn in utl.imatch(self:get("ifname")) do
 			ifn = ifn:match("[^:]+")
 			if ifn == ifname then
 				return true