SunnyQjm/ns-3-dev
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug 842: ns-3-dev crashes using block ack (fixed)

Browse Source 
--HG--
extra : rebase_source : 0ac825d63d179d8dffc313863a3f939cb00191d0
This commit is contained in:
Mirko Banchi
2010-05-16 16:10:19 +02:00
parent 32a742e57e
commit 358b94ec7d
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/devices/wifi/mac-low.cc
+28 -12
View File
@@ -1565,16 +1565,16 @@ MacLow::RxCompleteBufferedPacketsWithSmallerSequence (uint16_t seq, Mac48Address
AgreementsI it = m_bAckAgreements.find (std::make_pair (originator, tid));
if (it != m_bAckAgreements.end ())
{
BufferedPacketI i = (*it).second.second.begin ();
uint16_t endSequence = ((*it).second.first.GetStartingSequence () + 2047) % 4096;
uint16_t mappedStart = QosUtilsMapSeqControlToUniqueInteger (seq, endSequence);
uint16_t guard = (*it).second.first.GetStartingSequence ();
uint16_t guard = (*it).second.second.begin ()->second.GetSequenceControl() & 0xfff0;
BufferedPacketI last = (*it).second.second.begin ();
BufferedPacketI i = (*it).second.second.begin ();
for (; i != (*it).second.second.end () &&
QosUtilsMapSeqControlToUniqueInteger ((*i).second.GetSequenceNumber (), endSequence) < mappedStart;)
{
while (i != (*it).second.second.end () && guard == (*i).second.GetSequenceControl ())
if (guard == (*i).second.GetSequenceControl ())
{
if (!(*i).second.IsMoreFragments ())
{
@@ -1585,18 +1585,34 @@ MacLow::RxCompleteBufferedPacketsWithSmallerSequence (uint16_t seq, Mac48Address
}
m_rxCallback ((*last).first, &(*last).second);
last++;
/* go to next packet */
while (i != (*it).second.second.end () && ((guard >> 4) & 0x0fff) == (*i).second.GetSequenceNumber ())
{
i++;
}
if (i != (*it).second.second.end ())
{
guard = (*i).second.GetSequenceControl () & 0xfff0;
last = i;
}
}
else
{
guard++;
}
guard = (*i).second.IsMoreFragments () ? (guard + 1) : ((guard + 16) & 0xfff0);
}
/* go to next packet */
while (i != (*it).second.second.end () && ((guard >> 4) & 0x0fff) == (*i).second.GetSequenceNumber ())
else
{
i++;
}
if (i != (*it).second.second.end ())
{
guard = (*i).second.GetSequenceControl () & 0xfff0;
last = i;
/* go to next packet */
while (i != (*it).second.second.end () && ((guard >> 4) & 0x0fff) == (*i).second.GetSequenceNumber ())
{
i++;
}
if (i != (*it).second.second.end ())
{
guard = (*i).second.GetSequenceControl () & 0xfff0;
last = i;
}
}
}
(*it).second.second.erase ((*it).second.second.begin (), i);