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

wifi: Allow creation of A-MSDUs containing a single MSDU

Browse Source
This commit is contained in:
Stefano Avallone
2023-09-15 19:28:02 +02:00
parent 9569165b06
commit 6a2e56c9fe
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/wifi/model/wifi-mpdu.cc
View File

@@ -174,9 +174,15 @@ WifiMpdu::GetProtocolDataUnit() const
void
WifiMpdu::Aggregate(Ptr<const WifiMpdu> msdu)
{
NS_ASSERT(msdu);
NS_LOG_FUNCTION(this << *msdu);
NS_ABORT_MSG_IF(!msdu->GetHeader().IsQosData() || msdu->GetHeader().IsQosAmsdu(),
if (msdu)
{
NS_LOG_FUNCTION(this << *msdu);
}
else
{
NS_LOG_FUNCTION(this);
}
NS_ABORT_MSG_IF(msdu && (!msdu->GetHeader().IsQosData() || msdu->GetHeader().IsQosAmsdu()),
"Only QoS data frames that do not contain an A-MSDU can be aggregated");
NS_ABORT_MSG_IF(!std::holds_alternative<OriginalInfo>(m_instanceInfo),
"This method can only be called on the original version of the MPDU");
@@ -206,7 +212,10 @@ WifiMpdu::Aggregate(Ptr<const WifiMpdu> msdu)
// to be set to the BSSID, but neither Address 1 nor Address 2 contain the
// BSSID. Hence, it is left up to the caller to set these Address fields.
}
DoAggregate(msdu);
if (msdu)
{
DoAggregate(msdu);
}
}
void

4
src/wifi/model/wifi-mpdu.h
View File

@@ -131,7 +131,9 @@ class WifiMpdu : public SimpleRefCount<WifiMpdu>
/**
* \brief Aggregate the MSDU contained in the given MPDU to this MPDU (thus
* constituting an A-MSDU). Note that the given MPDU cannot contain
* an A-MSDU.
* an A-MSDU. If the given MPDU is a null pointer, the effect of this
* call is to add only an A-MSDU subframe header, thus producing an A-MSDU
* containing a single MSDU.
* \param msdu the MPDU containing the MSDU to aggregate
*/
void Aggregate(Ptr<const WifiMpdu> msdu);