merge
authorMarco Miozzo <marco.miozzo@cttc.es>
Fri, 20 Jan 2012 16:34:34 +0100
changeset 8585 e7d1c8d286c9
parent 8584 188a9d439fd8 (current diff)
parent 8583 7bf7b877aa98 (diff)
child 8586 6c6fdf44d58b
merge
--- a/src/lte/helper/lte-helper.h	Fri Jan 20 16:26:55 2012 +0100
+++ b/src/lte/helper/lte-helper.h	Fri Jan 20 16:34:34 2012 +0100
@@ -278,6 +278,11 @@
    */
   Ptr<RadioBearerStatsCalculator> GetPdcpStats (void);
 
+  enum LteEpsBearerToRlcMapping_t {RLC_SM_ALWAYS = 1,
+                                   RLC_UM_ALWAYS = 2,
+                                   RLC_AM_ALWAYS = 3,
+                                   PER_BASED = 4};
+
 protected:
   // inherited from Object
   virtual void DoStart (void);
@@ -310,10 +315,7 @@
   Ptr<RadioBearerStatsCalculator> m_rlcStats;
   Ptr<RadioBearerStatsCalculator> m_pdcpStats;
 
-  enum LteEpsBearerToRlcMapping_t {RLC_SM_ALWAYS = 1,
-                                   RLC_UM_ALWAYS = 2,
-                                   RLC_AM_ALWAYS = 3,
-                                   PER_BASED = 4} m_epsBearerToRlcMapping;
+  enum LteEpsBearerToRlcMapping_t m_epsBearerToRlcMapping;
 
   Ptr<EpcHelper> m_epcHelper;
 
--- a/src/lte/model/epc-sgw-pgw-application.cc	Fri Jan 20 16:26:55 2012 +0100
+++ b/src/lte/model/epc-sgw-pgw-application.cc	Fri Jan 20 16:34:34 2012 +0100
@@ -195,6 +195,7 @@
 EpcSgwPgwApplication::SendToTunDevice (Ptr<Packet> packet, uint32_t teid)
 {
   NS_LOG_FUNCTION (this << packet << teid);
+  NS_LOG_LOGIC (" packet size: " << packet->GetSize () << " bytes");
   m_tunDevice->Receive (packet, 0x0800, m_tunDevice->GetAddress (), m_tunDevice->GetAddress (), NetDevice::PACKET_HOST);
 }
 
--- a/src/lte/model/lte-ue-rrc.cc	Fri Jan 20 16:26:55 2012 +0100
+++ b/src/lte/model/lte-ue-rrc.cc	Fri Jan 20 16:34:34 2012 +0100
@@ -242,6 +242,7 @@
     }
   else
     {
+      NS_LOG_LOGIC (this << " RNTI=" << m_rnti << " sending " << packet << "on LCID " << (uint32_t) lcid << " (" << packet->GetSize () << " bytes)");
       it->second->m_pdcp->GetLtePdcpSapProvider ()->TransmitRrcPdu (params);
       return true;
     }