Binder: getMasterNode() renamed to getMasterNodeOrSelf()

Because it returns the node itself if it has no DC Master.

Author: avarga

src/simu5g/common/binder/Binder.cc

@@ -266,9 +266,9 @@ void Binder::registerMasterNode(MacNodeId masterId, MacNodeId slaveId)
     if (masterId == NODEID_NONE)
         masterId = slaveId;
 
-    if (secondaryNodeToMasterNode_.size() <= num(slaveId))
-        secondaryNodeToMasterNode_.resize(num(slaveId) + 1);
-    secondaryNodeToMasterNode_[num(slaveId)] = masterId;
+    if (secondaryNodeToMasterNodeOrSelf_.size() <= num(slaveId))
+        secondaryNodeToMasterNodeOrSelf_.resize(num(slaveId) + 1);
+    secondaryNodeToMasterNodeOrSelf_[num(slaveId)] = masterId;
 }
 
 inline ostream& operator<<(ostream& os, const L3Address& addr) { return os << addr.str(); }
@@ -288,7 +288,7 @@ void Binder::initialize(int stage)
         WATCH_MAP(ipAddressToNrMacNodeId_);
         // WATCH_MAP(nodeInfoMap_); // Commented out - contains complex NodeInfo structs that don't have stream operators
         WATCH_VECTOR(servingNode_);
-        WATCH_VECTOR(secondaryNodeToMasterNode_);
+        WATCH_VECTOR(secondaryNodeToMasterNodeOrSelf_);
         WATCH_SET(mecHostAddress_);
         WATCH_MAP(mecHostToUpfAddress_);
         // WATCH_MAP(extCellList_); // Commented out - contains vectors of ExtCell* pointers that don't have stream operators
@@ -427,11 +427,13 @@ MacNodeId Binder::getNextHop(MacNodeId nodeId)
     return (nodeId == NODEID_NONE || getNodeTypeById(nodeId) == ENODEB) ? nodeId : getServingNode(nodeId);
 }
 
-MacNodeId Binder::getMasterNode(MacNodeId secondaryEnbId)
+MacNodeId Binder::getMasterNodeOrSelf(MacNodeId secondaryEnbId)
 {
-    if (num(secondaryEnbId) >= secondaryNodeToMasterNode_.size())
+    ASSERT(secondaryEnbId == NODEID_NONE || getNodeTypeById(secondaryEnbId) == ENODEB);
+
+    if (num(secondaryEnbId) >= secondaryNodeToMasterNodeOrSelf_.size())
         throw cRuntimeError("Binder::getMasterNode(): bad secondaryEnbId %hu", num(secondaryEnbId));
-    return secondaryNodeToMasterNode_[num(secondaryEnbId)];
+    return secondaryNodeToMasterNodeOrSelf_[num(secondaryEnbId)];
 }
 
 void Binder::registerMecHost(const inet::L3Address& mecHostAddress)

src/simu5g/common/binder/Binder.h

@@ -62,7 +62,7 @@ class Binder : public cSimpleModule
     std::map<MacNodeId, NodeInfo> nodeInfoMap_;
 
     std::vector<MacNodeId> servingNode_;  // ueId -> servingEnbId
-    std::vector<MacNodeId> secondaryNodeToMasterNode_;
+    std::vector<MacNodeId> secondaryNodeToMasterNodeOrSelf_;
 
     // stores the IP address of the MEC hosts in the simulation
     std::set<inet::L3Address> mecHostAddress_;
@@ -317,7 +317,7 @@ class Binder : public cSimpleModule
      * for the given Secondary Node (SeNB, SN).
      */
     //TODO add  MacNodeId ueId arg: In LTE DC, the roles (master/secondary) are per UE, not per bearer.
-    MacNodeId getMasterNode(MacNodeId secondaryEnbId);
+    MacNodeId getMasterNodeOrSelf(MacNodeId secondaryEnbId);
 
     /**
      * Returns the MacNodeId for the given IP address

src/simu5g/corenetwork/trafficFlowFilter/TrafficFlowFilter.cc

@@ -182,7 +182,7 @@ TrafficFlowTemplateId TrafficFlowFilter::findTrafficFlow(L3Address srcAddress, L
 
     // the serving node for the UE might be a secondary node in case of NR Dual Connectivity
     // obtains the master node, if any (the function returns destEnb if it is a master already)
-    MacNodeId destMaster = binder_->getMasterNode(destBS);
+    MacNodeId destMaster = binder_->getMasterNodeOrSelf(destBS);
     MacNodeId srcMaster = binder_->getNextHop(binder_->getMacNodeId(srcAddress.toIpv4()));
 
     if (isBaseStation(ownerType_)) {

src/simu5g/stack/pdcp/LtePdcp.h

@@ -372,7 +372,7 @@ class LtePdcpEnb : public LtePdcpBase
         }
         else {
             // for dual connectivity
-            master = binder_->getMasterNode(master);
+            master = binder_->getMasterNodeOrSelf(master);
             if (master != nodeId_) {
                 destId = master;
             }

src/simu5g/stack/pdcp/NrPdcpEnb.cc

@@ -100,7 +100,7 @@ void NrPdcpEnb::fromLowerLayer(cPacket *pktAux)
 
     // if dual connectivity is enabled and this is a secondary node,
     // forward the packet to the PDCP of the master node
-    MacNodeId masterId = binder_->getMasterNode(nodeId_);
+    MacNodeId masterId = binder_->getMasterNodeOrSelf(nodeId_);
     if (dualConnectivityEnabled_ && (nodeId_ != masterId)) {
         EV << NOW << " NrPdcpEnb::fromLowerLayer - forward packet to the master node - id [" << masterId << "]" << endl;
         forwardDataToTargetNode(pkt, masterId);
@@ -125,7 +125,7 @@ MacNodeId NrPdcpEnb::getDestId(inet::Ptr<FlowControlInfo> lteInfo)
     }
     else {
         // for dual connectivity
-        master = binder_->getMasterNode(master);
+        master = binder_->getMasterNodeOrSelf(master);
         if (master != nodeId_) {
             destId = master;
         }

src/simu5g/stack/phy/NrPhyUe.cc

@@ -74,7 +74,7 @@ void NrPhyUe::handleAirFrame(cMessage *msg)
         }
 
         // Check if the eNodeB is a secondary node
-        MacNodeId masterNodeId = binder_->getMasterNode(sourceId);
+        MacNodeId masterNodeId = binder_->getMasterNodeOrSelf(sourceId);
         if (masterNodeId != sourceId) {
             // The node has a master node, check if the other PHY of this UE is attached to that master.
             // If not, the UE cannot attach to this secondary node and the packet must be deleted.
@@ -219,7 +219,7 @@ void NrPhyUe::triggerHandover()
     EV << "Candidate RSSI: " << candidateMasterRssi_ << endl;
     EV << "############" << endl;
 
-    MacNodeId masterNode = binder_->getMasterNode(candidateMasterId_);
+    MacNodeId masterNode = binder_->getMasterNodeOrSelf(candidateMasterId_);
     if (masterNode != candidateMasterId_) { // The candidate is a secondary node
         if (otherPhy_->getMasterId() == masterNode) {
             MacNodeId otherNodeId = otherPhy_->getMacNodeId();
@@ -259,7 +259,7 @@ void NrPhyUe::triggerHandover()
 
     if (otherPhy_->getMasterId() != NODEID_NONE) {
         // Check if there are secondary nodes connected
-        MacNodeId otherMasterId = binder_->getMasterNode(otherPhy_->getMasterId());
+        MacNodeId otherMasterId = binder_->getMasterNodeOrSelf(otherPhy_->getMasterId());
         if (otherMasterId == masterId_) {
             EV << NOW << " NrPhyUe::triggerHandover - Forcing detachment from " << otherPhy_->getMasterId() << " which was a secondary node to " << masterId_ << ". Delay this handover." << endl;
 
@@ -445,7 +445,7 @@ void NrPhyUe::deleteOldBuffers(MacNodeId masterId)
     // Delete PDCP Entities
     // delete pdcpEntities[nodeId_] at old master
     // in case of NR dual connectivity, the master can be a secondary node, hence we have to delete PDCP entities residing in the node's master
-    MacNodeId masterNodeId = binder_->getMasterNode(masterId);
+    MacNodeId masterNodeId = binder_->getMasterNodeOrSelf(masterId);
     LtePdcpEnb *masterPdcp = check_and_cast<LtePdcpEnb *>(binder_->getPdcpByNodeId(masterNodeId));
     masterPdcp->deleteEntities(nodeId_);