fix PDCP bug

Failures:
  /simulations/nr/dualConnectivity_multicell/ -f omnetpp.ini -c SplitBearer-CBR-DL -r 0  (some fingerprint mismatch: actual '09f4-2368/tplx;9051-9bc4/sz', expected: '08b0-117e/tplx;6ae8-d7e6/sz')
  /simulations/nr/dualConnectivity/ -f omnetpp.ini -c DualConn-SplitBearer-DL -r 0  (some fingerprint mismatch: actual '8374-3d2c/tplx;b1ad-9eca/sz', expected: '2a68-ef06/tplx;a8eb-317b/sz')
  /simulations/nr/dualConnectivity/ -f omnetpp.ini -c DualConn-SplitBearer-UL -r 0  (some fingerprint mismatch: actual '4a58-fbc0/tplx;10fc-8897/~tNl;8d56-a05a/sz', expected: '1edd-20b8/tplx;918b-7244/~tNl;d494-fafd/sz')
  /simulations/nr/test_numerology/ -f omnetpp.ini -c MultiCell-CBR-DL -r 0  (some fingerprint mismatch: actual '734e-aeb6/tplx;ba3b-79af/sz', expected: 'dc64-0700/tplx;2be7-67b0/sz')
  /simulations/nr/test_numerology/ -f omnetpp.ini -c MultiCell-CBR-UL -r 0  (some fingerprint mismatch: actual '9fa6-61ae/tplx;fbcb-904c/~tNl;7037-b0f5/sz', expected: '29d2-5907/tplx;6ea1-c40a/~tNl;e70b-6f52/sz')
----------------------------------------------------------------------
Ran 127 tests in 163.028s

FAILED (failures=5)

Failures:
  /simulations/nr/dualConnectivity_multicell/ -f omnetpp.ini -c SplitBearer-CBR-DL -r 0  (some fingerprint mismatch: actual '09f4-2368/tplx;9051-9bc4/sz', expected: '08b0-117e/tplx;6ae8-d7e6/sz')
  /simulations/nr/dualConnectivity/ -f omnetpp.ini -c DualConn-SplitBearer-DL -r 0  (some fingerprint mismatch: actual '8374-3d2c/tplx;b1ad-9eca/sz', expected: '2a68-ef06/tplx;a8eb-317b/sz')
  /simulations/nr/dualConnectivity/ -f omnetpp.ini -c DualConn-SplitBearer-UL -r 0  (some fingerprint mismatch: actual '4a58-fbc0/tplx;10fc-8897/~tNl;8d56-a05a/sz', expected: '1edd-20b8/tplx;918b-7244/~tNl;d494-fafd/sz')
  /simulations/nr/test_numerology/ -f omnetpp.ini -c MultiCell-CBR-DL -r 0  (some fingerprint mismatch: actual '734e-aeb6/tplx;ba3b-79af/sz', expected: 'dc64-0700/tplx;2be7-67b0/sz')
  /simulations/nr/test_numerology/ -f omnetpp.ini -c MultiCell-CBR-UL -r 0  (some fingerprint mismatch: actual '9fa6-61ae/tplx;fbcb-904c/~tNl;7037-b0f5/sz', expected: '29d2-5907/tplx;6ea1-c40a/~tNl;e70b-6f52/sz')
----------------------------------------------------------------------
Ran 127 tests in 164.289s

FAILED (failures=5)

Author: avarga

src/simu5g/stack/pdcp/LtePdcp.cc

@@ -11,7 +11,6 @@
 
 #include "simu5g/stack/pdcp/LtePdcp.h"
 
-#include <inet/common/stlutils.h>
 #include <inet/networklayer/ipv4/Ipv4Header_m.h>
 #include <inet/transportlayer/tcp_common/TcpHeader.h>
 #include <inet/transportlayer/udp/UdpHeader_m.h>
@@ -152,6 +151,17 @@ void LtePdcpBase::fromDataPort(cPacket *pktAux)
 
     MacCid cid = MacCid(lteInfo->getDestId(), lteInfo->getLcid());
 
+    // Handle DC setup: Assume packet arrives in Master nodeB (LTE), and wants to use Secondary nodeB (NR).
+    // Packet is processed by local PDCP entity, then needs to be tunneled over X2 to Secondary for transmission.
+    // However, local PDCP entity is keyed on LTE nodeIds, so we need to tweak the cid and replace NR nodeId
+    // with LTE nodeId so that lookup succeeds.
+    if (getNodeTypeById(nodeId_) == ENODEB && lteInfo->getMulticastGroupId() == -1 && binder_->isGNodeB(nodeId_) != isNrUe(lteInfo->getDestId()) ) {
+        // use another CID whose technology matches the nodeB
+        MacNodeId otherDestId = binder_->getUeNodeId(lteInfo->getDestId(), !isNrUe(lteInfo->getDestId()));
+        ASSERT(otherDestId != NODEID_NONE);
+        cid = MacCid(otherDestId, lteInfo->getLcid());
+    }
+
     LteTxPdcpEntity *entity = lookupTxEntity(cid);
 
     // get the PDCP entity for this LCID and process the packet
@@ -160,18 +170,8 @@ void LtePdcpBase::fromDataPort(cPacket *pktAux)
        << " multicast=" << lteInfo->getMulticastGroupId() << " direction=" << dirToA((Direction)lteInfo->getDirection())
        << " ---> CID " << cid << (entity == nullptr ? " (NEW)" : " (existing)") << std::endl;
 
-    if (entity == nullptr) {
+    if (entity == nullptr)
         entity = createTxEntity(cid);
-
-        // check for bug
-        if (getNodeTypeById(nodeId_) == ENODEB && lteInfo->getMulticastGroupId() == -1) {
-            MacCid lteCid = MacCid(binder_->getUeNodeId(lteInfo->getDestId(), false), lteInfo->getLcid());
-            MacCid nrCid = MacCid(binder_->getUeNodeId(lteInfo->getDestId(), true), lteInfo->getLcid());
-            if (inet::containsKey(txEntities_, lteCid) && inet::containsKey(txEntities_, nrCid))
-                throw cRuntimeError("Both LTE and NR cids of same UE are present as txEntities_ keys: %s, %s", lteCid.str().c_str(), nrCid.str().c_str());
-        }
-    }
-
     entity->handlePacketFromUpperLayer(pkt);
 }
 
@@ -186,21 +186,27 @@ void LtePdcpBase::fromLowerLayer(cPacket *pktAux)
 
     auto lteInfo = pkt->getTag<FlowControlInfo>();
 
-    MacCid cid = MacCid(lteInfo->getSourceId(), lteInfo->getLcid());   // TODO: check if you have to get master node id
+    MacCid cid = MacCid(lteInfo->getSourceId(), lteInfo->getLcid());
+
+    // Handle DC setup: Assume packet arrives at this Master nodeB (LTE) from Secondary (NR) over X2.
+    // Packet needs to be processed by local PDCP entity. However, local PDCP entity is keyed on LTE nodeIds,
+    // so we need to tweak the cid and replace NR nodeId with LTE nodeId so that lookup succeeds.
+    if (getNodeTypeById(nodeId_) == ENODEB && lteInfo->getMulticastGroupId() == -1 && binder_->isGNodeB(nodeId_) != isNrUe(lteInfo->getSourceId()) ) {
+        // use another CID whose technology matches the nodeB
+        MacNodeId otherSourceId = binder_->getUeNodeId(lteInfo->getSourceId(), !isNrUe(lteInfo->getSourceId()));
+        ASSERT(otherSourceId != NODEID_NONE);
+        cid = MacCid(otherSourceId, lteInfo->getLcid());
+    }
 
     LteRxPdcpEntity *entity = lookupRxEntity(cid);
-    if (entity == nullptr) {
-        entity = createRxEntity(cid);
 
-        // check for bug
-        if (getNodeTypeById(nodeId_) == ENODEB && lteInfo->getMulticastGroupId() == -1) {
-            MacCid lteCid = MacCid(binder_->getUeNodeId(lteInfo->getSourceId(), false), lteInfo->getLcid());
-            MacCid nrCid = MacCid(binder_->getUeNodeId(lteInfo->getSourceId(), true), lteInfo->getLcid());
-            if (inet::containsKey(rxEntities_, lteCid) && inet::containsKey(rxEntities_, nrCid))
-                throw cRuntimeError("Both LTE and NR cids of same UE are present as rxEntities_ keys: %s, %s", lteCid.str().c_str(), nrCid.str().c_str());
-        }
+    EV << "fromLowerLayer in " << getFullPath() << " event #" << getSimulation()->getEventNumber()
+       <<  ": Processing packet " << pkt->getName() << " src=" << lteInfo->getSourceId() << " dest=" << lteInfo->getDestId()
+       << " multicast=" << lteInfo->getMulticastGroupId() << " direction=" << dirToA((Direction)lteInfo->getDirection())
+       << " ---> CID " << cid << (entity == nullptr ? " (NEW)" : " (existing)") << std::endl;
 
-    }
+    if (entity == nullptr)
+        entity = createRxEntity(cid);
     entity->handlePacketFromLowerLayer(pkt);
 }