ieee80211: make rate control adapt per receiver, add per-receiver configured rates

src/inet/linklayer/ieee80211/mac/common/StationLabelCache.cc

@@ -0,0 +1,36 @@
+//
+// Copyright (C) 2026 OpenSim Ltd.
+//
+// SPDX-License-Identifier: LGPL-3.0-or-later
+//
+
+
+#include "inet/linklayer/ieee80211/mac/common/StationLabelCache.h"
+
+#include "inet/networklayer/common/L3AddressResolver.h"
+
+namespace inet {
+namespace ieee80211 {
+
+const std::string& StationLabelCache::getLabel(const MacAddress& receiver)
+{
+    auto cached = labels.find(receiver);
+    if (cached != labels.end())
+        return cached->second;
+    // resolve the receiver MAC to the network node that owns it; fall back to the MAC
+    std::string label = receiver.str();
+    if (cModule *node = L3AddressResolver().findHostWithMacAddress(receiver)) {
+        // the path relative to the network, so that nodes of the same name in different
+        // subnetworks get different labels; for a node directly under the network this
+        // is just its name
+        label = node->getFullPath();
+        std::string networkPrefix = std::string(getSimulation()->getSystemModule()->getFullName()) + ".";
+        if (label.compare(0, networkPrefix.length(), networkPrefix) == 0)
+            label.erase(0, networkPrefix.length());
+    }
+    return labels[receiver] = label;
+}
+
+} // namespace ieee80211
+} // namespace inet
+

src/inet/linklayer/ieee80211/mac/common/StationLabelCache.h

@@ -0,0 +1,42 @@
+//
+// Copyright (C) 2026 OpenSim Ltd.
+//
+// SPDX-License-Identifier: LGPL-3.0-or-later
+//
+
+
+#ifndef __INET_STATIONLABELCACHE_H
+#define __INET_STATIONLABELCACHE_H
+
+#include <map>
+#include <string>
+
+#include "inet/linklayer/common/MacAddress.h"
+
+namespace inet {
+namespace ieee80211 {
+
+/**
+ * Resolves receiver MAC addresses to peer network node names, caching the result.
+ *
+ * The label identifies a station in a per-station signal emission: it names the details
+ * object emitted with the value, which a demux() result filter and the statistic bar
+ * chart visualizer key their per-station series on. Resolving sweeps the interface
+ * tables of all network nodes recursively, so it is done at most once per receiver.
+ */
+class INET_API StationLabelCache
+{
+  protected:
+    std::map<MacAddress, std::string> labels;
+
+  public:
+    // The receiver's network node path relative to the network if it can be resolved
+    // (just the node name unless it is nested in a subnetwork), otherwise the MAC address string.
+    const std::string& getLabel(const MacAddress& receiver);
+};
+
+} // namespace ieee80211
+} // namespace inet
+
+#endif
+

src/inet/linklayer/ieee80211/mac/contract/IRateControl.h

@@ -9,6 +9,7 @@
 #define __INET_IRATECONTROL_H
 
 #include "inet/common/packet/Packet.h"
+#include "inet/linklayer/common/MacAddress.h"
 #include "inet/linklayer/ieee80211/mac/Ieee80211Frame_m.h"
 #include "inet/physicallayer/wireless/ieee80211/mode/Ieee80211ModeSet.h"
 #include "inet/physicallayer/wireless/ieee80211/packetlevel/Ieee80211ControlInfo_m.h"
@@ -25,7 +26,8 @@ class INET_API IRateControl
   public:
     virtual ~IRateControl() {}
 
-    virtual const physicallayer::IIeee80211Mode *getRate() = 0;
+    // Returns the rate to use for a unicast frame addressed to the given receiver.
+    virtual const physicallayer::IIeee80211Mode *getRate(const MacAddress& receiverAddress) = 0;
     virtual void frameTransmitted(Packet *frame, int retryCount, bool isSuccessful, bool isGivenUp) = 0;
     virtual void frameReceived(Packet *frame) = 0;
 };

src/inet/linklayer/ieee80211/mac/contract/IRateSelection.cc

@@ -10,8 +10,22 @@
 namespace inet {
 namespace ieee80211 {
 
+using namespace inet::physicallayer;
+
 simsignal_t IRateSelection::datarateSelectedSignal = cComponent::registerSignal("datarateSelected");
 
+void IRateSelection::emitDatarateSelected(cComponent *emitter, StationLabelCache& stationLabels, const Ptr<const Ieee80211MacHeader>& header, const IIeee80211Mode *mode)
+{
+    double rate = mode->getDataMode()->getNetBitrate().get<bps>();
+    auto dataHeader = dynamicPtrCast<const Ieee80211DataHeader>(header);
+    if (dataHeader != nullptr && !dataHeader->getReceiverAddress().isMulticast()) {
+        cNamedObject details(stationLabels.getLabel(dataHeader->getReceiverAddress()).c_str());
+        emitter->emit(datarateSelectedSignal, rate, &details);
+    }
+    else
+        emitter->emit(datarateSelectedSignal, rate);
+}
+
 } // namespace ieee80211
 } // namespace inet
 

src/inet/linklayer/ieee80211/mac/contract/IRateSelection.h

@@ -10,6 +10,7 @@
 
 #include "inet/common/packet/Packet.h"
 #include "inet/linklayer/ieee80211/mac/Ieee80211Frame_m.h"
+#include "inet/linklayer/ieee80211/mac/common/StationLabelCache.h"
 #include "inet/physicallayer/wireless/ieee80211/mode/IIeee80211Mode.h"
 #include "inet/physicallayer/wireless/ieee80211/mode/Ieee80211ModeSet.h"
 
@@ -26,6 +27,15 @@ class INET_API IRateSelection
   public:
     static simsignal_t datarateSelectedSignal;
 
+    // Emits datarateSelected on behalf of a coordination function. Unicast data frames are tagged
+    // with the receiver's station label as a named details object, so that a demux(datarateSelected)
+    // result filter or the statistic bar chart visualizer can key a separate per-station series on
+    // it; this mirrors the condition under which ~RateSelection applies a per-receiver configured
+    // rate, so the label always names the station whose rate is reported. Control, management and
+    // group-addressed frames carry no per-station data rate and are emitted without details: the
+    // aggregate datarateSelected statistic still records them, a bar chart ignores them.
+    static void emitDatarateSelected(cComponent *emitter, StationLabelCache& stationLabels, const Ptr<const Ieee80211MacHeader>& header, const physicallayer::IIeee80211Mode *mode);
+
   public:
     virtual ~IRateSelection() {}
 

src/inet/linklayer/ieee80211/mac/coordinationfunction/Dcf.cc

@@ -102,7 +102,7 @@ void Dcf::transmitControlResponseFrame(Packet *responsePacket, const Ptr<const I
     else
         throw cRuntimeError("Unknown received frame type");
     RateSelection::setFrameMode(responsePacket, responseHeader, responseMode);
-    emit(IRateSelection::datarateSelectedSignal, responseMode->getDataMode()->getNetBitrate().get<bps>(), responsePacket);
+    IRateSelection::emitDatarateSelected(this, stationLabels, responseHeader, responseMode);
     EV_DEBUG << "Datarate for " << responsePacket->getName() << " is set to " << responseMode->getDataMode()->getNetBitrate() << ".\n";
     tx->transmitFrame(responsePacket, responseHeader, modeSet->getSifsTime(), this);
     delete responsePacket;
@@ -166,7 +166,7 @@ void Dcf::transmitFrame(Packet *packet, simtime_t ifs)
     const auto& header = packet->peekAtFront<Ieee80211MacHeader>();
     auto mode = rateSelection->computeMode(packet, header);
     RateSelection::setFrameMode(packet, header, mode);
-    emit(IRateSelection::datarateSelectedSignal, mode->getDataMode()->getNetBitrate().get<bps>(), packet);
+    IRateSelection::emitDatarateSelected(this, stationLabels, header, mode);
     EV_DEBUG << "Datarate for " << packet->getName() << " is set to " << mode->getDataMode()->getNetBitrate() << ".\n";
     auto pendingPacket = channelAccess->getInProgressFrames()->getPendingFrameFor(packet);
     auto duration = originatorProtectionMechanism->computeDurationField(packet, header, pendingPacket, pendingPacket == nullptr ? nullptr : pendingPacket->peekAtFront<Ieee80211DataOrMgmtHeader>());

src/inet/linklayer/ieee80211/mac/coordinationfunction/Dcf.h

@@ -50,6 +50,8 @@ class INET_API Dcf : public ICoordinationFunction, public IFrameSequenceHandler:
     ITx *tx = nullptr;
 
     IRateSelection *rateSelection = nullptr;
+    // Names the station a datarateSelected value belongs to (see ~IRateSelection::emitDatarateSelected)
+    StationLabelCache stationLabels;
 
     // Channel access method
     Dcaf *channelAccess = nullptr;

src/inet/linklayer/ieee80211/mac/coordinationfunction/Hcf.cc

@@ -668,7 +668,7 @@ void Hcf::transmitFrame(Packet *packet, simtime_t ifs)
         }
         auto mode = rateSelection->computeMode(packet, header, txop);
         setFrameMode(packet, header, mode);
-        emit(IRateSelection::datarateSelectedSignal, mode->getDataMode()->getNetBitrate().get<bps>(), packet);
+        IRateSelection::emitDatarateSelected(this, stationLabels, header, mode);
         EV_DEBUG << "Datarate for " << packet->getName() << " is set to " << mode->getDataMode()->getNetBitrate() << ".\n";
         if (txop->getProtectionMechanism() == TxopProcedure::ProtectionMechanism::SINGLE_PROTECTION) {
             auto pendingPacket = channelOwner->getInProgressFrames()->getPendingFrameFor(packet);
@@ -703,7 +703,7 @@ void Hcf::transmitControlResponseFrame(Packet *responsePacket, const Ptr<const I
     else
         throw cRuntimeError("Unknown received frame type");
     setFrameMode(responsePacket, responseHeader, responseMode);
-    emit(IRateSelection::datarateSelectedSignal, responseMode->getDataMode()->getNetBitrate().get<bps>(), responsePacket);
+    IRateSelection::emitDatarateSelected(this, stationLabels, responseHeader, responseMode);
     EV_DEBUG << "Datarate for " << responsePacket->getName() << " is set to " << responseMode->getDataMode()->getNetBitrate() << ".\n";
     tx->transmitFrame(responsePacket, responseHeader, modeSet->getSifsTime(), this);
     delete responsePacket;

src/inet/linklayer/ieee80211/mac/coordinationfunction/Hcf.h

@@ -64,6 +64,8 @@ class INET_API Hcf : public ICoordinationFunction, public IFrameSequenceHandler:
     ITx *tx = nullptr;
 
     IQosRateSelection *rateSelection = nullptr;
+    // Names the station a datarateSelected value belongs to (see ~IRateSelection::emitDatarateSelected)
+    StationLabelCache stationLabels;
 
     // Channel Access Methods
     Edca *edca = nullptr;

src/inet/linklayer/ieee80211/mac/originator/TxopProcedure.cc

@@ -96,7 +96,7 @@ simtime_t TxopProcedure::getRemaining() const
     if (start == -1)
         throw cRuntimeError("Txop has not started yet");
     auto now = simTime();
-    return now > start + limit ? 0 : now - start;
+    return now > start + limit ? 0 : start + limit - now;
 }
 
 simtime_t TxopProcedure::getDuration() const

src/inet/linklayer/ieee80211/mac/ratecontrol/AarfRateControl.cc

@@ -19,18 +19,14 @@ void AarfRateControl::initialize(int stage)
     RateControlBase::initialize(stage);
     if (stage == INITSTAGE_LOCAL) {
         factor = par("increaseThresholdFactor");
-        increaseThreshold = par("increaseThreshold");
         maxIncreaseThreshold = par("maxIncreaseThreshold");
         decreaseThreshold = par("decreaseThreshold");
         interval = par("interval");
+        WATCH_EXPR("numStations", (int)stations.size());
         WATCH(factor);
-        WATCH(increaseThreshold);
         WATCH(maxIncreaseThreshold);
         WATCH(decreaseThreshold);
         WATCH(interval);
-        WATCH(timer);
-        WATCH(probing);
-        WATCH(numberOfConsSuccTransmissions);
     }
     else if (stage == INITSTAGE_LINK_LAYER) {
     }
@@ -41,80 +37,96 @@ void AarfRateControl::handleMessage(cMessage *msg)
     throw cRuntimeError("This module doesn't handle self messages");
 }
 
+
+AarfRateControl::State& AarfRateControl::stateFor(const MacAddress& receiverAddress)
+{
+    auto it = stations.find(receiverAddress);
+    if (it == stations.end()) {
+        State state;
+        state.address = receiverAddress;
+        state.mode = getInitialMode();
+        state.increaseThreshold = par("increaseThreshold");
+        state.timer = simTime(); // the interval starts when the station is first seen, not at t=0
+        it = stations.insert({receiverAddress, state}).first;
+        emitDatarateChangedSignal(state.address, state.mode);
+    }
+    return it->second;
+}
+
 void AarfRateControl::frameTransmitted(Packet *frame, int retryCount, bool isSuccessful, bool isGivenUp)
 {
-    increaseRateIfTimerIsExpired();
-
-    if (!isSuccessful && probing) { // probing packet failed
-        numberOfConsSuccTransmissions = 0;
-        currentMode = decreaseRateIfPossible(currentMode);
-        emitDatarateChangedSignal();
-        EV_DETAIL << "Decreased rate to " << *currentMode << endl;
-        multiplyIncreaseThreshold(factor);
-        resetTimer();
+    State& state = stateFor(getReceiverAddress(frame));
+    increaseRateIfTimerIsExpired(state);
+
+    if (!isSuccessful && state.probing) { // probing packet failed
+        state.numberOfConsSuccTransmissions = 0;
+        state.mode = decreaseRateIfPossible(state.mode);
+        emitDatarateChangedSignal(state.address, state.mode);
+        EV_DETAIL << "Decreased rate to " << *state.mode << endl;
+        multiplyIncreaseThreshold(state, factor);
+        resetTimer(state);
     }
     else if (!isSuccessful && retryCount >= decreaseThreshold - 1) { // decreaseThreshold consecutive failed transmissions
-        numberOfConsSuccTransmissions = 0;
-        currentMode = decreaseRateIfPossible(currentMode);
-        emitDatarateChangedSignal();
-        EV_DETAIL << "Decreased rate to " << *currentMode << endl;
-        resetIncreaseThreshdold();
-        resetTimer();
+        state.numberOfConsSuccTransmissions = 0;
+        state.mode = decreaseRateIfPossible(state.mode);
+        emitDatarateChangedSignal(state.address, state.mode);
+        EV_DETAIL << "Decreased rate to " << *state.mode << endl;
+        resetIncreaseThreshdold(state);
+        resetTimer(state);
     }
     else if (isSuccessful && retryCount == 0)
-        numberOfConsSuccTransmissions++;
-
-    if (numberOfConsSuccTransmissions == increaseThreshold) {
-        numberOfConsSuccTransmissions = 0;
-        currentMode = increaseRateIfPossible(currentMode);
-        emitDatarateChangedSignal();
-        EV_DETAIL << "Increased rate to " << *currentMode << endl;
-        resetTimer();
-        probing = true;
+        state.numberOfConsSuccTransmissions++;
+
+    if (state.numberOfConsSuccTransmissions == state.increaseThreshold) {
+        state.numberOfConsSuccTransmissions = 0;
+        state.mode = increaseRateIfPossible(state.mode);
+        emitDatarateChangedSignal(state.address, state.mode);
+        EV_DETAIL << "Increased rate to " << *state.mode << endl;
+        resetTimer(state);
+        state.probing = true;
     }
     else
-        probing = false;
-
+        state.probing = false;
 }
 
-void AarfRateControl::multiplyIncreaseThreshold(double factor)
+void AarfRateControl::multiplyIncreaseThreshold(State& state, double factor)
 {
-    if (increaseThreshold * factor <= maxIncreaseThreshold)
-        increaseThreshold *= factor;
+    if (state.increaseThreshold * factor <= maxIncreaseThreshold)
+        state.increaseThreshold *= factor;
 }
 
-void AarfRateControl::resetIncreaseThreshdold()
+void AarfRateControl::resetIncreaseThreshdold(State& state)
 {
-    increaseThreshold = par("increaseThreshold");
+    state.increaseThreshold = par("increaseThreshold");
 }
 
-void AarfRateControl::resetTimer()
+void AarfRateControl::resetTimer(State& state)
 {
-    timer = simTime();
+    state.timer = simTime();
 }
 
-void AarfRateControl::increaseRateIfTimerIsExpired()
+void AarfRateControl::increaseRateIfTimerIsExpired(State& state)
 {
-    if (simTime() - timer >= interval) {
-        currentMode = increaseRateIfPossible(currentMode);
-        emitDatarateChangedSignal();
-        EV_DETAIL << "Increased rate to " << *currentMode << endl;
-        resetTimer();
+    if (simTime() - state.timer >= interval) {
+        state.mode = increaseRateIfPossible(state.mode);
+        emitDatarateChangedSignal(state.address, state.mode);
+        EV_DETAIL << "Increased rate to " << *state.mode << endl;
+        resetTimer(state);
     }
 }
 
 void AarfRateControl::frameReceived(Packet *frame)
 {
 }
 
-const IIeee80211Mode *AarfRateControl::getRate()
+const IIeee80211Mode *AarfRateControl::getRate(const MacAddress& receiverAddress)
 {
     Enter_Method("getRate");
-    increaseRateIfTimerIsExpired();
-    EV_INFO << "The current mode is " << currentMode << " the net bitrate is " << currentMode->getDataMode()->getNetBitrate() << std::endl;
-    return currentMode;
+    State& state = stateFor(receiverAddress);
+    increaseRateIfTimerIsExpired(state);
+    EV_INFO << "The current mode is " << state.mode << " the net bitrate is " << state.mode->getDataMode()->getNetBitrate() << std::endl;
+    return state.mode;
 }
 
 } /* namespace ieee80211 */
 } /* namespace inet */
-