Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/core: more fixes in network model

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-09-25 11:58:24 +00:00
parent dc46ee35b8
commit a6dcb3f6a3
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/core/luasrc/model/network.lua
View file

@ -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)