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

wifi: Use std::set instead of std::list in QosBlockedDestinations

Browse Source
This commit is contained in:
Alexander Krotov
2016-12-09 10:37:39 +03:00
parent d1999fab0e
commit d4e272d775
2 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/wifi/model/qos-blocked-destinations.cc
View File

@@ -34,36 +34,19 @@ QosBlockedDestinations::~QosBlockedDestinations ()
bool
QosBlockedDestinations::IsBlocked (Mac48Address dest, uint8_t tid) const
{
for (BlockedPacketsCI i = m_blockedQosPackets.begin (); i != m_blockedQosPackets.end (); i++)
{
if (i->first == dest && i->second == tid)
{
return true;
}
}
return false;
return m_blockedQosPackets.find ({dest, tid}) != m_blockedQosPackets.end ();
}
void
QosBlockedDestinations::Block (Mac48Address dest, uint8_t tid)
{
if (!IsBlocked (dest, tid))
{
m_blockedQosPackets.push_back (std::make_pair (dest, tid));
}
m_blockedQosPackets.insert ({dest, tid});
}
void
QosBlockedDestinations::Unblock (Mac48Address dest, uint8_t tid)
{
for (BlockedPacketsI i = m_blockedQosPackets.begin (); i != m_blockedQosPackets.end (); i++)
{
if (i->first == dest && i->second == tid)
{
m_blockedQosPackets.erase (i);
break;
}
}
m_blockedQosPackets.erase ({dest, tid});
}
} //namespace ns3

16
src/wifi/model/qos-blocked-destinations.h
View File

@@ -22,7 +22,7 @@
#ifndef QOS_BLOCKED_DESTINATIONS_H
#define QOS_BLOCKED_DESTINATIONS_H
#include <list>
#include <set>
#include "ns3/mac48-address.h"
namespace ns3 {
@@ -67,19 +67,7 @@ public:
private:
/**
* typedef for a list of <Mac48Address, TID> pair.
*/
typedef std::list<std::pair<Mac48Address, uint8_t> > BlockedPackets;
/**
* typedef for an iterator of BlockedPackets
*/
typedef std::list<std::pair<Mac48Address, uint8_t> >::iterator BlockedPacketsI;
/**
* typedef for a constan iterator of BlockedPackets
*/
typedef std::list<std::pair<Mac48Address, uint8_t> >::const_iterator BlockedPacketsCI;
BlockedPackets m_blockedQosPackets;
std::set<std::pair<Mac48Address, uint8_t>> m_blockedQosPackets;
};
} //namespace ns3