Add code for optional reassociation callback method

mn_wifi/mobility.py

@@ -235,6 +235,11 @@ def handover(cls, sta, ap, wlan, ap_wlan):
         if not sta.params['associatedTo'][wlan] or changeAP:
             if ap not in sta.params['associatedTo']:
                 Association.associate_infra(sta, ap, wlan=wlan, ap_wlan=ap_wlan)
+                if "reassoc_callback" in sta.params:
+                    if "reassoc_callback_args" in sta.params:
+                        sta.params["reassoc_callback"](*sta.params['reassoc_callback_args'])
+                    else:
+                        sta.params["reassoc_callback"]()
 
     @classmethod
     def models(cls, **kwargs):

mn_wifi/node.py

@@ -33,6 +33,7 @@
 import numpy as np
 from scipy.spatial.distance import pdist
 from six import string_types
+from threading import Lock, ThreadError
 
 from mininet.log import info, error, warn, debug
 from mininet.util import (quietRun, errRun, errFail, mountCgroups,
@@ -85,6 +86,7 @@ def __init__(self, name, inNamespace=True, **params):
          self.lastPid, self.lastCmd, self.pollOut) = (
              None, None, None, None, None, None, None, None)
         self.waiting = False
+        self.lock = Lock()
         self.readbuf = ''
 
         # Start command interpreter shell
@@ -664,7 +666,9 @@ def sendCmd(self, *args, **kwargs):
            and return without waiting for the command to complete.
            args: command and arguments, or string
            printPid: print command's PID? (False)"""
+        #Lock object helps avoid contention when using callbacks
         assert self.shell and not self.waiting
+        self.waiting = True
         printPid = kwargs.get('printPid', False)
         # Allow sendCmd( [ list ] )
         if len(args) == 1 and isinstance(args[ 0 ], list):
@@ -736,6 +740,11 @@ def waitOutput(self, verbose=False, findPid=True):
             data = self.monitor(findPid=findPid)
             output += data
             log(data)
+        #Wait to release lock until all output has been stored
+        try:
+            self.lock.release()
+        except ThreadError:
+            pass
         return output
 
     def cmd(self, *args, **kwargs):
@@ -745,6 +754,7 @@ def cmd(self, *args, **kwargs):
         log = info if verbose else debug
         log('*** %s : %s\n' % (self.name, args))
         if self.shell:
+            self.lock.acquire()
             self.sendCmd(*args, **kwargs)
             return self.waitOutput(verbose)
         else: