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

Timestamp:

10/30/10 03:33:06 (3 years ago)

Author:

jow

Message:

libs/core: fix various bugs in network model

Files:

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

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

@@ -162 +162 @@
 
 function init(cursor)
-    uci_r = cursor or luci.model.uci.cursor()
-    uci_s = cursor:substate()
+    uci_r = cursor or uci.cursor()
+    uci_s = uci_r:substate()
 
     ifs = { }
@@ -899 +899 @@
     options.device = self.sid
 
-    local wnet = uci_r:section("wifidev", "wifi-iface", nil, options)
+    local wnet = uci_r:section("wireless", "wifi-iface", nil, options)
     if wnet then
-        return wifinet(wnet)
+        return wifinet(wnet, options)
     end
 end
@@ -922 +922 @@
 
 wifinet = utl.class()
-function wifinet.__init__(self, net)
+function wifinet.__init__(self, net, data)
     self.sid = net
 
@@ -941 +941 @@
 
     self.wdev   = dev
-    self.iwdata = uci_s:get_all("wireless", self.sid) or { }
     self.iwinfo = dev and sys.wifi.getiwinfo(dev) or { }
+    self.iwdata = data or uci_s:get_all("wireless", self.sid) or
+        uci_r:get_all("wireless", self.sid) or { }
 end
 
@@ -1009 +1010 @@
 
 function wifinet.active_bssid(self)
-    return _stror(self.iwinfo.bssid, self.iwinfo.bssid) or "00:00:00:00:00:00"
+    return _stror(self.iwinfo.bssid, self.iwdata.bssid) or "00:00:00:00:00:00"
 end