fix(ieee80211): track association IDs in MIB

Author: mgonzalezlopezudc

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

@@ -144,8 +144,10 @@ void Ieee80211MgmtAp::handleAuthenticationFrame(Packet *packet, const Ptr<const
     // receives authentication frame number 1 from STA, which will cause the AP to return an Auth-Error
     // making the MN STA to start the handover process all over again.
     if (frameAuthSeq == 1) {
-        if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED)
+        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;
     }
@@ -179,8 +181,10 @@ void Ieee80211MgmtAp::handleAuthenticationFrame(Packet *packet, const Ptr<const
 
     // update status
     if (isLast) {
-        if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED)
+        if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED) {
             sendDisAssocNotification(sta->address);
+            mib->releaseAssociationId(sta->address);
+        }
         mib->bssAccessPointData.stations[sta->address] = Ieee80211Mib::AUTHENTICATED; // TODO only when ACK of this frame arrives
         EV << "STA authenticated\n";
     }
@@ -199,8 +203,10 @@ void Ieee80211MgmtAp::handleDeauthenticationFrame(Packet *packet, const Ptr<cons
 
     if (sta) {
         // mark STA as not authenticated; alternatively, it could also be removed from staList
-        if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED)
+        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;
     }
@@ -282,8 +288,10 @@ void Ieee80211MgmtAp::handleDisassociationFrame(Packet *packet, const Ptr<const
     delete packet;
 
     if (sta) {
-        if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED)
+        if (mib->bssAccessPointData.stations[sta->address] == Ieee80211Mib::ASSOCIATED) {
             sendDisAssocNotification(sta->address);
+            mib->releaseAssociationId(sta->address);
+        }
         mib->bssAccessPointData.stations[sta->address] = Ieee80211Mib::AUTHENTICATED;
     }
 }
@@ -348,6 +356,7 @@ void Ieee80211MgmtAp::stop()
 {
     cancelEvent(beaconTimer);
     staList.clear();
+    mib->bssAccessPointData.associationIds.clear();
     Ieee80211MgmtApBase::stop();
 }
 

src/inet/linklayer/ieee80211/mib/Ieee80211Mib.cc

@@ -23,6 +23,7 @@ void Ieee80211Mib::initialize(int stage)
         WATCH(bssStationData.stationType);
         WATCH(bssStationData.isAssociated);
         WATCH(bssAccessPointData.stations);
+        WATCH(bssAccessPointData.associationIds);
         WATCH_EXPR("modeStr", getModeStr(mode));
         WATCH_EXPR("stationTypeStr", getStationTypeStr(bssStationData.stationType));
         WATCH_EXPR("qosStr", qos ? ", QoS" : ", Non-QoS");
@@ -58,7 +59,31 @@ const char *Ieee80211Mib::getStationTypeStr(Ieee80211Mib::BssStationType station
     }
 }
 
+short Ieee80211Mib::allocateAssociationId(const MacAddress& address)
+{
+    auto existing = bssAccessPointData.associationIds.find(address);
+    if (existing != bssAccessPointData.associationIds.end())
+        return existing->second;
+    for (short aid = 1; aid <= 2007; aid++) {
+        bool used = false;
+        for (const auto& entry : bssAccessPointData.associationIds)
+            if (entry.second == aid) {
+                used = true;
+                break;
+            }
+        if (!used) {
+            bssAccessPointData.associationIds[address] = aid;
+            return aid;
+        }
+    }
+    throw cRuntimeError("No IEEE 802.11 association ID is available");
+}
+
+void Ieee80211Mib::releaseAssociationId(const MacAddress& address)
+{
+    bssAccessPointData.associationIds.erase(address);
+}
+
 } // namespace ieee80211
 
 } // namespace inet
-

src/inet/linklayer/ieee80211/mib/Ieee80211Mib.h

@@ -50,6 +50,7 @@ class INET_API Ieee80211Mib : public SimpleModule
     class INET_API BssAccessPointData {
       public:
         std::map<MacAddress, BssMemberStatus> stations;
+        std::map<MacAddress, short> associationIds;
     };
 
   public:
@@ -68,11 +69,12 @@ class INET_API Ieee80211Mib : public SimpleModule
     static const char *getModeStr(Ieee80211Mib::Mode mode);
     static const char *getStationTypeStr(Ieee80211Mib::BssStationType stationType);
     std::string getSsidStr() const;
+    short allocateAssociationId(const MacAddress& address);
+    void releaseAssociationId(const MacAddress& address);
 };
 
 } // namespace ieee80211
 
 } // namespace inet
 
 #endif
-