Fix IEEE 802.11 association transaction handling

Author: mgonzalezlopezudc

src/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtAp.cc

@@ -395,14 +395,14 @@ void Ieee80211MgmtAp::handleDeauthenticationFrame(Packet *packet, const Ptr<cons
     delete packet;
 
     if (sta) {
+        clearPendingAssociation(sta);
         // mark STA as not authenticated; alternatively, it could also be removed from staList
         if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED) {
             sendDisAssocNotification(sta->address);
             mib->releaseAssociationId(sta->address);
         }
         mib->bssAccessPointData.stations[sta->address] = Ieee80211Mib::NOT_AUTHENTICATED;
         sta->authSeqExpected = 1;
-        clearPendingAssociation(sta);
         mib->removePeerHtCapabilities(sta->address);
     }
 }
@@ -507,12 +507,12 @@ void Ieee80211MgmtAp::handleDisassociationFrame(Packet *packet, const Ptr<const
     delete packet;
 
     if (sta) {
+        clearPendingAssociation(sta);
         if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED) {
             sendDisAssocNotification(sta->address);
             mib->releaseAssociationId(sta->address);
         }
         mib->bssAccessPointData.stations[sta->address] = Ieee80211Mib::AUTHENTICATED;
-        clearPendingAssociation(sta);
         mib->removePeerHtCapabilities(sta->address);
     }
 }

src/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtSta.cc

@@ -678,6 +678,16 @@ void Ieee80211MgmtSta::processAssociationResponse(Packet *packet, const Ptr<cons
         return;
     }
 
+    // IEEE Std 802.11-2024, 11.3.5.2 and 11.3.5.4: process only the response
+    // corresponding to the association or reassociation procedure in progress.
+    if (reassociation != reassociationInProgress) {
+        EV_INFO << "Association response subtype does not match the pending "
+                << (reassociationInProgress ? "reassociation" : "association")
+                << " attempt, ignoring frame\n";
+        delete packet;
+        return;
+    }
+
     MacAddress address = header->getTransmitterAddress();
     ApInfo *ap = static_cast<ApInfo *>(assocTimeoutMsg->getContextPointer());
     if (ap == nullptr || ap->address != address) {

src/inet/physicallayer/wireless/ieee80211/bitlevel/Ieee80211LayeredOfdmReceiver.cc

@@ -7,6 +7,7 @@
 
 #include "inet/physicallayer/wireless/ieee80211/bitlevel/Ieee80211LayeredOfdmReceiver.h"
 
+#include "inet/common/ProtocolTag_m.h"
 #include "inet/common/packet/chunk/BytesChunk.h"
 #include "inet/physicallayer/wireless/common/analogmodel/dimensional/DimensionalReceptionAnalogModel.h"
 #include "inet/physicallayer/wireless/common/analogmodel/dimensional/DimensionalMediumAnalogModel.h"
@@ -411,6 +412,14 @@ const IReceptionResult *Ieee80211LayeredOfdmReceiver::computeReceptionResult(con
     }
     // add indications
     auto packet = const_cast<Packet *>(packetModel->getPacket());
+    // Packet-domain error models duplicate the transmitted packet, including
+    // sender-local tags.  Reception results must expose only metadata that is
+    // authoritative at this boundary, just like ReceiverBase does for flat
+    // packet-level radios.
+    auto transmittedPacket = transmission->getPacket();
+    auto transmittedProtocolTag = transmittedPacket->getTag<PacketProtocolTag>();
+    packet->clearTags();
+    packet->addTag<PacketProtocolTag>()->setProtocol(transmittedProtocolTag->getProtocol());
     auto snirInd = packet->addTagIfAbsent<SnirInd>();
     snirInd->setMinimumSnir(snir->getMin());
     snirInd->setMaximumSnir(snir->getMax());

tests/module/Ieee80211MgmtApTimeout_1.test

@@ -64,14 +64,31 @@ class TestIeee80211MgmtAp : public Ieee80211MgmtAp
         return aid;
     }
 
-    void finishSuccessfulReassociation(const MacAddress& address)
+    short startPendingAssociatedReassociation(const MacAddress& address)
     {
+        Enter_Method("startPendingAssociatedReassociation");
+        auto& sta = staList[address];
+        sta.address = address;
+        clearPendingAssociation(&sta);
+        short aid = mib->allocateAssociationId(address);
+        mib->bssAccessPointData.stations[address] = Ieee80211Mib::ASSOCIATED;
+        ASSERT(mib->reserveAssociationId(address) == aid);
+        sta.pendingAssociationSuccessful = true;
+        sta.pendingAssociationTransactionId = createAssociationTransactionId();
+        startAssociationResponseTimeout(&sta);
+        return aid;
+    }
+
+    void finishSuccessfulReassociation(const MacAddress& address, uint64_t transactionId = 0)
+    {
+        if (transactionId == 0)
+            transactionId = staList.at(address).pendingAssociationTransactionId;
         auto response = new Packet("ReassocResp-OK");
         auto responseHeader = makeShared<Ieee80211MgmtHeader>();
         responseHeader->setType(ST_REASSOCIATIONRESPONSE);
         responseHeader->setReceiverAddress(address);
         response->insertAtBack(responseHeader);
-        response->addTag<Ieee80211MgmtTransactionTag>()->setTransactionId(staList.at(address).pendingAssociationTransactionId);
+        response->addTag<Ieee80211MgmtTransactionTag>()->setTransactionId(transactionId);
 
         FrameSequenceContext context(MacAddress::UNSPECIFIED_ADDRESS, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
         auto transmitStep = new TransmitStep(response, SIMTIME_ZERO);
@@ -86,12 +103,32 @@ class TestIeee80211MgmtAp : public Ieee80211MgmtAp
         delete response;
     }
 
+    void deauthenticate(const MacAddress& address)
+    {
+        Enter_Method("deauthenticate");
+        auto packet = new Packet("Deauth");
+        auto header = makeShared<Ieee80211MgmtHeader>();
+        header->setTransmitterAddress(address);
+        handleDeauthenticationFrame(packet, header);
+    }
+
+    void disassociate(const MacAddress& address)
+    {
+        Enter_Method("disassociate");
+        auto packet = new Packet("Disassoc");
+        auto header = makeShared<Ieee80211MgmtHeader>();
+        header->setTransmitterAddress(address);
+        handleDisassociationFrame(packet, header);
+    }
+
     bool hasPendingAssociation(const MacAddress& address) const
     {
         auto it = staList.find(address);
         return it != staList.end() && it->second.pendingAssociationTransactionId != 0;
     }
 
+    uint64_t getPendingAssociationTransactionId(const MacAddress& address) const { return staList.at(address).pendingAssociationTransactionId; }
+
     short reserveAssociationId(const MacAddress& address) { return mib->reserveAssociationId(address); }
     void cancelAssociationIdReservation(const MacAddress& address) { mib->cancelAssociationIdReservation(address); }
     bool hasCommittedAssociationId(const MacAddress& address) const { return mib->bssAccessPointData.associationIds.find(address) != mib->bssAccessPointData.associationIds.end(); }
@@ -109,8 +146,10 @@ class Ieee80211MgmtApTimeoutTest : public cSimpleModule, public cListener
   protected:
     TestIeee80211MgmtAp *mgmt = nullptr;
     MacAddress expectedAssociatedAddress;
+    MacAddress expectedDisassociatedAddress;
     short expectedAssociationId = 0;
     int associationNotifications = 0;
+    int disassociationNotifications = 0;
 
   public:
     Ieee80211MgmtApTimeoutTest() : cSimpleModule(65536) {}
@@ -120,17 +159,25 @@ class Ieee80211MgmtApTimeoutTest : public cSimpleModule, public cListener
     {
         mgmt = check_and_cast<TestIeee80211MgmtAp *>(getModuleByPath("^.ap.wlan[0].mgmt"));
         mgmt->subscribe(l2ApAssociatedSignal, this);
+        mgmt->subscribe(l2ApDisassociatedSignal, this);
     }
 
     virtual void receiveSignal(cComponent *source, simsignal_t signalID, cObject *value, cObject *details) override
     {
         ASSERT(source == mgmt);
-        ASSERT(signalID == l2ApAssociatedSignal);
         const auto& notification = check_and_cast<Ieee80211MgmtAp::NotificationInfoSta *>(value);
-        ASSERT(notification->getStaAddress() == expectedAssociatedAddress);
-        ASSERT(mgmt->getStationStatus(expectedAssociatedAddress) == Ieee80211Mib::ASSOCIATED);
-        ASSERT(mgmt->getCommittedAssociationId(expectedAssociatedAddress) == expectedAssociationId);
-        associationNotifications++;
+        if (signalID == l2ApAssociatedSignal) {
+            ASSERT(notification->getStaAddress() == expectedAssociatedAddress);
+            ASSERT(mgmt->getStationStatus(expectedAssociatedAddress) == Ieee80211Mib::ASSOCIATED);
+            ASSERT(mgmt->getCommittedAssociationId(expectedAssociatedAddress) == expectedAssociationId);
+            associationNotifications++;
+        }
+        else {
+            ASSERT(signalID == l2ApDisassociatedSignal);
+            ASSERT(notification->getStaAddress() == expectedDisassociatedAddress);
+            ASSERT(!mgmt->hasPendingAssociation(expectedDisassociatedAddress));
+            disassociationNotifications++;
+        }
     }
 
     virtual void activity() override
@@ -181,6 +228,30 @@ class Ieee80211MgmtApTimeoutTest : public cSimpleModule, public cListener
         ASSERT(associationNotifications == 1);
         ASSERT(!mgmt->hasPendingAssociation(expectedAssociatedAddress));
 
+        MacAddress deauthenticated("02:00:00:00:00:07");
+        mgmt->startPendingAssociatedReassociation(deauthenticated);
+        uint64_t staleDeauthenticationTransaction = mgmt->getPendingAssociationTransactionId(deauthenticated);
+        expectedDisassociatedAddress = deauthenticated;
+        mgmt->deauthenticate(deauthenticated);
+        ASSERT(disassociationNotifications == 1);
+        ASSERT(!mgmt->hasPendingAssociation(deauthenticated));
+        ASSERT(!mgmt->hasCommittedAssociationId(deauthenticated));
+        ASSERT(mgmt->getStationStatus(deauthenticated) == Ieee80211Mib::NOT_AUTHENTICATED);
+        mgmt->finishSuccessfulReassociation(deauthenticated, staleDeauthenticationTransaction);
+        ASSERT(!mgmt->hasCommittedAssociationId(deauthenticated));
+
+        MacAddress disassociated("02:00:00:00:00:08");
+        mgmt->startPendingAssociatedReassociation(disassociated);
+        uint64_t staleDisassociationTransaction = mgmt->getPendingAssociationTransactionId(disassociated);
+        expectedDisassociatedAddress = disassociated;
+        mgmt->disassociate(disassociated);
+        ASSERT(disassociationNotifications == 2);
+        ASSERT(!mgmt->hasPendingAssociation(disassociated));
+        ASSERT(!mgmt->hasCommittedAssociationId(disassociated));
+        ASSERT(mgmt->getStationStatus(disassociated) == Ieee80211Mib::AUTHENTICATED);
+        mgmt->finishSuccessfulReassociation(disassociated, staleDisassociationTransaction);
+        ASSERT(!mgmt->hasCommittedAssociationId(disassociated));
+
         std::cout << "AP association response timeout lifecycle verified.\n";
         std::cout << "AP reassociation notification commit ordering verified.\n";
     }