inet-framework
diff --git a/‎src/simu5g/stack/packetFlowObserver/PacketFlowObserverEnb.cc‎
Lines changed: 9 additions & 14 deletions b/‎src/simu5g/stack/packetFlowObserver/PacketFlowObserverEnb.cc‎
Lines changed: 9 additions & 14 deletions
diff --git a/‎src/simu5g/stack/packetFlowObserver/PacketFlowObserverUe.cc‎
Lines changed: 9 additions & 12 deletions b/‎src/simu5g/stack/packetFlowObserver/PacketFlowObserverUe.cc‎
Lines changed: 9 additions & 12 deletions
diff --git a/‎src/simu5g/stack/rlc/packet/LteRlcPdu.msg‎
Lines changed: 26 additions & 24 deletions b/‎src/simu5g/stack/rlc/packet/LteRlcPdu.msg‎
Lines changed: 26 additions & 24 deletions
@@ -265,11 +265,12 @@ void PacketFlowObserverEnb::insertRlcPdu(LogicalCid lcid, const inet::Ptr<LteRlc
     }
 
     FramingInfo fi = rlcPdu->getFramingInfo();
-    for (size_t idx = 0; idx < rlcPdu->getNumSdu(); ++idx) {
-        auto sduPacket = rlcPdu->getSdu(idx);
+    // NR-style: handle single SDU per PDU (no concatenation)
+    if (rlcPdu->hasSdu()) {
+        auto sduPacket = rlcPdu->getSdu();
         auto pdcpTag = sduPacket->getTag<PdcpTrackingTag>();
         unsigned int pdcpSno = pdcpTag->getPdcpSequenceNumber();
-        size_t pdcpPduLength = rlcPdu->getSduSize(idx); // TODO fix with size of the chunk!!
+        size_t pdcpPduLength = rlcPdu->getSduSize(); // single SDU size
 
         EV << "PacketFlowObserverEnb::insertRlcPdu - pdcpSdu " << pdcpSno << " with length: " << pdcpPduLength << " bytes" << endl;
         //
@@ -284,18 +285,12 @@ void PacketFlowObserverEnb::insertRlcPdu(LogicalCid lcid, const inet::Ptr<LteRlc
         if (pit == desc->pdcpStatus_.end())
             throw cRuntimeError("%s::insertRlcPdu - PdcpStatus for PDCP sno [%d] not present, this should not happen", pfmType.c_str(), pdcpSno);
 
-        // last pdcp
-        if (idx == rlcPdu->getNumSdu() - 1) {
-            // 01 or 11, lsb 1 (3GPP TS 36.322)
-            // means -> Last byte of the Data field does not correspond to the last byte of a RLC SDU.
-            if (fi.lastIsFragment) {
-                pit->second.hasArrivedAll = false;
-            }
-            else {
-                pit->second.hasArrivedAll = true;
-            }
+        // Since there's only one SDU per PDU, check if it's a fragment using FI
+        // 01 or 11, lsb 1 (3GPP TS 36.322)
+        // means -> Last byte of the Data field does not correspond to the last byte of a RLC SDU.
+        if (fi.lastIsFragment) {
+            pit->second.hasArrivedAll = false;
         }
-        // since it is not the last part of the rlc, this pdcp has been entirely inserted in RLCs
         else {
             pit->second.hasArrivedAll = true;
         }
 
@@ -161,11 +161,12 @@ void PacketFlowObserverUe::insertRlcPdu(LogicalCid lcid, const inet::Ptr<LteRlcU
     EV_FATAL << NOW << "node id " << num(desc->nodeId_) - 1025 << " " << pfmType << "::insertRlcPdu - Logical CID " << lcid << endl;
 
     FramingInfo fi = rlcPdu->getFramingInfo();
-    for (size_t idx = 0; idx < rlcPdu->getNumSdu(); ++idx) {
-        auto sduPacket = rlcPdu->getSdu(idx);
+    // NR-style: handle single SDU per PDU (no concatenation)
+    if (rlcPdu->hasSdu()) {
+        auto sduPacket = rlcPdu->getSdu();
         auto pdcpTag = sduPacket->getTag<PdcpTrackingTag>();
         unsigned int pdcpSno = pdcpTag->getPdcpSequenceNumber();
-        size_t pdcpPduLength = rlcPdu->getSduSize(idx); // TODO fix with size of the chunk!!
+        size_t pdcpPduLength = rlcPdu->getSduSize(); // single SDU size
 
         EV << pfmType << "::insertRlcPdu - pdcpSdu " << pdcpSno << " with length: " << pdcpPduLength << " bytes" << endl;
 
@@ -180,15 +181,11 @@ void PacketFlowObserverUe::insertRlcPdu(LogicalCid lcid, const inet::Ptr<LteRlcU
         if (pit == desc->pdcpStatus_.end())
             throw cRuntimeError("%s::insertRlcPdu - PdcpStatus for PDCP sno [%d] not present, this should not happen", pfmType.c_str(), pdcpSno);
 
-        if (idx == rlcPdu->getNumSdu() - 1) {
-            // 01 or 11, lsb 1 (3GPP TS 36.322)
-            // means -> Last byte of the Data field does not correspond to the last byte of a RLC SDU.
-            if (fi.lastIsFragment) {
-                pit->second.hasArrivedAll = false;
-            }
-            else {
-                pit->second.hasArrivedAll = true;
-            }
+        // Since there's only one SDU per PDU, check if it's a fragment using FI
+        // 01 or 11, lsb 1 (3GPP TS 36.322)
+        // means -> Last byte of the Data field does not correspond to the last byte of a RLC SDU.
+        if (fi.lastIsFragment) {
+            pit->second.hasArrivedAll = false;
         }
         else {
             pit->second.hasArrivedAll = true;
 
@@ -34,8 +34,8 @@ class LteRlcDataPdu extends inet::FieldsChunk
 {
     chunkLength = inet::b(1);
 
-    inet::Packet* sdu[] @sizeGetter(getNumSdu) @owned;
-    size_t sduSize[];
+    inet::Packet* sdu @owned;
+    size_t sduSize;
 
     // Sequence number of the PDU
     unsigned int pduSequenceNumber = 0;
@@ -47,33 +47,33 @@ class LteRlcDataPdu extends inet::FieldsChunk
 cplusplus(LteRlcDataPdu) {{
   public:
     /**
-     * pushSdu() gets ownership of the packet
-     * and stores it inside the RLC SDU list
-     * in back position
+     * setSdu() gets ownership of the packet
+     * and stores it as the single RLC SDU (with size)
      *
      * @param pkt packet to store
+     * @param size size to store
      */
-    virtual void pushSdu(inet::Packet *pkt);
-    virtual void pushSdu(inet::Packet *pkt, int size);
+    virtual void setSdu(inet::Packet *pkt, int size);
 
     /**
-     * popSdu() pops a packet from the front of
-     * the SDU list and drops ownership before
-     * returning it
+     * popSdu() returns the SDU packet and drops ownership
+     * before returning it
      *
-     * @return popped packet
+     * @return the SDU packet
      */
     virtual inet::Packet *popSdu(size_t& size);
+
+    /**
+     * Check if PDU has an SDU
+     */
+    virtual bool hasSdu() const;
 }}
 
 cplusplus(cc) {{
 
-void LteRlcDataPdu::pushSdu(inet::Packet *pkt)
-{
-    pushSdu(pkt, pkt->getByteLength());
-}
 
-void LteRlcDataPdu::pushSdu(inet::Packet *pkt, int size)
+
+void LteRlcDataPdu::setSdu(inet::Packet *pkt, int size)
 {
     // Clear tags to make sure they are not "tunnelled" over to the receiver node and "accidentally"
     // used there -- with the exception of PdcpTrackingTag, as RLC-UM (UmRxEntity.cc) still refers to it.
@@ -82,21 +82,23 @@ void LteRlcDataPdu::pushSdu(inet::Packet *pkt, int size)
     if (pdcpTag != nullptr)
         *pkt->addTag<PdcpTrackingTag>() = *pdcpTag;
 
-    appendSdu(pkt);
-    appendSduSize(size);
-    ASSERT(getNumSdu() == 1);
+    setSdu(pkt);  // Use the auto-generated setter
+    setSduSize(size);
 }
 
 inet::Packet *LteRlcDataPdu::popSdu(size_t& size)
 {
-    auto pkt = removeSdu(0);
-    eraseSdu(0);
-
-    size = getSduSize(0);
-    eraseSduSize(0);
+    size = getSduSize();
+    auto pkt = const_cast<inet::Packet*>(removeSdu());
+    setSduSize(0);
     return pkt;
 }
 
+bool LteRlcDataPdu::hasSdu() const
+{
+    return getSdu() != nullptr;
+}
+
 }}
 
 //