From a6dcb3f6a3af704b6331e2fe789e57f692bf9c7f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 25 Sep 2011 11:58:24 +0000 Subject: [PATCH] libs/core: more fixes in network model --- libs/core/luasrc/model/network.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua index 983483d82..5e7d7d6b6 100644 --- a/libs/core/luasrc/model/network.lua +++ b/libs/core/luasrc/model/network.lua @@ -778,20 +778,20 @@ function network.get_interface(self) end function network.get_interfaces(self) - local ifaces = { } + if self:is_bridge() or (self:is_virtual() and not self:is_floating()) then + local ifaces = { } - local ifn - local nfs = { } - for ifn in utl.imatch(self:get("ifname")) do - ifn = ifn:match("^[^:/]+") - nfs[ifn] = interface(ifn, self) - end + local ifn + local nfs = { } + for ifn in utl.imatch(self:get("ifname")) do + ifn = ifn:match("^[^:/]+") + nfs[ifn] = interface(ifn, self) + end - for ifn in utl.kspairs(nfs) do - ifaces[#ifaces+1] = nfs[ifn] - end + for ifn in utl.kspairs(nfs) do + ifaces[#ifaces+1] = nfs[ifn] + end - if self:is_bridge() then local num = { } local wfs = { } uci_r:foreach("wireless", "wifi-iface", @@ -808,9 +808,9 @@ function network.get_interfaces(self) for ifn in utl.kspairs(wfs) do ifaces[#ifaces+1] = wfs[ifn] end - end - return ifaces + return ifaces + end end function network.contains_interface(self, ifname) -- 2.11.0