From 97732df9a7bba31003c7aa7706ace01202dab03b Mon Sep 17 00:00:00 2001
From: Natale Patriciello <natale.patriciello@gmail.com>
Date: Fri, 26 Feb 2016 11:43:09 +0100
Subject: [PATCH 2/2] Use PacketTag instead of ByteTag

---
 src/lte/model/lte-pdcp.cc   | 5 +++--
 src/lte/model/lte-rlc-am.cc | 5 +++--
 src/lte/model/lte-rlc-tm.cc | 5 +++--
 src/lte/model/lte-rlc-um.cc | 5 +++--
 src/lte/model/lte-rlc.cc    | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/lte/model/lte-pdcp.cc b/src/lte/model/lte-pdcp.cc
index 0b5df27..6c8564b 100644
--- a/src/lte/model/lte-pdcp.cc
+++ b/src/lte/model/lte-pdcp.cc
@@ -188,7 +188,7 @@ LtePdcp::DoTransmitPdcpSdu (Ptr<Packet> p)
 
   // Sender timestamp
   PdcpTag pdcpTag (Simulator::Now ());
-  p->AddByteTag (pdcpTag);
+  p->AddPacketTag (pdcpTag);
   m_txPdu (m_rnti, m_lcid, p->GetSize ());
 
   LteRlcSapProvider::TransmitPdcpPduParameters params;
@@ -207,9 +207,10 @@ LtePdcp::DoReceivePdu (Ptr<Packet> p)
   // Receiver timestamp
   PdcpTag pdcpTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (pdcpTag))
+  if (p->PeekPacketTag (pdcpTag))
     {
       delay = Simulator::Now() - pdcpTag.GetSenderTimestamp ();
+      p->RemovePacketTag (pdcpTag);
     }
   m_rxPdu(m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff --git a/src/lte/model/lte-rlc-am.cc b/src/lte/model/lte-rlc-am.cc
index 862956c..17c9765 100644
--- a/src/lte/model/lte-rlc-am.cc
+++ b/src/lte/model/lte-rlc-am.cc
@@ -707,7 +707,7 @@ LteRlcAm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId)
 
   // Sender timestamp
   RlcTag rlcTag (Simulator::Now ());
-  packet->AddByteTag (rlcTag);
+  packet->AddPacketTag (rlcTag);
   m_txPdu (m_rnti, m_lcid, packet->GetSize ());
 
   // Send RLC PDU to MAC layer
@@ -736,9 +736,10 @@ LteRlcAm::DoReceivePdu (Ptr<Packet> p)
   // Receiver timestamp
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff --git a/src/lte/model/lte-rlc-tm.cc b/src/lte/model/lte-rlc-tm.cc
index 06aa8a7..ebb7543 100644
--- a/src/lte/model/lte-rlc-tm.cc
+++ b/src/lte/model/lte-rlc-tm.cc
@@ -140,7 +140,7 @@ LteRlcTm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId)
  
   // Sender timestamp
   RlcTag rlcTag (Simulator::Now ());
-  packet->AddByteTag (rlcTag);
+  packet->AddPacketTag (rlcTag);
   m_txPdu (m_rnti, m_lcid, packet->GetSize ());
 
   // Send RLC PDU to MAC layer
@@ -174,9 +174,10 @@ LteRlcTm::DoReceivePdu (Ptr<Packet> p)
   // Receiver timestamp
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff --git a/src/lte/model/lte-rlc-um.cc b/src/lte/model/lte-rlc-um.cc
index 46a51e3..f9f9d97 100644
--- a/src/lte/model/lte-rlc-um.cc
+++ b/src/lte/model/lte-rlc-um.cc
@@ -372,7 +372,7 @@ LteRlcUm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId)
 
   // Sender timestamp
   RlcTag rlcTag (Simulator::Now ());
-  packet->AddByteTag (rlcTag);
+  packet->AddPacketTag (rlcTag);
   m_txPdu (m_rnti, m_lcid, packet->GetSize ());
 
   // Send RLC PDU to MAC layer
@@ -406,9 +406,10 @@ LteRlcUm::DoReceivePdu (Ptr<Packet> p)
   // Receiver timestamp
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff --git a/src/lte/model/lte-rlc.cc b/src/lte/model/lte-rlc.cc
index ac7c244..6d883a4 100644
--- a/src/lte/model/lte-rlc.cc
+++ b/src/lte/model/lte-rlc.cc
@@ -219,9 +219,10 @@ LteRlcSm::DoReceivePdu (Ptr<Packet> p)
   // RLC Performance evaluation
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag(rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   NS_LOG_LOGIC (" RNTI=" << m_rnti 
                 << " LCID=" << (uint32_t) m_lcid 
@@ -243,7 +244,7 @@ LteRlcSm::DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId)
 
   // RLC Performance evaluation
   RlcTag tag (Simulator::Now());
-  params.pdu->AddByteTag (tag);
+  params.pdu->AddPacketTag (tag);
   NS_LOG_LOGIC (" RNTI=" << m_rnti 
                 << " LCID=" << (uint32_t) m_lcid 
                 << " size=" << bytes);
-- 
2.7.1