Changeset 5405 for luci/trunk/libs/core/luasrc/model/network.lua

Timestamp:

10/15/09 17:30:17 (4 years ago)

Author:

jow

Message:

libs/core: implement special treatment of wireless in network model

Files:

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

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

@@ -18 +18 @@
 ]]--
 
-local type, pairs, ipairs, table, i18n
-    = type, pairs, ipairs, table, luci.i18n
+local type, pairs, ipairs, loadfile, table, i18n
+    = type, pairs, ipairs, loadfile, table, luci.i18n
 
 local lmo = require "lmo"
@@ -31 +31 @@
 module "luci.model.network"
 
+-- load extensions
+local ext
+local handler = { }
+
+for ext in nfs.glob(utl.libpath() .. "/model/network/*.lua") do
+    if nfs.access(ext) then
+        local m = loadfile(ext)
+        if m then
+            handler[#handler+1] = m()
+        end
+    end
+end
+
+function foreach_handler(code, ...)
+    local h
+    for _, h in ipairs(handler) do
+        if code(h, ...) then
+            return true
+        end
+    end
+    return false
+end
 
 local ub = uct.bind("network")
@@ -44 +66 @@
         brs = { }
         sws = { }
+
+        -- init handler
+        foreach_handler(function(h)
+            h:init(cursor)
+            h:find_interfaces(ifs, brs)
+        end)
 
         -- read interface information
@@ -76 +104 @@
                 end
             end
-        end     
+        end
 
         -- read bridge informaton
@@ -151 +179 @@
                 end
             end)
+
+        foreach_handler(function(h) h:del_network(n) end)
     end
     return r
@@ -180 +210 @@
                     end
                 end)
+
+            foreach_handler(function(h) h:rename_network(old, new) end)
         end
     end
@@ -199 +231 @@
 
 function ignore_interface(self, x)
-    return (x:match("^wmaster%d") or x:match("^wifi%d")
-        or x:match("^hwsim%d") or x:match("^imq%d") or x == "lo")
+    if foreach_handler(function(h) return h:ignore_interface(x) end) then
+        return true
+    else
+        return (x:match("^wmaster%d") or x:match("^wifi%d")
+            or x:match("^hwsim%d") or x:match("^imq%d") or x == "lo")
+    end
 end
 
@@ -219 +255 @@
 
 function network.add_interface(self, ifname)
+    local ifaces, iface
+
     if type(ifname) ~= "string" then
-        ifname = ifname:name()
-    end
-    if ifs[ifname] then
-        self:ifname(ub:list((self:ifname() or ''), ifname))
+        ifaces = { ifname:name() }
+    else
+        ifaces = ub:list(ifname)
+    end
+
+    for _, iface in ipairs(ifaces) do
+        if ifs[iface] then
+            -- make sure the interface is removed from all networks
+            local i = interface(iface)
+            local n = i:get_network()
+            if n then n:del_interface(iface) end
+
+            if ifs[iface].handler then
+                ifs[iface].handler:add_interface(self, iface, ifs[iface])
+            else
+                self:ifname(ub:list((self:ifname() or ''), iface))
+            end
+        end
     end
 end
@@ -231 +283 @@
         ifname = ifname:name()
     end
-    self:ifname(ub:list((self:ifname() or ''), nil, ifname))
+
+    if ifs[ifname] and ifs[ifname].handler then
+        ifs[ifname].handler:del_interface(self, ifname, ifs[ifname])
+    else
+        self:ifname(ub:list((self:ifname() or ''), nil, ifname))
+    end
 end
 
@@ -243 +300 @@
         end
     end
+    for iface, _ in pairs(ifs) do
+        if ifs[iface].network == self:name() then
+            ifaces[#ifaces+1] = interface(iface)
+        end
+    end
     return ifaces
 end
@@ -256 +318 @@
     for _, i in ipairs(ifaces) do
         if i == iface then
+            return true
+        end
+    end
+
+    for i, _ in pairs(ifs) do
+        if ifs[i].dev and ifs[i].dev.network == self:name() then
             return true
         end
@@ -290 +358 @@
 
 function interface.type(self)
-    if iwi.type(self.ifname) and iwi.type(self.ifname) ~= "dummy" then
-        return "wifi"
+    if self.dev and self.dev.type then
+        return self.dev.type
     elseif brs[self.ifname] then
         return "bridge"
@@ -298 +366 @@
     else
         return "ethernet"
+    end
+end
+
+function interface.shortname(self)
+    if self.dev and self.dev.handler then
+        return self.dev.handler:shortname(self)
+    else
+        return self.ifname
+    end
+end
+
+function interface.get_i18n(self)
+    if self.dev and self.dev.handler then
+        return self.dev.handler:get_i18n(self)
+    else
+        return "%s: %q" %{ self:get_type_i18n(), self:name() }
     end
 end
@@ -374 +458 @@
 
 function interface.get_network(self)
+    if self.dev and self.dev.network then
+        self.network = _M:get_network(self.dev.network)
+    end
+
     if not self.network then
         local net