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

wifi: Store GCR group address to Block Ack agreement

Browse Source
This commit is contained in:
Sébastien Deronne
2024-11-28 16:45:46 +01:00
parent cb2982447f
commit 59d902f474
3 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wifi/model/block-ack-agreement.cc
View File

@@ -190,4 +190,16 @@ BlockAckAgreement::GetDistance(uint16_t seqNumber, uint16_t startingSeqNumber)
return (seqNumber - startingSeqNumber + SEQNO_SPACE_SIZE) % SEQNO_SPACE_SIZE;
}
void
BlockAckAgreement::SetGcrGroupAddress(const Mac48Address& gcrGroupAddress)
{
m_gcrGroupAddress = gcrGroupAddress;
}
const std::optional<Mac48Address>&
BlockAckAgreement::GetGcrGroupAddress() const
{
return m_gcrGroupAddress;
}
} // namespace ns3

35
src/wifi/model/block-ack-agreement.h
View File

@@ -14,6 +14,8 @@
#include "ns3/event-id.h"
#include "ns3/mac48-address.h"
#include <optional>
namespace ns3
{
/**
@@ -161,18 +163,31 @@ class BlockAckAgreement
* @return the distance of the given sequence number from the given starting sequence number
*/
static std::size_t GetDistance(uint16_t seqNumber, uint16_t startingSeqNumber);
/**
* Set the GCR group address for this agreement.
*
* @param gcrGroupAddress the GCR group address
*/
void SetGcrGroupAddress(const Mac48Address& gcrGroupAddress);
/**
* Get the GCR group address of this agreement if it is a GCR Block Ack agreement.
*
* @return the GCR group address of this agreement if it is a GCR Block Ack agreement
*/
const std::optional<Mac48Address>& GetGcrGroupAddress() const;
protected:
Mac48Address m_peer; //!< Peer address
bool m_amsduSupported; //!< Flag whether MSDU aggregation is supported
uint8_t m_blockAckPolicy; //!< Type of block ack: immediate or delayed
uint8_t m_tid; //!< Traffic ID
uint16_t m_bufferSize; //!< Buffer size
uint16_t m_timeout; //!< Timeout
uint16_t m_startingSeq; //!< Starting sequence control
uint16_t m_winEnd; //!< Ending sequence number
bool m_htSupported; //!< Flag whether HT is supported
mutable EventId m_inactivityEvent; //!< inactivity event
Mac48Address m_peer; //!< Peer address
bool m_amsduSupported; //!< Flag whether MSDU aggregation is supported
uint8_t m_blockAckPolicy; //!< Type of block ack: immediate or delayed
uint8_t m_tid; //!< Traffic ID
uint16_t m_bufferSize; //!< Buffer size
uint16_t m_timeout; //!< Timeout
uint16_t m_startingSeq; //!< Starting sequence control
uint16_t m_winEnd; //!< Ending sequence number
bool m_htSupported; //!< Flag whether HT is supported
std::optional<Mac48Address> m_gcrGroupAddress; //!< the optional GCR group address
mutable EventId m_inactivityEvent; //!< inactivity event
};
} // namespace ns3

12
src/wifi/model/block-ack-manager.cc
View File

@@ -107,6 +107,10 @@ BlockAckManager::CreateOriginatorAgreement(const MgtAddBaRequestHeader& reqHdr,
{
agreement.SetDelayedBlockAck();
}
if (const auto gcrGroupAddr = reqHdr.GetGcrGroupAddress())
{
agreement.SetGcrGroupAddress(*gcrGroupAddr);
}
agreement.SetState(OriginatorBlockAckAgreement::PENDING);
m_originatorAgreementState(Simulator::Now(),
recipient,
@@ -157,6 +161,10 @@ BlockAckManager::UpdateOriginatorAgreement(const MgtAddBaResponseHeader& respHdr
{
agreement.SetDelayedBlockAck();
}
if (const auto gcrGroupAddr = respHdr.GetGcrGroupAddress())
{
agreement.SetGcrGroupAddress(*gcrGroupAddr);
}
if (!it->second.first.IsEstablished())
{
m_originatorAgreementState(Simulator::Now(),
@@ -204,6 +212,10 @@ BlockAckManager::CreateRecipientAgreement(const MgtAddBaResponseHeader& respHdr,
{
agreement.SetDelayedBlockAck();
}
if (const auto gcrGroupAddr = respHdr.GetGcrGroupAddress())
{
agreement.SetGcrGroupAddress(*gcrGroupAddr);
}
m_recipientAgreements.insert_or_assign({originator, tid}, agreement);
}