[Jive-Checkins] r3750 - /7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua

[bklaas]

Author: bklaas
Date: Fri Jan  9 13:01:55 2009
New Revision: 3750

URL: http://svn.slimdevices.com?rev=3750&root=Jive&view=rev
Log:
Bug: n/a
Description: interfaceTable is a key,value table, not an array. Use pairs 
instead of ipairs to access

Modified:
    
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua?rev=3750&root=Jive&r1=3749&r2=3750&view=diff
==============================================================================
--- 
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua 
(original)
+++ 
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua 
Fri Jan  9 13:01:55 2009
@@ -131,8 +131,8 @@
 
        log:debug('scanning /proc/net/dev for interfaces...')
 
-       for i, v in ipairs(interfaceTable) do
-               if i then
+       for interface, _ in pairs(interfaceTable) do
+               if interface then
                        return interfaceTable
                end
        end
@@ -141,6 +141,7 @@
 
         local f = io.popen("cat /proc/net/dev")
         if f == nil then
+               log:error('`cat /proc/net/dev` produced no results')
                 return interfaces
         end
 
@@ -181,10 +182,10 @@
 
         self:interfaces()
 
-       for _, v in ipairs(interfaceTable) do
-               if self:isWireless(v) then
-                       log:debug('Wireless interface found: ', v)
-                       return v
+       for interface, _ in pairs(interfaceTable) do
+               if self:isWireless(interface) then
+                       log:debug('Wireless interface found: ', interface)
+                       return interface
                end
        end
 
@@ -208,9 +209,9 @@
 
         self:interfaces()
 
-       for _, v in ipairs(interfaceTable) do
-               if not self:isWireless(v) then
-                       return v
+       for interface, _ in pairs(interfaceTable) do
+               if not self:isWireless(interface) then
+                       return interface 
                end
        end
        return false
@@ -246,9 +247,10 @@
                if line == nil then
                        break
                end
+
                local doesWireless = string.match(line, "^(%w+)%s+")
                if interface == doesWireless then
-                       interfaceTable[interface]['isWireless'] = true
+                       interfaceTable[interface] = { isWireless = true }
                        f:close()
                        return true
                end

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins