Fix 802.11 management reassociation lifecycle handling

Restore the simplified station association bootstrap whenever its lifecycle starts so AP membership, BSS identity, association state, and bilateral negotiated HT peer state are recreated after shutdown or crash recovery.

Report reassociation outcomes through Ieee80211Prim_ReassociateConfirm, populate the AP address on association confirms, return a refused reassociation confirm before initial association, and preserve the reassociation primitive on timeout.

Scan complete frame sequences for acknowledged association responses instead of assuming the response and ACK are the final two steps. Also advertise only initialized mandatory supported-rate entries.

Extend the simplified-station module test with a deterministic stop/start cycle that verifies restored association and HT peer state. Validated with the release build, focused HT serializer and AP transaction unit tests, and the simplified-station lifecycle module test.

Author: mgonzalezlopezudc

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

@@ -145,9 +145,9 @@ void Ieee80211MgmtAp::receiveSignal(cComponent *source, simsignal_t signalID, cO
 
     if (signalID == IFrameSequenceHandler::frameSequenceFinishedSignal) {
         auto context = check_and_cast<FrameSequenceContext *>(obj);
-        if (context->getNumSteps() >= 2) {
-            auto transmitStep = dynamic_cast<ITransmitStep *>(context->getStepBeforeLast());
-            auto receiveStep = dynamic_cast<IReceiveStep *>(context->getLastStep());
+        for (int stepIndex = 0; stepIndex + 1 < context->getNumSteps(); stepIndex++) {
+            auto transmitStep = dynamic_cast<ITransmitStep *>(context->getStep(stepIndex));
+            auto receiveStep = dynamic_cast<IReceiveStep *>(context->getStep(stepIndex + 1));
             if (transmitStep && receiveStep) {
                 const Packet *responseFrame = getAssociationResponseFrame(transmitStep);
                 auto responseHeader = dynamicPtrCast<const Ieee80211MgmtHeader>(responseFrame->peekAtFront<Ieee80211MacHeader>());

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

@@ -47,11 +47,11 @@ void Ieee80211MgmtBase::receiveSignal(cComponent *source, simsignal_t signalID,
     if (signalID == modesetChangedSignal) {
         modeSet = check_and_cast<physicallayer::Ieee80211ModeSet *>(obj);
         mib->updateLocalHtCapabilities(modeSet);
-        supportedRates.numRates = std::min(8, modeSet->getNumModes());
         int rateIndex = 0;
-        for (int i = 0; i < supportedRates.numRates; i++)
+        for (int i = 0; i < modeSet->getNumModes() && rateIndex < 8; i++)
             if (modeSet->isMandatory(i))
                 supportedRates.rate[rateIndex++] = modeSet->getMode(i)->getDataMode()->getNetBitrate().get<Mbps>();
+        supportedRates.numRates = rateIndex;
     }
 }
 

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

@@ -125,7 +125,11 @@ void Ieee80211MgmtSta::handleTimer(cMessage *msg)
         EV << "Association timed out, AP address = " << ap->address << "\n";
 
         // send back failure report to agent
-        sendAssociationConfirm(ap, PRC_TIMEOUT);
+        if (reassociationInProgress)
+            sendReassociationConfirm(ap, PRC_TIMEOUT);
+        else
+            sendAssociationConfirm(ap, PRC_TIMEOUT);
+        reassociationInProgress = false;
     }
     else if (msg->getKind() == MK_SCAN_MAXCHANNELTIME) {
         // go to next channel during scanning
@@ -273,6 +277,7 @@ void Ieee80211MgmtSta::startAssociation(ApInfo *ap, simtime_t timeout)
     addHtCapabilities(body);
     body->setChunkLength(B(2 + 2 + (2 + strlen(body->getSSID())) + (2 + body->getSupportedRates().numRates)) + getHtMgmtElementsLength(body));
     sendManagementFrame("Assoc", body, ST_ASSOCIATIONREQUEST, ap->address);
+    reassociationInProgress = false;
 
     // schedule timeout
     ASSERT(assocTimeoutMsg == nullptr);
@@ -295,6 +300,7 @@ void Ieee80211MgmtSta::startReassociation(ApInfo *ap, simtime_t timeout)
     addHtCapabilities(body);
     body->setChunkLength(B(2 + 2 + 6 + (2 + strlen(body->getSSID())) + (2 + body->getSupportedRates().numRates)) + getHtMgmtElementsLength(body));
     sendManagementFrame("Reassoc", body, ST_REASSOCIATIONREQUEST, ap->address);
+    reassociationInProgress = true;
     assocTimeoutMsg = new cMessage("assocTimeout", MK_ASSOC_TIMEOUT);
     assocTimeoutMsg->setContextPointer(ap);
     scheduleAfter(timeout, assocTimeoutMsg);
@@ -468,6 +474,12 @@ void Ieee80211MgmtSta::processAssociateCommand(Ieee80211Prim_AssociateRequest *c
 void Ieee80211MgmtSta::processReassociateCommand(Ieee80211Prim_ReassociateRequest *ctrl)
 {
     const MacAddress& address = ctrl->getAddress();
+    if (!mib->bssStationData.isAssociated) {
+        auto confirm = new Ieee80211Prim_ReassociateConfirm();
+        confirm->setAddress(address);
+        sendConfirm(confirm, PRC_REFUSED);
+        return;
+    }
     ApInfo *ap = lookupAP(address);
     if (!ap)
         throw cRuntimeError("processReassociateCommand: AP not known: address = %s", address.str().c_str());
@@ -513,7 +525,16 @@ void Ieee80211MgmtSta::sendAuthenticationConfirm(ApInfo *ap, Ieee80211PrimResult
 
 void Ieee80211MgmtSta::sendAssociationConfirm(ApInfo *ap, Ieee80211PrimResultCode resultCode)
 {
-    sendConfirm(new Ieee80211Prim_AssociateConfirm(), resultCode);
+    auto confirm = new Ieee80211Prim_AssociateConfirm();
+    confirm->setAddress(ap->address);
+    sendConfirm(confirm, resultCode);
+}
+
+void Ieee80211MgmtSta::sendReassociationConfirm(ApInfo *ap, Ieee80211PrimResultCode resultCode)
+{
+    auto confirm = new Ieee80211Prim_ReassociateConfirm();
+    confirm->setAddress(ap->address);
+    sendConfirm(confirm, resultCode);
 }
 
 void Ieee80211MgmtSta::sendConfirm(Ieee80211PrimConfirm *confirm, Ieee80211PrimResultCode resultCode)
@@ -634,10 +655,10 @@ void Ieee80211MgmtSta::handleAssociationRequestFrame(Packet *packet, const Ptr<c
 
 void Ieee80211MgmtSta::handleAssociationResponseFrame(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header)
 {
-    processAssociationResponse(packet, header);
+    processAssociationResponse(packet, header, false);
 }
 
-void Ieee80211MgmtSta::processAssociationResponse(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header)
+void Ieee80211MgmtSta::processAssociationResponse(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header, bool reassociation)
 {
     EV << "Received Association or Reassociation Response frame\n";
 
@@ -677,6 +698,7 @@ void Ieee80211MgmtSta::processAssociationResponse(Packet *packet, const Ptr<cons
 
     cancelAndDelete(assocTimeoutMsg);
     assocTimeoutMsg = nullptr;
+    reassociationInProgress = false;
 
     if (statusCode != SC_SUCCESSFUL) {
         EV << "Association failed with AP address=" << ap->address << "\n";
@@ -712,7 +734,10 @@ void Ieee80211MgmtSta::processAssociationResponse(Packet *packet, const Ptr<cons
     }
 
     // report back to agent
-    sendAssociationConfirm(ap, statusCodeToPrimResultCode(statusCode));
+    if (reassociation)
+        sendReassociationConfirm(ap, statusCodeToPrimResultCode(statusCode));
+    else
+        sendAssociationConfirm(ap, statusCodeToPrimResultCode(statusCode));
 }
 
 void Ieee80211MgmtSta::handleReassociationRequestFrame(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header)
@@ -722,7 +747,7 @@ void Ieee80211MgmtSta::handleReassociationRequestFrame(Packet *packet, const Ptr
 
 void Ieee80211MgmtSta::handleReassociationResponseFrame(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header)
 {
-    processAssociationResponse(packet, header);
+    processAssociationResponse(packet, header, true);
 }
 
 void Ieee80211MgmtSta::handleDisassociationFrame(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header)

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

@@ -96,6 +96,7 @@ class INET_API Ieee80211MgmtSta : public Ieee80211MgmtBase
 
     // associated Access Point
     cMessage *assocTimeoutMsg; // if non-nullptr: association is in progress
+    bool reassociationInProgress = false;
     AssociatedApInfo assocAP;
 
   public:
@@ -133,7 +134,7 @@ class INET_API Ieee80211MgmtSta : public Ieee80211MgmtBase
     virtual void storeAPInfo(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header, const Ptr<const Ieee80211BeaconFrame>& body);
 
     /** Processes Association and Reassociation Responses without using cached Beacon capabilities. */
-    virtual void processAssociationResponse(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header);
+    virtual void processAssociationResponse(Packet *packet, const Ptr<const Ieee80211MgmtHeader>& header, bool reassociation);
 
     /** Switches to the next channel to scan; returns true if done (there wasn't any more channel to scan). */
     virtual bool scanNextChannel();
@@ -152,6 +153,7 @@ class INET_API Ieee80211MgmtSta : public Ieee80211MgmtBase
 
     /** Sends back result of association to the agent */
     virtual void sendAssociationConfirm(ApInfo *ap, Ieee80211PrimResultCode resultCode);
+    virtual void sendReassociationConfirm(ApInfo *ap, Ieee80211PrimResultCode resultCode);
 
     /** Utility function: Cancel the existing association */
     virtual void disassociate();

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

@@ -37,21 +37,32 @@ void Ieee80211MgmtStaSimplified::initialize(int stage)
         mib->bssStationData.isAssociated = true;
     }
     else if (stage == INITSTAGE_LINK_LAYER) {
-        L3AddressResolver addressResolver;
-        auto accessPointAddress = addressResolver.resolve(par("accessPointAddress"), L3AddressResolver::ADDR_MAC).toMac();
-        mib->bssData.bssid = accessPointAddress;
-        auto apMib = findAccessPointMib(accessPointAddress);
-        apMib->bssAccessPointData.stations[mib->address] = Ieee80211Mib::ASSOCIATED;
-        mib->bssData.ssid = apMib->bssData.ssid;
+        configureAssociation();
     }
-    else if (stage == INITSTAGE_LAST) {
-        auto apMib = findAccessPointMib(mib->bssData.bssid);
-        // Simplified management is an explicit no-air abstraction: install the state that the
-        // Association Request/Response exchange would have committed in detailed management.
-        if (mib->isHtOperationSupported() && apMib->isHtOperationSupported()) {
-            mib->setPeerHtCapabilities(apMib->address, apMib->localHtCapabilities, apMib->htOperation);
-            apMib->setPeerHtCapabilities(mib->address, mib->localHtCapabilities, apMib->htOperation);
-        }
+    else if (stage == INITSTAGE_LAST)
+        configureAssociation();
+}
+
+void Ieee80211MgmtStaSimplified::start()
+{
+    Ieee80211MgmtBase::start();
+    configureAssociation();
+}
+
+void Ieee80211MgmtStaSimplified::configureAssociation()
+{
+    L3AddressResolver addressResolver;
+    auto accessPointAddress = addressResolver.resolve(par("accessPointAddress"), L3AddressResolver::ADDR_MAC).toMac();
+    mib->bssData.bssid = accessPointAddress;
+    auto apMib = findAccessPointMib(accessPointAddress);
+    apMib->bssAccessPointData.stations[mib->address] = Ieee80211Mib::ASSOCIATED;
+    mib->bssData.ssid = apMib->bssData.ssid;
+    mib->bssStationData.isAssociated = true;
+    // Simplified management is an explicit no-air abstraction: install the state that the
+    // Association Request/Response exchange would have committed in detailed management.
+    if (mib->isHtOperationSupported() && apMib->isHtOperationSupported()) {
+        mib->setPeerHtCapabilities(apMib->address, apMib->localHtCapabilities, apMib->htOperation);
+        apMib->setPeerHtCapabilities(mib->address, mib->localHtCapabilities, apMib->htOperation);
     }
 }
 

src/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtStaSimplified.h

@@ -25,6 +25,8 @@ class INET_API Ieee80211MgmtStaSimplified : public Ieee80211MgmtBase
   protected:
     virtual int numInitStages() const override { return NUM_INIT_STAGES; }
     virtual void initialize(int) override;
+    virtual void start() override;
+    virtual void configureAssociation();
 
     /** Implements abstract Ieee80211MgmtBase method */
     virtual void handleTimer(cMessage *msg) override;
@@ -52,4 +54,3 @@ class INET_API Ieee80211MgmtStaSimplified : public Ieee80211MgmtBase
 } // namespace inet
 
 #endif
-

tests/module/Ieee80211MgmtStaSimplifiedInitialization_1.test

@@ -47,11 +47,25 @@ class TestInitializationObserver : public cSimpleModule
                 ASSERT(apMib->findPeerHtState(staMib->address) != nullptr);
                 ASSERT(staMib->findPeerHtState(apMib->address) != nullptr);
                 std::cout << "Simplified STA HT peer state installed at last initialization stage.\n";
+                scheduleAt(SimTime(3, SIMTIME_US), new cMessage("checkRestart"));
             }
         }
     }
 
-    virtual void handleMessage(cMessage *message) override { throw cRuntimeError("Unexpected message"); }
+    virtual void handleMessage(cMessage *message) override
+    {
+        auto apInterface = check_and_cast<NetworkInterface *>(getModuleByPath("^.ap.wlan[0]"));
+        auto staInterface = check_and_cast<NetworkInterface *>(getModuleByPath("^.sta.wlan[0]"));
+        auto apMib = check_and_cast<ieee80211::Ieee80211Mib *>(apInterface->getSubmodule("mib"));
+        auto staMib = check_and_cast<ieee80211::Ieee80211Mib *>(staInterface->getSubmodule("mib"));
+        ASSERT(staMib->bssStationData.isAssociated);
+        ASSERT(staMib->bssData.ssid == apMib->bssData.ssid);
+        ASSERT(apMib->bssAccessPointData.stations.at(staMib->address) == ieee80211::Ieee80211Mib::ASSOCIATED);
+        ASSERT(apMib->findPeerHtState(staMib->address) != nullptr);
+        ASSERT(staMib->findPeerHtState(apMib->address) != nullptr);
+        std::cout << "Simplified STA association and HT peer state restored after restart.\n";
+        delete message;
+    }
 };
 
 Define_Module(TestInitializationObserver);
@@ -61,6 +75,7 @@ Define_Module(TestInitializationObserver);
 %file: test.ned
 
 import inet.common.SimpleModule;
+import inet.common.scenario.ScenarioManager;
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.WirelessHost;
 import inet.node.wireless.AccessPoint;
@@ -83,6 +98,7 @@ network Ieee80211MgmtStaSimplifiedInitializationTestNetwork
     submodules:
         radioMedium: Ieee80211ScalarRadioMedium;
         configurator: TestIpv4NetworkConfigurator;
+        scenarioManager: ScenarioManager;
         ap: AccessPoint {
             parameters:
                 wlan[*].mgmt.typename = "Ieee80211MgmtApSimplified";
@@ -101,7 +117,7 @@ network Ieee80211MgmtStaSimplifiedInitializationTestNetwork
 [General]
 network = Ieee80211MgmtStaSimplifiedInitializationTestNetwork
 ned-path = .;../../../../src;../../lib
-sim-time-limit = 1us
+sim-time-limit = 4us
 cmdenv-express-mode = true
 record-vector-results = false
 record-scalar-results = false
@@ -111,6 +127,8 @@ record-scalar-results = false
 *.ap.wlan[0].mgmt.ssid = "review-ssid"
 *.sta.wlan[0].mgmt.accessPointAddress = "02:00:00:00:00:01"
 **.wlan[0].opMode = "n(mixed-2.4Ghz)"
+**.hasStatus = true
+**.scenarioManager.script = xmldoc("scenario.xml")
 **.wlan[0].bitrate = 65Mbps
 **.wlan[0].radio.bandName = "2.4 GHz"
 **.wlan[0].radio.centerFrequency = 2.4GHz
@@ -122,8 +140,22 @@ record-scalar-results = false
 **.mobility.constraintAreaMaxY = 100m
 **.mobility.constraintAreaMaxZ = 0m
 
+%file: scenario.xml
+
+<scenario>
+    <at t="1us">
+        <shutdown module="sta"/>
+    </at>
+    <at t="2us">
+        <startup module="sta"/>
+    </at>
+</scenario>
+
 %contains: stdout
 Simplified STA wireless identity available during network configuration.
 
 %contains: stdout
 Simplified STA HT peer state installed at last initialization stage.
+
+%contains: stdout
+Simplified STA association and HT peer state restored after restart.