Pdcp: analyzePacket(): do not return MacCid

We always use destId from the control info for MacCid, see LtePdcpBase::fromDataPort()

Author: avarga

src/simu5g/stack/pdcp/LtePdcp.cc

@@ -108,7 +108,7 @@ LogicalCid LtePdcpBase::lookupOrAssignLcid(const ConnectionKey& key)
  * Upper Layer handlers
  */
 
-MacCid LtePdcpBase::analyzePacket(inet::Packet *pkt)
+void LtePdcpBase::analyzePacket(inet::Packet *pkt)
 {
     // Control Information
     auto lteInfo = pkt->getTagForUpdate<FlowControlInfo>();
@@ -137,9 +137,6 @@ MacCid LtePdcpBase::analyzePacket(inet::Packet *pkt)
         lteInfo->setDestId(getNodeId());
     else
         lteInfo->setDestId(getDestId(lteInfo));
-
-    // obtain CID
-    return MacCid(destId, lcid);
 }
 
 void LtePdcpBase::fromDataPort(cPacket *pktAux)

src/simu5g/stack/pdcp/LtePdcp.h

@@ -290,7 +290,7 @@ class LtePdcpBase : public cSimpleModule
      *
      * Returns the (nodeId,LCID) pair that identifies the connection for the packet.
      */
-    virtual MacCid analyzePacket(inet::Packet *pkt);
+    virtual void analyzePacket(inet::Packet *pkt);
 
     /**
      * Process data packets from higher layers.

src/simu5g/stack/pdcp/LtePdcpEnbD2D.cc

@@ -27,7 +27,7 @@ using namespace inet;
  * Upper Layer handlers
  */
 
-MacCid LtePdcpEnbD2D::analyzePacket(inet::Packet *pkt)
+void LtePdcpEnbD2D::analyzePacket(inet::Packet *pkt)
 {
     auto lteInfo = pkt->getTagForUpdate<FlowControlInfo>();
 
@@ -83,9 +83,6 @@ MacCid LtePdcpEnbD2D::analyzePacket(inet::Packet *pkt)
         lteInfo->setDestId(getNodeId());
     else
         lteInfo->setDestId(getDestId(lteInfo));
-
-    // obtain CID
-    return MacCid(destId, lcid);
 }
 
 void LtePdcpEnbD2D::initialize(int stage)

src/simu5g/stack/pdcp/LtePdcpEnbD2D.h

@@ -38,7 +38,7 @@ class LtePdcpEnbD2D : public LtePdcpEnb
      * Analyze the packet and fill out its lteInfo.
      * @param pkt incoming packet
      */
-    MacCid analyzePacket(inet::Packet *pkt) override;
+    void analyzePacket(inet::Packet *pkt) override;
 
     void pdcpHandleD2DModeSwitch(MacNodeId peerId, LteD2DMode newMode);
 };

src/simu5g/stack/pdcp/LtePdcpUeD2D.cc

@@ -39,7 +39,7 @@ MacNodeId LtePdcpUeD2D::getDestId(inet::Ptr<FlowControlInfo> lteInfo)
  * Upper Layer handlers
  */
 
-MacCid LtePdcpUeD2D::analyzePacket(inet::Packet *pkt)
+void LtePdcpUeD2D::analyzePacket(inet::Packet *pkt)
 {
     auto lteInfo = pkt->getTagForUpdate<FlowControlInfo>();
 
@@ -119,9 +119,6 @@ MacCid LtePdcpUeD2D::analyzePacket(inet::Packet *pkt)
         lteInfo->setDestId(getNodeId());
     else
         lteInfo->setDestId(getDestId(lteInfo));
-
-    // obtain CID
-    return MacCid(destId, lcid);
 }
 
 void LtePdcpUeD2D::handleMessage(cMessage *msg)

src/simu5g/stack/pdcp/LtePdcpUeD2D.h

@@ -51,7 +51,7 @@ class LtePdcpUeD2D : public LtePdcpUe
      * Analyze the packet and fill out its lteInfo.
      * @param pkt incoming packet
      */
-    MacCid analyzePacket(inet::Packet *pkt) override;
+    void analyzePacket(inet::Packet *pkt) override;
 
     // handler for mode switch signal
     void pdcpHandleD2DModeSwitch(MacNodeId peerId, LteD2DMode newMode);

src/simu5g/stack/pdcp/NrPdcpEnb.cc

@@ -33,7 +33,7 @@ void NrPdcpEnb::initialize(int stage)
  * Upper Layer handlers
  */
 
-MacCid NrPdcpEnb::analyzePacket(inet::Packet *pkt)
+void NrPdcpEnb::analyzePacket(inet::Packet *pkt)
 {
     auto lteInfo = pkt->getTagForUpdate<FlowControlInfo>();
     setTrafficInformation(pkt, lteInfo);
@@ -88,9 +88,6 @@ MacCid NrPdcpEnb::analyzePacket(inet::Packet *pkt)
 
     // assign LCID
     lteInfo->setLcid(lcid);
-
-    // obtain CID
-    return MacCid(destId, lcid);
 }
 
 void NrPdcpEnb::fromLowerLayer(cPacket *pktAux)

src/simu5g/stack/pdcp/NrPdcpEnb.h

@@ -45,7 +45,7 @@ class NrPdcpEnb : public LtePdcpEnbD2D
      * Analyze the packet and fill out its lteInfo.
      * @param pkt Incoming packet
      */
-    MacCid analyzePacket(inet::Packet *pkt) override;
+    void analyzePacket(inet::Packet *pkt) override;
 
     /**
      * Handler for um/am sap

src/simu5g/stack/pdcp/NrPdcpUe.cc

@@ -62,7 +62,7 @@ MacNodeId NrPdcpUe::getDestId(inet::Ptr<FlowControlInfo> lteInfo)
  * Upper Layer handlers
  */
 
-MacCid NrPdcpUe::analyzePacket(inet::Packet *pkt)
+void NrPdcpUe::analyzePacket(inet::Packet *pkt)
 {
     auto lteInfo = pkt->getTagForUpdate<FlowControlInfo>();
     setTrafficInformation(pkt, lteInfo);
@@ -147,10 +147,8 @@ MacCid NrPdcpUe::analyzePacket(inet::Packet *pkt)
     EV << "NrPdcpUe : Assigned Node ID: " << nodeId << "\n";
 
     // get effective next hop dest ID
-    destId = getDestId(lteInfo);
-
-    // obtain CID
-    return MacCid(destId, lcid);
+    // TODO this was in the original code, but has no effect:
+    // MacNodeId destId = getNextHopNodeId(destAddr, useNR, lteInfo->getSourceId());  //TODO this value is NOT set on LteInfo -- is this correct?
 }
 
 void NrPdcpUe::deleteEntities(MacNodeId nodeId)

src/simu5g/stack/pdcp/NrPdcpUe.h

@@ -61,7 +61,7 @@ class NrPdcpUe : public LtePdcpUeD2D
      * Analyze the packet and fill out its lteInfo.
      * @param pkt incoming packet
      */
-    MacCid analyzePacket(inet::Packet *pkt) override;
+    void analyzePacket(inet::Packet *pkt) override;
 
     /*
      * sendToLowerLayer() forwards a PDCP PDU to the RLC layer