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

Merge pull request #1951 from tano-systems/luci-base-network-fix

Browse source 
luci-base: network.lua: bridge information request functions fixes
This commit is contained in:
Jo-Philipp Wich 2019-12-25 18:32:05 +01:00 committed by GitHub
commit 8362ab8d28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/luci-compat/luasrc/model/network.lua
View file

@ -371,6 +371,7 @@ function init(cursor)
b.ifnames[1].bridge = b b.ifnames[1].bridge = b
end end
_bridge[r[1]] = b _bridge[r[1]] = b
_interfaces[r[1]].bridge = b
elseif b then elseif b then
b.ifnames[#b.ifnames+1] = _interfaces[r[2]] b.ifnames[#b.ifnames+1] = _interfaces[r[2]]
b.ifnames[#b.ifnames].bridge = b b.ifnames[#b.ifnames].bridge = b
@ -1447,20 +1448,21 @@ function interface.ports(self)
for _, iface in ipairs(members) do for _, iface in ipairs(members) do
ifaces[#ifaces+1] = interface(iface) ifaces[#ifaces+1] = interface(iface)
end end
return ifaces
end end
end end
function interface.bridge_id(self) function interface.bridge_id(self)
if self.br then if self.dev and self.dev.bridge then
return self.br.id return self.dev.bridge.id
else else
return nil return nil
end end
end end
function interface.bridge_stp(self) function interface.bridge_stp(self)
if self.br then if self.dev and self.dev.bridge then
return self.br.stp return self.dev.bridge.stp
else else
return false return false
end end
@ -1479,7 +1481,8 @@ function interface.is_bridge(self)
end end
function interface.is_bridgeport(self) function interface.is_bridgeport(self)
return self.dev and self.dev.bridge and true or false return self.dev and self.dev.bridge and
(self.dev.bridge.name != self:name()) and true or false
end end
function interface.tx_bytes(self) function interface.tx_bytes(self)