merge

src/lte/helper/lte-helper.h

@@ -278,6 +278,11 @@ public:
    */
   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 @@ private:
   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;
 

src/lte/model/epc-sgw-pgw-application.cc

@@ -195,6 +195,7 @@ void
 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);
 }
 

src/lte/model/lte-ue-rrc.cc

@@ -242,6 +242,7 @@ LteUeRrc::Send (Ptr<Packet> packet)
     }
   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;
     }