diff options
Diffstat (limited to 'modules/luci-compat/luasrc/model/network.lua')
| -rw-r--r-- | modules/luci-compat/luasrc/model/network.lua | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/modules/luci-compat/luasrc/model/network.lua b/modules/luci-compat/luasrc/model/network.lua index 7c88b428cc..b9ef19b171 100644 --- a/modules/luci-compat/luasrc/model/network.lua +++ b/modules/luci-compat/luasrc/model/network.lua @@ -25,7 +25,7 @@ IFACE_PATTERNS_WIRELESS = { "^wlan%d", "^wl%d", "^ath%d", "^%w+%.network%d" } IFACE_ERRORS = { CONNECT_FAILED = lng.translate("Connection attempt failed"), - INVALID_ADDRESS = lng.translate("IP address in invalid"), + INVALID_ADDRESS = lng.translate("IP address is invalid"), INVALID_GATEWAY = lng.translate("Gateway address is invalid"), INVALID_LOCAL_ADDRESS = lng.translate("Local IP address is invalid"), MISSING_ADDRESS = lng.translate("IP address is missing"), @@ -371,6 +371,7 @@ function init(cursor) b.ifnames[1].bridge = b end _bridge[r[1]] = b + _interfaces[r[1]].bridge = b elseif b then b.ifnames[#b.ifnames+1] = _interfaces[r[2]] b.ifnames[#b.ifnames].bridge = b @@ -1447,20 +1448,21 @@ function interface.ports(self) for _, iface in ipairs(members) do ifaces[#ifaces+1] = interface(iface) end + return ifaces end end function interface.bridge_id(self) - if self.br then - return self.br.id + if self.dev and self.dev.bridge then + return self.dev.bridge.id else return nil end end function interface.bridge_stp(self) - if self.br then - return self.br.stp + if self.dev and self.dev.bridge then + return self.dev.bridge.stp else return false end @@ -1479,7 +1481,8 @@ function interface.is_bridge(self) end 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 function interface.tx_bytes(self) |