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

wifi: (fixes #2436) Do not send BACK if the received A-MPDU is not addressed to the station

Browse Source
This commit is contained in:
Sébastien Deronne
2016-06-10 21:45:41 +02:00
parent aa4498a55c
commit b8068619dd
2 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES
View File

@@ -64,6 +64,7 @@ Bugs fixed
- Bug 2419 - BsmApplication should use RecvFrom and not SocketAddressTag
- Bug 2425 - UdpSocketImpl simplification
- Bug 2433 - Bic does not copy private parameters
- Bug 2436 - SendBlockAckAfterAmpdu is called even if the A-MPDU frame is not addressed to the station
Known issues
------------

76
src/wifi/model/mac-low.cc
View File

@@ -2811,26 +2811,26 @@ MacLow::DeaggregateAmpduAndReceive (Ptr<Packet> aggregatedPacket, double rxSnr,
NS_LOG_DEBUG ("duration/id=" << firsthdr.GetDuration ());
NotifyNav ((*n).first, firsthdr, preamble);
bool vhtSingleMpdu = (*n).second.GetEof ();
if (vhtSingleMpdu)
{
//If the MPDU is sent as a VHT single MPDU (EOF=1 in A-MPDU subframe header), then the responder sends an ACK.
NS_LOG_DEBUG ("Receive VHT single MPDU");
ampduSubframe = false;
}
else if (preamble != WIFI_PREAMBLE_NONE || !m_sendAckEvent.IsRunning ())
{
m_sendAckEvent = Simulator::Schedule (ampdu.GetRemainingAmpduDuration () + GetSifs (),
&MacLow::SendBlockAckAfterAmpdu, this,
firsthdr.GetQosTid (),
firsthdr.GetAddr2 (),
firsthdr.GetDuration (),
txVector,
rxSnr);
}
if (firsthdr.GetAddr1 () == m_self)
{
bool vhtSingleMpdu = (*n).second.GetEof ();
if (vhtSingleMpdu)
{
//If the MPDU is sent as a VHT single MPDU (EOF=1 in A-MPDU subframe header), then the responder sends an ACK.
NS_LOG_DEBUG ("Receive VHT single MPDU");
ampduSubframe = false;
}
else if (preamble != WIFI_PREAMBLE_NONE || !m_sendAckEvent.IsRunning ())
{
m_sendAckEvent = Simulator::Schedule (ampdu.GetRemainingAmpduDuration () + GetSifs (),
&MacLow::SendBlockAckAfterAmpdu, this,
firsthdr.GetQosTid (),
firsthdr.GetAddr2 (),
firsthdr.GetDuration (),
txVector,
rxSnr);
}
if (firsthdr.IsAck () || firsthdr.IsBlockAck () || firsthdr.IsBlockAckReq ())
{
ReceiveOk ((*n).first, rxSnr, txVector, preamble, ampduSubframe);
@@ -2849,29 +2849,29 @@ MacLow::DeaggregateAmpduAndReceive (Ptr<Packet> aggregatedPacket, double rxSnr,
{
NS_FATAL_ERROR ("Received A-MPDU with invalid first MPDU type");
}
}
if (ampdu.GetRemainingNbOfMpdus () == 0 && !vhtSingleMpdu)
{
if (normalAck)
if (ampdu.GetRemainingNbOfMpdus () == 0 && !vhtSingleMpdu)
{
//send block Ack
if (firsthdr.IsBlockAckReq ())
if (normalAck)
{
NS_FATAL_ERROR ("Sending a BlockAckReq with QosPolicy equal to Normal Ack");
}
uint8_t tid = firsthdr.GetQosTid ();
AgreementsI it = m_bAckAgreements.find (std::make_pair (firsthdr.GetAddr2 (), tid));
if (it != m_bAckAgreements.end ())
{
/* See section 11.5.3 in IEEE 802.11 for mean of this timer */
ResetBlockAckInactivityTimerIfNeeded (it->second.first);
NS_LOG_DEBUG ("rx A-MPDU/sendImmediateBlockAck from=" << firsthdr.GetAddr2 ());
NS_ASSERT (m_sendAckEvent.IsRunning ());
}
else
{
NS_LOG_DEBUG ("There's not a valid agreement for this block ack request.");
//send block Ack
if (firsthdr.IsBlockAckReq ())
{
NS_FATAL_ERROR ("Sending a BlockAckReq with QosPolicy equal to Normal Ack");
}
uint8_t tid = firsthdr.GetQosTid ();
AgreementsI it = m_bAckAgreements.find (std::make_pair (firsthdr.GetAddr2 (), tid));
if (it != m_bAckAgreements.end ())
{
/* See section 11.5.3 in IEEE 802.11 for mean of this timer */
ResetBlockAckInactivityTimerIfNeeded (it->second.first);
NS_LOG_DEBUG ("rx A-MPDU/sendImmediateBlockAck from=" << firsthdr.GetAddr2 ());
NS_ASSERT (m_sendAckEvent.IsRunning ());
}
else
{
NS_LOG_DEBUG ("There's not a valid agreement for this block ack request.");
}
}
}
}