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

wifi: ApWifiMac records the outcome of a multi-link setup

Browse Source
This commit is contained in:
Stefano Avallone
2022-07-06 17:15:57 +02:00
committed by Stefano Avallone
parent 735ac2f325
commit ec20fc0951
1 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/wifi/model/ap-wifi-mac.cc
View File

@@ -1159,11 +1159,36 @@ ApWifiMac::TxOk (Ptr<const WifiMpdu> mpdu)
{
NS_LOG_FUNCTION (this << *mpdu);
const WifiMacHeader& hdr = mpdu->GetHeader ();
if ((hdr.IsAssocResp () || hdr.IsReassocResp ())
&& GetWifiRemoteStationManager ()->IsWaitAssocTxOk (hdr.GetAddr1 ()))
if (hdr.IsAssocResp () || hdr.IsReassocResp ())
{
NS_LOG_DEBUG ("associated with sta=" << hdr.GetAddr1 ());
GetWifiRemoteStationManager ()->RecordGotAssocTxOk (hdr.GetAddr1 ());
auto linkId = GetLinkIdByAddress (hdr.GetAddr2 ());
NS_ABORT_MSG_IF (!linkId.has_value (), "No link ID matching the TA");
if (GetWifiRemoteStationManager (*linkId)->IsWaitAssocTxOk (hdr.GetAddr1 ()))
{
NS_LOG_DEBUG ("AP=" << hdr.GetAddr2 () << " associated with STA=" << hdr.GetAddr1 ());
GetWifiRemoteStationManager (*linkId)->RecordGotAssocTxOk (hdr.GetAddr1 ());
}
if (auto staMldAddress = GetWifiRemoteStationManager (*linkId)->GetMldAddress (hdr.GetAddr1 ());
staMldAddress.has_value ())
{
// the STA is affiliated with an MLD
for (uint8_t i = 0; i < GetNLinks (); i++)
{
auto stationManager = GetWifiRemoteStationManager (i);
if (auto staAddress = stationManager->GetAffiliatedStaAddress (*staMldAddress);
staAddress.has_value ()
&& i != *linkId
&& stationManager->IsWaitAssocTxOk (*staAddress))
{
NS_LOG_DEBUG ("AP=" << GetFrameExchangeManager (i)->GetAddress ()
<< " associated with STA=" << *staAddress);
stationManager->RecordGotAssocTxOk (*staAddress);
}
}
}
}
}
@@ -1173,11 +1198,35 @@ ApWifiMac::TxFailed (WifiMacDropReason timeoutReason, Ptr<const WifiMpdu> mpdu)
NS_LOG_FUNCTION (this << +timeoutReason << *mpdu);
const WifiMacHeader& hdr = mpdu->GetHeader ();
if ((hdr.IsAssocResp () || hdr.IsReassocResp ())
&& GetWifiRemoteStationManager ()->IsWaitAssocTxOk (hdr.GetAddr1 ()))
if (hdr.IsAssocResp () || hdr.IsReassocResp ())
{
NS_LOG_DEBUG ("association failed with sta=" << hdr.GetAddr1 ());
GetWifiRemoteStationManager ()->RecordGotAssocTxFailed (hdr.GetAddr1 ());
auto linkId = GetLinkIdByAddress (hdr.GetAddr2 ());
NS_ABORT_MSG_IF (!linkId.has_value (), "No link ID matching the TA");
if (GetWifiRemoteStationManager (*linkId)->IsWaitAssocTxOk (hdr.GetAddr1 ()))
{
NS_LOG_DEBUG ("AP=" << hdr.GetAddr2 () << " association failed with STA=" << hdr.GetAddr1 ());
GetWifiRemoteStationManager (*linkId)->RecordGotAssocTxFailed (hdr.GetAddr1 ());
}
if (auto staMldAddress = GetWifiRemoteStationManager (*linkId)->GetMldAddress (hdr.GetAddr1 ());
staMldAddress.has_value ())
{
// the STA is affiliated with an MLD
for (uint8_t i = 0; i < GetNLinks (); i++)
{
auto stationManager = GetWifiRemoteStationManager (i);
if (auto staAddress = stationManager->GetAffiliatedStaAddress (*staMldAddress);
staAddress.has_value ()
&& i != *linkId
&& stationManager->IsWaitAssocTxOk (*staAddress))
{
NS_LOG_DEBUG ("AP=" << GetFrameExchangeManager (i)->GetAddress ()
<< " association failed with STA=" << *staAddress);
stationManager->RecordGotAssocTxFailed (*staAddress);
}
}
}
}
}