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

Timestamp:

11/15/10 23:03:45 (3 years ago)

Author:

jow

Message:

libs/core: network model fixes

Files:

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

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

@@ -276 +276 @@
     local r = uci_r:delete("network", n)
     if r then
-        uci_r:foreach("network", "alias",
-            function(s)
-                if s.interface == n then
-                    uci_r:delete("network", s['.name'])
-                end
-            end)
-
-        uci_r:foreach("network", "route",
-            function(s)
-                if s.interface == n then
-                    uci_r:delete("network", s['.name'])
-                end
-            end)
-
-        uci_r:foreach("network", "route6",
-            function(s)
-                if s.interface == n then
-                    uci_r:delete("network", s['.name'])
-                end
-            end)
+        uci_r:delete_all("network", "alias",
+            function(s) return (s.interface == n) end)
+
+        uci_r:delete_all("network", "route",
+            function(s) return (s.interface == n) end)
+
+        uci_r:delete_all("network", "route6",
+            function(s) return (s.interface == n) end)
 
         uci_r:foreach("wireless", "wifi-iface",
@@ -303 +291 @@
                 end
             end)
-
-        uci_r:delete("network", n)
     end
     return r
@@ -991 +977 @@
 
 function wifinet.ifname(self)
-    return self.iwinfo.ifname or self.wdev
+    local ifname = self.iwinfo.ifname
+    if not ifname or ifname:match("^wifi%d") or ifname:match("^radio%d") then
+        ifname = self.wdev
+    end
+    return ifname
 end