Pdcp: rename getDestId() to getNextHopNodeId()

Author: avarga

src/simu5g/stack/pdcp/LtePdcp.cc

@@ -90,7 +90,7 @@ MacCid LtePdcpBase::analyzePacket(inet::Packet *pkt)
 
     setTrafficInformation(pkt, lteInfo);
 
-    MacNodeId destId = getDestId(lteInfo);
+    MacNodeId destId = getNextHopNodeId(lteInfo);
 
     // CID Request
     EV << "LteRrc : Received CID request for Traffic [ " << "Source: " << Ipv4Address(lteInfo->getSrcAddr())

src/simu5g/stack/pdcp/LtePdcp.h

@@ -247,7 +247,7 @@ class LtePdcpBase : public cSimpleModule
      *
      * @param lteInfo Control Info
      */
-    virtual MacNodeId getDestId(inet::Ptr<FlowControlInfo> lteInfo) = 0;
+    virtual MacNodeId getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo) = 0;
 
     /**
      * getDirection() is used only on UEs and ENODEBs:
@@ -327,7 +327,7 @@ class LtePdcpUe : public LtePdcpBase
 {
   protected:
 
-    MacNodeId getDestId(inet::Ptr<FlowControlInfo> lteInfo) override
+    MacNodeId getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo) override
     {
         // UE is subject to handovers: master may change
         return binder_->getNextHop(nodeId_);
@@ -346,7 +346,7 @@ class LtePdcpEnb : public LtePdcpBase
         delete lteInfo;
     }
 
-    MacNodeId getDestId(inet::Ptr<FlowControlInfo> lteInfo) override
+    MacNodeId getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo) override
     {
         // destination id
         MacNodeId destId = binder_->getMacNodeId(inet::Ipv4Address(lteInfo->getDstAddr()));

src/simu5g/stack/pdcp/LtePdcpEnbD2D.cc

@@ -75,7 +75,7 @@ MacCid LtePdcpEnbD2D::analyzePacket(inet::Packet *pkt)
     lteInfo->setSourceId(nodeId_);
 
     // get effective next hop dest ID
-    destId = getDestId(lteInfo);
+    destId = getNextHopNodeId(lteInfo);
 
     // obtain CID
     return MacCid(destId, lcid);

src/simu5g/stack/pdcp/LtePdcpUeD2D.cc

@@ -21,7 +21,7 @@ Define_Module(LtePdcpUeD2D);
 using namespace inet;
 using namespace omnetpp;
 
-MacNodeId LtePdcpUeD2D::getDestId(inet::Ptr<FlowControlInfo> lteInfo)
+MacNodeId LtePdcpUeD2D::getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo)
 {
     Ipv4Address destAddr = Ipv4Address(lteInfo->getDstAddr());
     MacNodeId destId = binder_->getMacNodeId(destAddr);
@@ -111,7 +111,7 @@ MacCid LtePdcpUeD2D::analyzePacket(inet::Packet *pkt)
     EV << "LtePdcpUeD2D : Assigned Node ID: " << nodeId_ << "\n";
 
     // get effective next hop dest ID
-    destId = getDestId(lteInfo);
+    destId = getNextHopNodeId(lteInfo);
 
     // obtain CID
     return MacCid(destId, lcid);

src/simu5g/stack/pdcp/LtePdcpUeD2D.h

@@ -37,7 +37,7 @@ class LtePdcpUeD2D : public LtePdcpUe
 
     void handleMessage(cMessage *msg) override;
 
-    MacNodeId getDestId(inet::Ptr<FlowControlInfo> lteInfo) override;
+    MacNodeId getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo) override;
 
     // additional getDirection method determining if D2D communication is available to a specific destination
     Direction getDirection(MacNodeId destId)

src/simu5g/stack/pdcp/LteTxPdcpEntity.cc

@@ -136,7 +136,7 @@ void LteTxPdcpEntity::setIds(inet::Ptr<FlowControlInfo> lteInfo)
     if (lteInfo->getMulticastGroupId() > 0)                                               // destId is meaningless for multicast D2D (we use the id of the source for statistic purposes at lower levels)
         lteInfo->setDestId(pdcp_->getNodeId());
     else
-        lteInfo->setDestId(pdcp_->getDestId(lteInfo));
+        lteInfo->setDestId(pdcp_->getNextHopNodeId(lteInfo));
 }
 
 

src/simu5g/stack/pdcp/NrPdcpEnb.cc

@@ -99,7 +99,7 @@ void NrPdcpEnb::fromLowerLayer(cPacket *pktAux)
     LtePdcpEnbD2D::fromLowerLayer(pktAux);
 }
 
-MacNodeId NrPdcpEnb::getDestId(inet::Ptr<FlowControlInfo> lteInfo)
+MacNodeId NrPdcpEnb::getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo)
 {
     MacNodeId destId;
     if (!dualConnectivityEnabled_ || lteInfo->getUseNR())

src/simu5g/stack/pdcp/NrPdcpEnb.h

@@ -59,7 +59,7 @@ class NrPdcpEnb : public LtePdcpEnbD2D
      */
     void fromLowerLayer(cPacket *pkt) override;
 
-    MacNodeId getDestId(inet::Ptr<FlowControlInfo> lteInfo) override;
+    MacNodeId getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo) override;
 
     /*
      * Dual Connectivity support

src/simu5g/stack/pdcp/NrPdcpUe.cc

@@ -41,7 +41,7 @@ void NrPdcpUe::initialize(int stage)
     LtePdcpUeD2D::initialize(stage);
 }
 
-MacNodeId NrPdcpUe::getDestId(inet::Ptr<FlowControlInfo> lteInfo)
+MacNodeId NrPdcpUe::getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo)
 {
     Ipv4Address destAddr = Ipv4Address(lteInfo->getDstAddr());
     MacNodeId destId = binder_->getMacNodeId(destAddr);
@@ -136,7 +136,7 @@ MacCid NrPdcpUe::analyzePacket(inet::Packet *pkt)
     EV << "NrPdcpUe : Assigned Node ID: " << nodeId << "\n";
 
     // get effective next hop dest ID
-    destId = getDestId(lteInfo);
+    destId = getNextHopNodeId(lteInfo);
 
     // obtain CID
     return MacCid(destId, lcid);

src/simu5g/stack/pdcp/NrPdcpUe.h

@@ -55,7 +55,7 @@ class NrPdcpUe : public LtePdcpUeD2D
     }
 
     // this function was redefined so as to use the getDirection() function implemented above
-    MacNodeId getDestId(inet::Ptr<FlowControlInfo> lteInfo) override;
+    MacNodeId getNextHopNodeId(inet::Ptr<FlowControlInfo> lteInfo) override;
 
     /**
      * Analyze the packet and fill out its lteInfo.