F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed BCA

Browse Source
This commit is contained in:
Kirill Andreev
2009-03-25 16:34:16 +03:00
parent 359cc256d7
commit 5f1ee55fe0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/mesh/dot11s/peer-manager-protocol.cc
View File

@@ -352,7 +352,7 @@ PeerManagerProtocol::GetNextBeaconShift (uint32_t interface)
// 3) hereafter TU = 1024 microseconds
//Im my MAC everything is stored in MicroSeconds
uint32_t myNextTbttInTimeUnits = 0;
uint32_t myNextTbttInTimeUnits = Simulator::Now().GetMicroSeconds();
uint32_t futureBeaconInTimeUnits = 0;
//Going through all my timing elements and detecting future beacon collisions
PeerLinksMap::iterator iface = m_peerLinks.find (interface);
@@ -410,7 +410,11 @@ PeerManagerProtocol::GetNextBeaconShift (uint32_t interface)
int beaconShift = randomShift.GetInteger (1,15) * coefficientSign;
NS_LOG_DEBUG ("Shift value = " << beaconShift << " beacon TUs");
//We need the result not in Time Units, but in microseconds
return MicroSeconds (beaconShift * 1024);
//Do not shift to the past
if(MicroSeconds(beaconShift * 1024) + Simulator::Now() < myBeacon.first)
return MicroSeconds (beaconShift * 1024);
else
return MicroSeconds (0);
}
//No collision detected, hence no shift is needed
else