Changeset 5391

Timestamp:

10/10/09 15:53:39 (4 years ago)

Author:

jow

Message:

libs/core: fixes for network model

Files:

• luci/trunk/libs/core/luasrc/model/network.lua (modified) (7 diffs)

luci/trunk/libs/core/luasrc/model/network.lua

@@ -33 +33 @@
 
 local ub = uct.bind("network")
-local ifs, brs
+local ifs, brs, sws
 
 function init(cursor)
@@ -43 +43 @@
         ifs = { }
         brs = { }
+        sws = { }
 
         -- read interface information
@@ -48 +49 @@
         for n, i in ipairs(nxo.getifaddrs()) do
             local name = i.name:match("[^:]+")
+            local prnt = name:match("^([^%.]+)%.")
 
             if not _M:ignore_interface(name) then
@@ -58 +60 @@
                     ip6addrs = { }
                 }
+
+                if prnt then
+                    sws[name] = true
+                    sws[prnt] = true
+                end
 
                 if i.family == "packet" then
@@ -230 +237 @@
     local ifaces = { }
     local iface
-    for _, iface in ub:list(
-        (self:ifname() or '') .. ' ' .. (self:device() or '')
-    ) do
+    for _, iface in ipairs(ub:list(self:ifname())) do
         iface = iface:match("[^:]+")
         if ifs[iface] then
@@ -243 +248 @@
 function network.contains_interface(self, iface)
     local i
-    local ifaces = ub:list(
-        (self:ifname() or '') .. ' ' .. (self:device() or '')
-    )
+    local ifaces = ub:list(self:ifname())
 
     if type(iface) ~= "string" then
@@ -291 +294 @@
     elseif brs[self.ifname] then
         return "bridge"
-    elseif self.ifname:match("%.") then
+    elseif sws[self.ifname] or self.ifname:match("%.") then
         return "switch"
     else