From ebfec2d7a75790868cf26682d8b28e0c1953aa7c Mon Sep 17 00:00:00 2001
From: ZorazeAli <zoraze.ali@cttc.es>
Date: Thu, 27 May 2021 11:26:25 +0200
Subject: [PATCH] lte: Pass complete PDCP SDU params from LtePdcpSapProvider to
 LtePdcp

See merge request !268
---
 src/lte/model/lte-pdcp-sap.h |  9 +++++----
 src/lte/model/lte-pdcp.cc    | 15 ++++++++-------
 src/lte/model/lte-pdcp.h     |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/lte/model/lte-pdcp-sap.h b/src/lte/model/lte-pdcp-sap.h
index 8a89fcb14..f6b4260bf 100644
--- a/src/lte/model/lte-pdcp-sap.h
+++ b/src/lte/model/lte-pdcp-sap.h
@@ -48,9 +48,10 @@ public:
   };
 
   /**
-   * Send a RRC PDU to the RDCP for transmission
-   * This method is to be called
-   * when upper RRC entity has a RRC PDU ready to send   
+   * Send RRC PDU parameters to the PDCP for transmission
+   *
+   * This method is to be called when upper RRC entity has a
+   * RRC PDU ready to send
    * 
    * \param params 
    */
@@ -123,7 +124,7 @@ LtePdcpSpecificLtePdcpSapProvider<C>::LtePdcpSpecificLtePdcpSapProvider ()
 template <class C>
 void LtePdcpSpecificLtePdcpSapProvider<C>::TransmitPdcpSdu (TransmitPdcpSduParameters params)
 {
-  m_pdcp->DoTransmitPdcpSdu (params.pdcpSdu);
+  m_pdcp->DoTransmitPdcpSdu (params);
 }
 
 
diff --git a/src/lte/model/lte-pdcp.cc b/src/lte/model/lte-pdcp.cc
index 07b652bd7..102762ef3 100644
--- a/src/lte/model/lte-pdcp.cc
+++ b/src/lte/model/lte-pdcp.cc
@@ -174,9 +174,10 @@ LtePdcp::SetStatus (Status s)
 ////////////////////////////////////////
 
 void
-LtePdcp::DoTransmitPdcpSdu (Ptr<Packet> p)
+LtePdcp::DoTransmitPdcpSdu (LtePdcpSapProvider::TransmitPdcpSduParameters params)
 {
-  NS_LOG_FUNCTION (this << m_rnti << (uint32_t) m_lcid << p->GetSize ());
+  NS_LOG_FUNCTION (this << m_rnti << static_cast <uint16_t> (m_lcid) << params.pdcpSdu->GetSize ());
+  Ptr<Packet> p = params.pdcpSdu;
 
   // Sender timestamp
   PdcpTag pdcpTag (Simulator::Now ());
@@ -198,12 +199,12 @@ LtePdcp::DoTransmitPdcpSdu (Ptr<Packet> p)
 
   m_txPdu (m_rnti, m_lcid, p->GetSize ());
 
-  LteRlcSapProvider::TransmitPdcpPduParameters params;
-  params.rnti = m_rnti;
-  params.lcid = m_lcid;
-  params.pdcpPdu = p;
+  LteRlcSapProvider::TransmitPdcpPduParameters txParams;
+  txParams.rnti = m_rnti;
+  txParams.lcid = m_lcid;
+  txParams.pdcpPdu = p;
 
-  m_rlcSapProvider->TransmitPdcpPdu (params);
+  m_rlcSapProvider->TransmitPdcpPdu (txParams);
 }
 
 void
diff --git a/src/lte/model/lte-pdcp.h b/src/lte/model/lte-pdcp.h
index bc78465b2..8af25032f 100644
--- a/src/lte/model/lte-pdcp.h
+++ b/src/lte/model/lte-pdcp.h
@@ -145,9 +145,9 @@ protected:
   /**
    * Interface provided to upper RRC entity
    *
-   * \param p packet
+   * \param params the TransmitPdcpSduParameters
    */
-  virtual void DoTransmitPdcpSdu (Ptr<Packet> p);
+  virtual void DoTransmitPdcpSdu (LtePdcpSapProvider::TransmitPdcpSduParameters params);
 
   LtePdcpSapUser* m_pdcpSapUser; ///< PDCP SAP user
   LtePdcpSapProvider* m_pdcpSapProvider; ///< PDCP SAP provider