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

Mesh: fixed coding style

Browse Source
This commit is contained in:
Kirill Andreev
2009-10-23 16:22:56 +04:00
parent 84e1fc122d
commit 7c4f42fbf1
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -763,7 +763,7 @@ HwmpProtocol::MakePathError (std::vector<FailedDestination> destinations)
void
HwmpProtocol::InitiatePathError(PathError perr)
{
for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
{
std::vector<Mac48Address> receivers_for_interface;
for (unsigned int j = 0; j < perr.receivers.size (); j ++)
@@ -779,7 +779,7 @@ HwmpProtocol::InitiatePathError(PathError perr)
void
HwmpProtocol::ForwardPathError(PathError perr)
{
for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
{
std::vector<Mac48Address> receivers_for_interface;
for (unsigned int j = 0; j < perr.receivers.size (); j ++)
@@ -896,7 +896,7 @@ void
HwmpProtocol::ReactivePathResolved (Mac48Address dst)
{
std::map<Mac48Address, PreqEvent>::iterator i = m_preqTimeouts.find (dst);
if (i != m_preqTimeouts.end ())
if (i != m_preqTimeouts.end ())
{
m_routeDiscoveryTimeCallback (Simulator::Now () - i->second.whenScheduled);
}
@@ -985,7 +985,7 @@ HwmpProtocol::RetryPathDiscovery (Mac48Address dst, uint8_t numOfRetry)
packet = DequeueFirstPacketByDst (dst);
}
std::map<Mac48Address, PreqEvent>::iterator i = m_preqTimeouts.find (dst);
NS_ASSERT (i != m_preqTimeouts.end ());
NS_ASSERT (i != m_preqTimeouts.end ());
m_routeDiscoveryTimeCallback (Simulator::Now () - i->second.whenScheduled);
m_preqTimeouts.erase (i);
return;

4
src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc
View File

@@ -77,9 +77,7 @@ IeBeaconTiming::GetNeighboursTimingElementsList ()
return m_neighbours;
}
void
IeBeaconTiming::AddNeighboursTimingElementUnit (uint16_t aid, Time last_beacon, //MicroSeconds!
Time beacon_interval //MicroSeconds!
)
IeBeaconTiming::AddNeighboursTimingElementUnit (uint16_t aid, Time last_beacon, Time beacon_interval)
{
if (m_numOfUnits == 50)
{

2
src/devices/mesh/dot11s/peer-management-protocol.cc
View File

@@ -400,7 +400,7 @@ PeerManagementProtocol::DoShiftBeacon (uint32_t interface)
continue;
}
//Beacon interval is stored in TU's
if (((*j)->GetBeaconInterval ()) != TimeToTu(beaconInterval->second))
if (((*j)->GetBeaconInterval ()) != TimeToTu (beaconInterval->second))
{
continue;
}