Changeset 7543

Timestamp:

09/24/11 02:57:59 (21 months ago)

Author:

jow

Message:

libs/core: add "tunnel" interface type to network model, various optimizations

Files:

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

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

@@ -31 +31 @@
 
 
-local ifs, brs, sws, uci_r, uci_s
+local ifs, brs, sws, tns, uci_r, uci_s
 
 function _list_del(c, s, o, r)
@@ -175 +175 @@
     brs = { }
     sws = { }
+    tns = { }
 
     -- read interface information
@@ -182 +183 @@
         local prnt = name:match("^([^%.]+)%.")
 
-        if _iface_virtual(name) or not _iface_ignore(name) then
+        if _iface_virtual(name) then
+            tns[name] = true
+        end
+
+        if tns[name] or not _iface_ignore(name) then
             ifs[name] = ifs[name] or {
                 idx      = i.ifindex or n,
@@ -746 +751 @@
 function network.get_interface(self)
     if self:is_virtual() then
-        return interface(self:proto() .. "-" .. self.sid)
+        tns[self:proto() .. "-" .. self.sid] = true
+        return interface(self:proto() .. "-" .. self.sid, self)
     elseif self:is_bridge() then
-        return interface("br-" .. self.sid)
+        brs["br-" .. self.sid] = true
+        return interface("br-" .. self.sid, self)
     else
         local ifn = nil
@@ -754 +761 @@
         for ifn in utl.imatch(uci_s:get("network", self.sid, "ifname")) do
             ifn = ifn:match("^[^:/]+")
-            return ifn and interface(ifn)
+            return ifn and interface(ifn, self)
         end
         ifn = nil
@@ -767 +774 @@
                 end
             end)
-        return ifn and interface(ifn)
+        return ifn and interface(ifn, self)
     end
 end
@@ -778 +785 @@
     for ifn in utl.imatch(self:get("ifname")) do
         ifn = ifn:match("^[^:/]+")
-        nfs[ifn] = interface(ifn)
+        nfs[ifn] = interface(ifn, self)
     end
 
@@ -793 +800 @@
                 if s.network == self.sid then
                     ifn = "%s.network%d" %{ s.device, num[s.device] }
-                    wfs[ifn] = interface(ifn)
+                    wfs[ifn] = interface(ifn, self)
                 end
             end
@@ -845 +852 @@
 
 interface = utl.class()
-function interface.__init__(self, ifname)
+function interface.__init__(self, ifname, network)
     local wif = _wifi_lookup(ifname)
     if wif then self.wif = wifinet(wif) end
 
-    self.ifname = self.ifname or ifname
-    self.dev    = ifs[self.ifname]
+    self.ifname  = self.ifname or ifname
+    self.dev     = ifs[self.ifname]
+    self.network = network
 end
 
@@ -858 +866 @@
 
 function interface.mac(self)
-    return self.dev and self.dev.macaddr or "00:00:00:00:00:00"
+    return (self.dev and self.dev.macaddr or "00:00:00:00:00:00"):upper()
 end
 
@@ -874 +882 @@
     elseif brs[self.ifname] then
         return "bridge"
+    elseif tns[self.ifname] then
+        return "tunnel"
     elseif self.ifname:match("%.") then
         return "vlan"
@@ -916 +926 @@
     elseif x == "vlan" then
         return i18n.translate("VLAN Interface")
+    elseif x == "tunnel" then
+        return i18n.translate("Tunnel Interface")
     else
         return i18n.translate("Ethernet Adapter")
@@ -991 +1003 @@
 
 function interface.get_network(self)
-    if self.dev and self.dev.network then
-        self.network = _M:get_network(self.dev.network)
+    if not self.network then
+        if self.dev and self.dev.network then
+            self.network = _M:get_network(self.dev.network)
+        end
     end