Changeset 1372

Timestamp:

02/20/07 11:59:05 (6 years ago)

Author:

mglb1

Message:

Fix the getAthStats function

• Can't rely on the base interface being called 'wifiXXX'
• Remove extraneous indentation

File:

• ccsd/private/modules/ccs_monitor_status.py (modified) (1 diff)

ccsd/private/modules/ccs_monitor_status.py

@@ -144 +144 @@
         return -1
 
+def getMadwifiBase(mac, interfaces):
+    """Searches the provided list of interfaces for base madwifi interface 
+       matching the supplied MAC address"""
+
+    for iface in interfaces:
+        # If the last 5 octets of the mac don't match, ignore
+        if mac[3:] != iface["mac"][3:]:
+            continue
+        # If the iface is of type link/ieee802.11 rathern than link/ether
+        # then it is the base interface
+        fd = os.popen("/sbin/ip link ls dev %s" % iface["name"])
+        lines = fd.readlines()
+        fd.close()
+        if lines[-1].find("link/ieee802.11") != -1:
+            return  iface["name"]
+    return None
+
 def getAthStats(oiface, interfaces):
     """Gets stats from Athstats"""
-    phy = 0
-    crc = 0
+    phy = -1
+    crc = -1
     base = None
     try:
-        mac = oiface["mac"][3:]
-        #Find the base wifi* interface
-        for iface in interfaces:
-            if iface == oiface:
+        mac = oiface["mac"]
+        # Find the base interface
+        base = getMadwifiBase(mac, interfaces)
+        if not base: return phy, crc
+        # Run athstats and retrieve output
+        lines = os.popen("athstats -i %s" % base).readlines()
+        if len(lines) == 0: return phy, crc
+        # Parse athstats output
+        for line in lines:
+            # Look for key text
+            if line.find("PHY errors") != -1:
+                # Store PHY errors
+                phy = int(line.strip().split()[0])
+            elif line.find("rx failed due to bad CRC") != -1:
+                # Store CRC errors
+                crc = int(line.strip().split()[0])
+            else:
+                # Ignored line
                 continue
-            if mac == iface["mac"][3:] and iface["name"][:4] == "wifi":
-                base = iface["name"]
+            # Ignore the rest if we've found both values
+            if phy != -1 and crc != -1:
                 break
-
-        #Run athstats
-        if base:
-            lines = os.popen("athstats -i %s" % base).readlines()
-            if len(lines) == 0:
-                phy = -1
-                crc = -1
-            for line in lines:
-                line = line.strip('\n')
-                sline = line.split(' ')
-                if len(sline) > 1:
-                    value = sline[0]
-                    line = line[len(value)+1:]
-                    if line == "PHY errors":
-                        phy = int(value)
-                    if line == "rx failed due to bad CRC":
-                        crc = int(value)
-        else:
-            phy = -1
-            crc = -1
     except:
-        phu = -1
+        log_error("Failed to fetch ath stats for %s" % oiface["name"], 
+                sys.exc_info())
+        phy = -1
         crc = -1
     return phy, crc
-
 
 Cache = None