Changeset 1279

Timestamp:

01/11/07 17:46:11 (6 years ago)

Author:

mglb1

Message:

Implement a routine that regularly checks that iwspy has been given MAC addresses for all links that are using Orinoco cards.

If iwspy does not have a MAC address for the other end of a link which is using Orinoco cards then we cannot gather SNR statistics.

Fixes #18

Location:

ccsd

Files:

• private/modules/ccs_monitor_status.py (modified) (4 diffs)
• trunk/crcnetd/_utils/ccsd_common.py (modified) (1 diff)

ccsd/private/modules/ccs_monitor_status.py

@@ -20 +20 @@
 from crcnetd._utils.ccsd_common import *
 from crcnetd._utils.ccsd_log import *
-from crcnetd._utils.ccsd_clientserver import registerPage, registerDir
+from crcnetd._utils.ccsd_clientserver import registerPage, registerDir, \
+        registerRecurring
 from crcnetd._utils.ccsd_config import config_get
 from crcnetd._utils.ccsd_events import registerEvent, triggerEvent
@@ -34 +35 @@
 DEFAULT_AVERAGE_SIGNAL = 14
 DEFAULT_GOOD_SIGNAL = 20
+
+IWSPY_CHECK_INTERVAL = 300
 
 class ccs_status_error(ccsd_error):
@@ -170 +173 @@
     
     return interfaces2
-        
+    
+@registerRecurring(IWSPY_CHECK_INTERVAL)
+def checkiwspy():
+    """Called regularly to check that iwspy is correctly configured
+
+    If an Orinoco interface (heuristically determined as any wireless interface
+    that is not madwifi or hostap) does not have a MAC address added to iwspy,
+    the arp table is looked up and the MAC of the host at the opposite end of
+    the subnet is added. 
+
+    If a MAC address is present it is checked against the ARP table and
+    corrected if it is out of date.
+
+    This procedure is required for SNR statistics to be collected for Orinoco
+    card links.
+    """
+
+    for iface in iwtools.interfaces:
+        # Skip madwifi and hostap interfaces
+        if iwtools.is_madwifi(iface) or iwtools.is_hostap(iface): continue
+        # Skip interfaces that are down
+        state = getInterfaces(returnOne=iface)
+        if len(state) != 1 or not state[0]["up"]: continue
+        # Determine whether to start from the top of the bottom of the net
+        cidr = state[0]["address"]
+        ip = ipnum(cidrToIP(cidr))
+        bcast = cidrToBroadcast(cidr)
+        network = cidrToNetwork(cidr)
+        ldiff = ip - network
+        udiff = bcast - ip
+        if ldiff > udiff:
+            # ip is closest to top, start at bottom
+            start = network+1
+            inc = 1
+            end = bcast
+        else:
+            # ip is closet to the bottom, start at the top
+            start = bcast-1
+            inc = -1
+            end = network
+        # Short broadcast ping to populate ARP table
+        log_command("/usr/sbin/fping -c2 -q %s &>/dev/null" % formatIP(bcast))
+        # Get all MACs on the link
+        macs = getLinkMACs(iface)
+        if len(macs) == 0: continue
+        # Walk from the opposite end of the network and use the first entry
+        use = None
+        while start != end:
+            if start == ip: 
+                start += inc
+                continue # skip self
+            if formatIP(start) in macs.keys():
+                use = macs[formatIP(start)]
+                break
+            start += inc
+        # Next interface if no usable macs found
+        if use is None: continue
+        # Otherwise update iwspy
+        current = getiwspyMAC(iface)
+        if use == current: continue
+        log_command("/sbin/iwspy %s off 2>&1" % iface)
+        log_command("/sbin/iwspy %s + %s" % (iface, use))
+        log_info("Updated iwspy for interface '%s' to '%s'" % (iface, use))
+
 ##############################################################################
 # Node Map
@@ -620 +686 @@
     localnode = socket.gethostname()
     nodemap =  config_get("status", "nodemap", DEFAULT_NODEMAP_FILE)
+
+    # Check that iwspy has MAC addresses
+    checkiwspy()
         
     if (gateway == None or root == None or localnode == None):

ccsd/trunk/crcnetd/_utils/ccsd_common.py

@@ -1004 +1004 @@
     return routes
 
+def getLinkMACs(iface):
+    """Returns a dictionary of ip:mac for all ARP entries on the link"""
+
+    macs = {}
+
+    fh = os.popen("/sbin/ip neigh show dev %s" % iface)
+    output = fh.readlines()
+    rv = fh.close()
+    for line in output:
+        parts = line.strip().split(" ")
+        if parts[-1] != "reachable":
+            continue
+        macs[parts[0]] = parts[2].lower()
+
+    return macs
+
+def getiwspyMAC(iface):
+    
+    fh = os.popen("/sbin/iwspy %s" % iface)
+    output = fh.readlines()
+    rv = fh.close()
+    if len(output) < 2: return ""
+    parts = output[1].strip().split(" : ")
+    mac = parts[0]
+    if isValidMAC(mac):
+        return mac.lower()
+    return ""
+
 def route_cmp(a, b):
     """Comparison function to sort the route table by netmask then prefix"""