handover fixed

mininet/wifiMobility.py

@@ -56,6 +56,7 @@ def nodeSpeed(self, sta, pos_x, pos_y, pos_z, diffTime):
  @classmethod
  def handover(self, sta, ap, wlan, dist):
  """handover"""
+ associated = True 
  if ap == sta.params['associatedTo'][wlan]:
  if dist > ap.params['range']:
  sta.pexec('iw dev %s disconnect' % sta.params['wlan'][wlan])
@@ -65,9 +66,11 @@ def handover(self, sta, ap, wlan, dist):
  else:
  if dist >= 0.01:
  channelParameters(sta, ap, wlan, dist, self.staList)
- else:
- if dist > ap.params['range']:
- sta.params['associatedTo'][wlan] = ''
+ if dist < ap.params['range']: 
+ if sta.params['associatedTo'][wlan] == '': 
+ associated = False 
+ else: 
+ associated = False
  if ap == sta.params['associatedTo'][wlan] or dist < ap.params['range']:
  changeAP = False
  self.updateParams(sta, ap, wlan)
@@ -79,16 +82,18 @@ def handover(self, sta, ap, wlan, dist):
  changeAP = value.changeAP
 
  # Go to handover
- if sta.params['associatedTo'][wlan] == '' or changeAP == True:
- if 'encrypt' not in ap.params:
- self.associate_infra(sta, ap, wlan)
- else:
- if ap.params['encrypt'][0] == 'wpa' or ap.params['encrypt'][0] == 'wpa2':
- self.associate_wpa(sta, ap, wlan)
- elif ap.params['encrypt'][0] == 'wep':
- self.associate_wep(sta, ap, wlan)
- if dist >= 0.01:
- channelParameters(sta, ap, wlan, dist, self.staList)
+ if associated == False or changeAP == True:
+ if ap not in sta.params['associatedTo']:
+ if sta.params['associatedTo'][wlan] == '':
+ if 'encrypt' not in ap.params:
+ self.associate_infra(sta, ap, wlan)
+ else:
+ if ap.params['encrypt'][0] == 'wpa' or ap.params['encrypt'][0] == 'wpa2':
+ self.associate_wpa(sta, ap, wlan)
+ elif ap.params['encrypt'][0] == 'wep':
+ self.associate_wep(sta, ap, wlan)
+ if dist >= 0.01:
+ channelParameters(sta, ap, wlan, dist, self.staList)
  # have to verify this
  time.sleep(0.01)