diff --git a/src/lte/model/lte-rrc-header.cc b/src/lte/model/lte-rrc-header.cc index 5172a50c8..305c9a813 100644 --- a/src/lte/model/lte-rrc-header.cc +++ b/src/lte/model/lte-rrc-header.cc @@ -320,10 +320,10 @@ RrcAsn1Header::SerializePhysicalConfigDedicated (LteRrcSap::PhysicalConfigDedica void RrcAsn1Header::SerializeRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated radioResourceConfigDedicated) const { - bool isSrbToAddModListPresent = !radioResourceConfigDedicated.srbToAddModList.empty(); - bool isDrbToAddModListPresent = !radioResourceConfigDedicated.drbToAddModList.empty(); - bool isDrbToReleaseListPresent = !radioResourceConfigDedicated.drbToReleaseList.empty(); - + bool isSrbToAddModListPresent = !radioResourceConfigDedicated.srbToAddModList.empty (); + bool isDrbToAddModListPresent = !radioResourceConfigDedicated.drbToAddModList.empty (); + bool isDrbToReleaseListPresent = !radioResourceConfigDedicated.drbToReleaseList.empty (); + // 6 optional fields. Extension marker is present. std::bitset<6> optionalFieldsPresent = std::bitset<6> (); optionalFieldsPresent.set (5,isSrbToAddModListPresent); // srb-ToAddModList present @@ -335,29 +335,29 @@ RrcAsn1Header::SerializeRadioResourceConfigDedicated (LteRrcSap::RadioResourceCo SerializeSequence<6> (optionalFieldsPresent,true); // Serialize srbToAddModList - if(isSrbToAddModListPresent) - { - SerializeSrbToAddModList (radioResourceConfigDedicated.srbToAddModList); - } + if (isSrbToAddModListPresent) + { + SerializeSrbToAddModList (radioResourceConfigDedicated.srbToAddModList); + } // Serialize drbToAddModList - if(isDrbToAddModListPresent) - { - SerializeDrbToAddModList (radioResourceConfigDedicated.drbToAddModList); - } - + if (isDrbToAddModListPresent) + { + SerializeDrbToAddModList (radioResourceConfigDedicated.drbToAddModList); + } + // Serialize drbToReleaseList - if(isDrbToReleaseListPresent) - { - SerializeSequenceOf (radioResourceConfigDedicated.drbToReleaseList.size (),MAX_DRB,1); - std::list::iterator it = radioResourceConfigDedicated.drbToReleaseList.begin (); - for (; it != radioResourceConfigDedicated.drbToReleaseList.end (); it++) - { - // DRB-Identity ::= INTEGER (1..32) - SerializeInteger (*it,1,32); - } - } - + if (isDrbToReleaseListPresent) + { + SerializeSequenceOf (radioResourceConfigDedicated.drbToReleaseList.size (),MAX_DRB,1); + std::list::iterator it = radioResourceConfigDedicated.drbToReleaseList.begin (); + for (; it != radioResourceConfigDedicated.drbToReleaseList.end (); it++) + { + // DRB-Identity ::= INTEGER (1..32) + SerializeInteger (*it,1,32); + } + } + if (radioResourceConfigDedicated.havePhysicalConfigDedicated) { SerializePhysicalConfigDedicated (radioResourceConfigDedicated.physicalConfigDedicated); @@ -1472,8 +1472,8 @@ RrcConnectionRequestHeader::PreSerialize () const { m_serializationResult = Buffer (); - SerializeUlCcchMessage(1); - + SerializeUlCcchMessage (1); + // Serialize RRCConnectionRequest sequence: // no default or optional fields. Extension marker not present. SerializeSequence<0> (std::bitset<0> (),false); @@ -1517,8 +1517,8 @@ RrcConnectionRequestHeader::Deserialize (Buffer::Iterator bIterator) std::bitset<0> optionalOrDefaultMask; int selectedOption; - bIterator = DeserializeUlCcchMessage(bIterator); - + bIterator = DeserializeUlCcchMessage (bIterator); + // Deserialize RCConnectionRequest sequence bIterator = DeserializeSequence (&optionalOrDefaultMask,false,bIterator); @@ -1561,7 +1561,7 @@ LteRrcSap::RrcConnectionRequest RrcConnectionRequestHeader::GetMessage () const { RrcConnectionRequest msg; - msg.ueIdentity = (m_mmec.to_ulong() << 32) | (m_mTmsi.to_ulong()); + msg.ueIdentity = (m_mmec.to_ulong () << 32) | (m_mTmsi.to_ulong ()); return msg; } @@ -1597,10 +1597,10 @@ RrcConnectionSetupHeader::PreSerialize () const { m_serializationResult = Buffer (); - SerializeDlCcchMessage(3); + SerializeDlCcchMessage (3); + + SerializeInteger (15,0,15); - SerializeInteger(15,0,15); - // Serialize RRCConnectionSetup sequence: // no default or optional fields. Extension marker not present. SerializeSequence (std::bitset<0> (),false); @@ -1640,10 +1640,10 @@ RrcConnectionSetupHeader::Deserialize (Buffer::Iterator bIterator) std::bitset<0> bitset0; std::bitset<1> bitset1; std::bitset<2> bitset2; - - bIterator = DeserializeDlCcchMessage(bIterator); - - bIterator = DeserializeInteger(&n,0,15,bIterator); + + bIterator = DeserializeDlCcchMessage (bIterator); + + bIterator = DeserializeInteger (&n,0,15,bIterator); // Deserialize RRCConnectionSetup sequence bIterator = DeserializeSequence (&bitset0,false,bIterator); @@ -1651,7 +1651,7 @@ RrcConnectionSetupHeader::Deserialize (Buffer::Iterator bIterator) // Deserialize rrc-TransactionIdentifier ::=INTEGER (0..3) bIterator = DeserializeInteger (&n,0,3,bIterator); rrcTransactionIdentifier = n; - + // Deserialize criticalExtensions choice int criticalExtensionChoice; bIterator = DeserializeChoice (2,&criticalExtensionChoice,bIterator); @@ -1703,7 +1703,7 @@ RrcConnectionSetupHeader::SetMessage (RrcConnectionSetup msg) } LteRrcSap::RrcConnectionSetup -RrcConnectionSetupHeader::GetMessage() const +RrcConnectionSetupHeader::GetMessage () const { RrcConnectionSetup msg; msg.rrcTransactionIdentifier = rrcTransactionIdentifier; @@ -1765,7 +1765,7 @@ RrcConnectionSetupCompleteHeader::PreSerialize () const m_serializationResult = Buffer (); // Serialize DCCH message - SerializeUlDcchMessage(4); + SerializeUlDcchMessage (4); // Serialize RRCConnectionSetupComplete sequence: // no default or optional fields. Extension marker not present. @@ -1792,9 +1792,9 @@ uint32_t RrcConnectionSetupCompleteHeader::Deserialize (Buffer::Iterator bIterator) { std::bitset<0> bitset0; - - bIterator = DeserializeUlDcchMessage(bIterator); - + + bIterator = DeserializeUlDcchMessage (bIterator); + bIterator = DeserializeSequence (&bitset0,false,bIterator); int n; @@ -1848,7 +1848,7 @@ RrcConnectionSetupCompleteHeader::GetRrcTransactionIdentifier () const } LteRrcSap::RrcConnectionSetupCompleted -RrcConnectionSetupCompleteHeader::GetMessage() const +RrcConnectionSetupCompleteHeader::GetMessage () const { LteRrcSap::RrcConnectionSetupCompleted msg; msg.rrcTransactionIdentifier = m_rrcTransactionIdentifier; @@ -1867,8 +1867,8 @@ RrcConnectionReconfigurationCompleteHeader::PreSerialize () const m_serializationResult = Buffer (); // Serialize DCCH message - SerializeUlDcchMessage(2); - + SerializeUlDcchMessage (2); + // Serialize RRCConnectionSetupComplete sequence: // no default or optional fields. Extension marker not present. SerializeSequence<0> (std::bitset<0> (),false); @@ -1894,8 +1894,8 @@ RrcConnectionReconfigurationCompleteHeader::Deserialize (Buffer::Iterator bItera bIterator = DeserializeSequence (&bitset0,false,bIterator); int n; - - bIterator = DeserializeUlDcchMessage(bIterator); + + bIterator = DeserializeUlDcchMessage (bIterator); bIterator = DeserializeInteger (&n,0,3,bIterator); m_rrcTransactionIdentifier = n; @@ -1930,7 +1930,7 @@ RrcConnectionReconfigurationCompleteHeader::SetMessage (RrcConnectionReconfigura } LteRrcSap::RrcConnectionReconfigurationCompleted -RrcConnectionReconfigurationCompleteHeader::GetMessage() const +RrcConnectionReconfigurationCompleteHeader::GetMessage () const { RrcConnectionReconfigurationCompleted msg; msg.rrcTransactionIdentifier = m_rrcTransactionIdentifier; @@ -1954,7 +1954,7 @@ RrcConnectionReconfigurationHeader::PreSerialize () const { m_serializationResult = Buffer (); - SerializeDlDcchMessage(4); + SerializeDlDcchMessage (4); // Serialize RRCConnectionSetupComplete sequence: // no default or optional fields. Extension marker not present. @@ -2080,8 +2080,8 @@ RrcConnectionReconfigurationHeader::Deserialize (Buffer::Iterator bIterator) { std::bitset<0> bitset0; - bIterator = DeserializeDlDcchMessage(bIterator); - + bIterator = DeserializeDlDcchMessage (bIterator); + // RRCConnectionReconfiguration sequence bIterator = DeserializeSequence (&bitset0,false,bIterator); @@ -2332,10 +2332,10 @@ RrcConnectionReconfigurationHeader::GetMessage () const msg.mobilityControlInfo = m_mobilityControlInfo; msg.haveRadioResourceConfigDedicated = m_haveRadioResourceConfigDedicated; msg.radioResourceConfigDedicated = m_radioResourceConfigDedicated; - + return msg; } - + uint8_t RrcConnectionReconfigurationHeader::GetRrcTransactionIdentifier () const { @@ -2700,8 +2700,8 @@ RrcConnectionReestablishmentRequestHeader::PreSerialize () const { m_serializationResult = Buffer (); - SerializeUlCcchMessage(0); - + SerializeUlCcchMessage (0); + // Serialize RrcConnectionReestablishmentReques sequence: // no default or optional fields. Extension marker not present. SerializeSequence<0> (std::bitset<0> (),false); @@ -2752,7 +2752,7 @@ RrcConnectionReestablishmentRequestHeader::Deserialize (Buffer::Iterator bIterat std::bitset<0> bitset0; int n; - bIterator = DeserializeUlCcchMessage(bIterator); + bIterator = DeserializeUlCcchMessage (bIterator); // Deserialize RrcConnectionReestablishmentRequest sequence // 0 optional fields, no extension marker @@ -2835,7 +2835,7 @@ RrcConnectionReestablishmentRequestHeader::GetMessage () const RrcConnectionReestablishmentRequest msg; msg.ueIdentity = m_ueIdentity; msg.reestablishmentCause = m_reestablishmentCause; - + return msg; } @@ -2862,7 +2862,7 @@ RrcConnectionReestablishmentHeader::PreSerialize () const { m_serializationResult = Buffer (); - SerializeDlCcchMessage(0); + SerializeDlCcchMessage (0); // Serialize RrcConnectionReestablishment sequence: // no default or optional fields. Extension marker not present. @@ -2897,7 +2897,7 @@ RrcConnectionReestablishmentHeader::Deserialize (Buffer::Iterator bIterator) std::bitset<0> bitset0; int n; - bIterator = DeserializeDlCcchMessage(bIterator); + bIterator = DeserializeDlCcchMessage (bIterator); // Deserialize RrcConnectionReestablishment sequence // 0 optional fields, no extension marker @@ -2991,8 +2991,8 @@ RrcConnectionReestablishmentCompleteHeader::PreSerialize () const m_serializationResult = Buffer (); // Serialize DCCH message - SerializeUlDcchMessage(3); - + SerializeUlDcchMessage (3); + // Serialize RrcConnectionReestablishmentComplete sequence: // no default or optional fields. Extension marker not present. SerializeSequence (std::bitset<0> (),false); @@ -3017,7 +3017,7 @@ RrcConnectionReestablishmentCompleteHeader::Deserialize (Buffer::Iterator bItera std::bitset<0> bitset0; int n; - bIterator = DeserializeUlDcchMessage(bIterator); + bIterator = DeserializeUlDcchMessage (bIterator); // Deserialize RrcConnectionReestablishmentComplete sequence // 0 optional fields, no extension marker @@ -3064,7 +3064,7 @@ RrcConnectionReestablishmentCompleteHeader::SetMessage (RrcConnectionReestablish } LteRrcSap::RrcConnectionReestablishmentComplete -RrcConnectionReestablishmentCompleteHeader::GetMessage() const +RrcConnectionReestablishmentCompleteHeader::GetMessage () const { RrcConnectionReestablishmentComplete msg; msg.rrcTransactionIdentifier = m_rrcTransactionIdentifier; @@ -3079,9 +3079,9 @@ RrcConnectionReestablishmentCompleteHeader::GetRrcTransactionIdentifier () const /////////////////// RrcUlDcchMessage ////////////////////////////////// uint32_t -RrcUlDcchMessage::Deserialize(Buffer::Iterator bIterator) +RrcUlDcchMessage::Deserialize (Buffer::Iterator bIterator) { - DeserializeUlDcchMessage(bIterator); + DeserializeUlDcchMessage (bIterator); return 1; } @@ -3094,7 +3094,7 @@ RrcUlDcchMessage::Print (std::ostream &os) const void RrcUlDcchMessage::PreSerialize () const { - SerializeUlDcchMessage(m_messageType); + SerializeUlDcchMessage (m_messageType); } Buffer::Iterator @@ -3102,39 +3102,39 @@ RrcUlDcchMessage::DeserializeUlDcchMessage (Buffer::Iterator bIterator) { std::bitset<0> bitset0; int n; - - bIterator = DeserializeSequence(&bitset0,false,bIterator); - bIterator = DeserializeChoice(2,&n,bIterator); - if(n==1) - { - // Deserialize messageClassExtension - bIterator = DeserializeSequence(&bitset0,false,bIterator); - m_messageType = -1; - } - else if(n == 0) - { - // Deserialize c1 - bIterator = DeserializeChoice(16,&m_messageType,bIterator); - } + + bIterator = DeserializeSequence (&bitset0,false,bIterator); + bIterator = DeserializeChoice (2,&n,bIterator); + if (n == 1) + { + // Deserialize messageClassExtension + bIterator = DeserializeSequence (&bitset0,false,bIterator); + m_messageType = -1; + } + else if (n == 0) + { + // Deserialize c1 + bIterator = DeserializeChoice (16,&m_messageType,bIterator); + } return bIterator; } void -RrcUlDcchMessage::SerializeUlDcchMessage(int messageType) const +RrcUlDcchMessage::SerializeUlDcchMessage (int messageType) const { - SerializeSequence(std::bitset<0>(),false); + SerializeSequence (std::bitset<0> (),false); // Choose c1 - SerializeChoice(2,0); + SerializeChoice (2,0); // Choose message type - SerializeChoice(16,messageType); + SerializeChoice (16,messageType); } /////////////////// RrcDlDcchMessage ////////////////////////////////// uint32_t -RrcDlDcchMessage::Deserialize(Buffer::Iterator bIterator) +RrcDlDcchMessage::Deserialize (Buffer::Iterator bIterator) { - DeserializeDlDcchMessage(bIterator); + DeserializeDlDcchMessage (bIterator); return 1; } @@ -3147,7 +3147,7 @@ RrcDlDcchMessage::Print (std::ostream &os) const void RrcDlDcchMessage::PreSerialize () const { - SerializeDlDcchMessage(m_messageType); + SerializeDlDcchMessage (m_messageType); } Buffer::Iterator @@ -3155,39 +3155,39 @@ RrcDlDcchMessage::DeserializeDlDcchMessage (Buffer::Iterator bIterator) { std::bitset<0> bitset0; int n; - - bIterator = DeserializeSequence(&bitset0,false,bIterator); - bIterator = DeserializeChoice(2,&n,bIterator); - if(n==1) - { - // Deserialize messageClassExtension - bIterator = DeserializeSequence(&bitset0,false,bIterator); - m_messageType = -1; - } - else if(n == 0) - { - // Deserialize c1 - bIterator = DeserializeChoice(16,&m_messageType,bIterator); - } + + bIterator = DeserializeSequence (&bitset0,false,bIterator); + bIterator = DeserializeChoice (2,&n,bIterator); + if (n == 1) + { + // Deserialize messageClassExtension + bIterator = DeserializeSequence (&bitset0,false,bIterator); + m_messageType = -1; + } + else if (n == 0) + { + // Deserialize c1 + bIterator = DeserializeChoice (16,&m_messageType,bIterator); + } return bIterator; } void -RrcDlDcchMessage::SerializeDlDcchMessage(int messageType) const +RrcDlDcchMessage::SerializeDlDcchMessage (int messageType) const { - SerializeSequence(std::bitset<0>(),false); + SerializeSequence (std::bitset<0> (),false); // Choose c1 - SerializeChoice(2,0); + SerializeChoice (2,0); // Choose message type - SerializeChoice(16,messageType); + SerializeChoice (16,messageType); } /////////////////// RrcUlCcchMessage ////////////////////////////////// uint32_t -RrcUlCcchMessage::Deserialize(Buffer::Iterator bIterator) +RrcUlCcchMessage::Deserialize (Buffer::Iterator bIterator) { - DeserializeUlCcchMessage(bIterator); + DeserializeUlCcchMessage (bIterator); return 1; } @@ -3200,7 +3200,7 @@ RrcUlCcchMessage::Print (std::ostream &os) const void RrcUlCcchMessage::PreSerialize () const { - SerializeUlCcchMessage(m_messageType); + SerializeUlCcchMessage (m_messageType); } Buffer::Iterator @@ -3208,39 +3208,39 @@ RrcUlCcchMessage::DeserializeUlCcchMessage (Buffer::Iterator bIterator) { std::bitset<0> bitset0; int n; - - bIterator = DeserializeSequence(&bitset0,false,bIterator); - bIterator = DeserializeChoice(2,&n,bIterator); - if(n==1) - { - // Deserialize messageClassExtension - bIterator = DeserializeSequence(&bitset0,false,bIterator); - m_messageType = -1; - } - else if(n == 0) - { - // Deserialize c1 - bIterator = DeserializeChoice(2,&m_messageType,bIterator); - } + + bIterator = DeserializeSequence (&bitset0,false,bIterator); + bIterator = DeserializeChoice (2,&n,bIterator); + if (n == 1) + { + // Deserialize messageClassExtension + bIterator = DeserializeSequence (&bitset0,false,bIterator); + m_messageType = -1; + } + else if (n == 0) + { + // Deserialize c1 + bIterator = DeserializeChoice (2,&m_messageType,bIterator); + } return bIterator; } void -RrcUlCcchMessage::SerializeUlCcchMessage(int messageType) const +RrcUlCcchMessage::SerializeUlCcchMessage (int messageType) const { - SerializeSequence(std::bitset<0>(),false); + SerializeSequence (std::bitset<0> (),false); // Choose c1 - SerializeChoice(2,0); + SerializeChoice (2,0); // Choose message type - SerializeChoice(2,messageType); + SerializeChoice (2,messageType); } /////////////////// RrcDlCcchMessage ////////////////////////////////// uint32_t -RrcDlCcchMessage::Deserialize(Buffer::Iterator bIterator) +RrcDlCcchMessage::Deserialize (Buffer::Iterator bIterator) { - DeserializeDlCcchMessage(bIterator); + DeserializeDlCcchMessage (bIterator); return 1; } @@ -3253,7 +3253,7 @@ RrcDlCcchMessage::Print (std::ostream &os) const void RrcDlCcchMessage::PreSerialize () const { - SerializeDlCcchMessage(m_messageType); + SerializeDlCcchMessage (m_messageType); } Buffer::Iterator @@ -3261,32 +3261,32 @@ RrcDlCcchMessage::DeserializeDlCcchMessage (Buffer::Iterator bIterator) { std::bitset<0> bitset0; int n; - - bIterator = DeserializeSequence(&bitset0,false,bIterator); - bIterator = DeserializeChoice(2,&n,bIterator); - if(n==1) - { - // Deserialize messageClassExtension - bIterator = DeserializeSequence(&bitset0,false,bIterator); - m_messageType = -1; - } - else if(n == 0) - { - // Deserialize c1 - bIterator = DeserializeChoice(4,&m_messageType,bIterator); - } + + bIterator = DeserializeSequence (&bitset0,false,bIterator); + bIterator = DeserializeChoice (2,&n,bIterator); + if (n == 1) + { + // Deserialize messageClassExtension + bIterator = DeserializeSequence (&bitset0,false,bIterator); + m_messageType = -1; + } + else if (n == 0) + { + // Deserialize c1 + bIterator = DeserializeChoice (4,&m_messageType,bIterator); + } return bIterator; } void -RrcDlCcchMessage::SerializeDlCcchMessage(int messageType) const +RrcDlCcchMessage::SerializeDlCcchMessage (int messageType) const { - SerializeSequence(std::bitset<0>(),false); + SerializeSequence (std::bitset<0> (),false); // Choose c1 - SerializeChoice(2,0); + SerializeChoice (2,0); // Choose message type - SerializeChoice(4,messageType); + SerializeChoice (4,messageType); } } // namespace ns3 diff --git a/src/lte/model/lte-rrc-header.h b/src/lte/model/lte-rrc-header.h index 3dc744171..f4ae6d715 100644 --- a/src/lte/model/lte-rrc-header.h +++ b/src/lte/model/lte-rrc-header.h @@ -40,7 +40,7 @@ class RrcAsn1Header : public Asn1Header public: RrcAsn1Header (); int GetMessageType (); - + protected: // Serialization functions void SerializeSrbToAddModList (std::list srbToAddModList) const; @@ -64,7 +64,7 @@ protected: Buffer::Iterator DeserializeRadioResourceConfigCommonSib (Buffer::Iterator bIterator); void Print (std::ostream &os, LteRrcSap::RadioResourceConfigDedicated radioResourceConfigDedicated) const; - + int m_messageType; }; @@ -75,11 +75,11 @@ protected: */ class RrcUlDcchMessage : public RrcAsn1Header { - public: +public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void PreSerialize () const; - void SerializeUlDcchMessage(int msgType) const; + void SerializeUlDcchMessage (int msgType) const; Buffer::Iterator DeserializeUlDcchMessage (Buffer::Iterator bIterator); }; @@ -89,11 +89,11 @@ class RrcUlDcchMessage : public RrcAsn1Header */ class RrcDlDcchMessage : public RrcAsn1Header { - public: +public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void PreSerialize () const; - void SerializeDlDcchMessage(int msgType) const; + void SerializeDlDcchMessage (int msgType) const; Buffer::Iterator DeserializeDlDcchMessage (Buffer::Iterator bIterator); }; @@ -103,11 +103,11 @@ class RrcDlDcchMessage : public RrcAsn1Header */ class RrcUlCcchMessage : public RrcAsn1Header { - public: +public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void PreSerialize () const; - void SerializeUlCcchMessage(int msgType) const; + void SerializeUlCcchMessage (int msgType) const; Buffer::Iterator DeserializeUlCcchMessage (Buffer::Iterator bIterator); }; @@ -117,11 +117,11 @@ class RrcUlCcchMessage : public RrcAsn1Header */ class RrcDlCcchMessage : public RrcAsn1Header { - public: +public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void PreSerialize () const; - void SerializeDlCcchMessage(int msgType) const; + void SerializeDlCcchMessage (int msgType) const; Buffer::Iterator DeserializeDlCcchMessage (Buffer::Iterator bIterator); }; @@ -137,7 +137,7 @@ public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void SetMessage (RrcConnectionRequest msg); - RrcConnectionRequest GetMessage() const; + RrcConnectionRequest GetMessage () const; std::bitset<8> getMmec () const; std::bitset<32> getMtmsi () const; @@ -164,7 +164,7 @@ public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void SetMessage (RrcConnectionSetup msg); - RrcConnectionSetup GetMessage() const; + RrcConnectionSetup GetMessage () const; uint8_t GetRrcTransactionIdentifier () const; bool HavePhysicalConfigDedicated () const; std::list GetSrbToAddModList () const; @@ -190,9 +190,9 @@ public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void SetMessage (RrcConnectionSetupCompleted msg); - + uint8_t GetRrcTransactionIdentifier () const; - RrcConnectionSetupCompleted GetMessage() const; + RrcConnectionSetupCompleted GetMessage () const; private: uint8_t m_rrcTransactionIdentifier; @@ -211,7 +211,7 @@ public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void SetMessage (RrcConnectionReconfigurationCompleted msg); - RrcConnectionReconfigurationCompleted GetMessage() const; + RrcConnectionReconfigurationCompleted GetMessage () const; uint8_t GetRrcTransactionIdentifier () const; private: @@ -270,7 +270,7 @@ public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void SetMessage (HandoverPreparationInfo msg); - + HandoverPreparationInfo GetMessage () const; AsConfig GetAsConfig () const; @@ -312,7 +312,7 @@ public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void SetMessage (RrcConnectionReestablishment msg); - RrcConnectionReestablishment GetMessage() const; + RrcConnectionReestablishment GetMessage () const; uint8_t GetRrcTransactionIdentifier () const; RadioResourceConfigDedicated GetRadioResourceConfigDedicated () const; @@ -333,7 +333,7 @@ public: uint32_t Deserialize (Buffer::Iterator bIterator); void Print (std::ostream &os) const; void SetMessage (RrcConnectionReestablishmentComplete msg); - RrcConnectionReestablishmentComplete GetMessage() const; + RrcConnectionReestablishmentComplete GetMessage () const; uint8_t GetRrcTransactionIdentifier () const; private: diff --git a/src/lte/model/lte-rrc-protocol-real.cc b/src/lte/model/lte-rrc-protocol-real.cc index 0154d87d9..49685100f 100644 --- a/src/lte/model/lte-rrc-protocol-real.cc +++ b/src/lte/model/lte-rrc-protocol-real.cc @@ -44,7 +44,7 @@ NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal); LteUeRrcProtocolReal::LteUeRrcProtocolReal () : m_ueRrcSapProvider (0), - m_enbRrcSapProvider (0) + m_enbRrcSapProvider (0) { m_ueRrcSapUser = new MemberLteUeRrcSapUser (this); } @@ -69,7 +69,7 @@ LteUeRrcProtocolReal::GetTypeId (void) static TypeId tid = TypeId ("ns3::LteUeRrcProtocolReal") .SetParent () .AddConstructor () - ; + ; return tid; } @@ -106,11 +106,11 @@ LteUeRrcProtocolReal::DoSetup (LteUeRrcSapUser::SetupParameters params) LteRlcSapUser* srb0SapUser = new LteRlcSpecificLteRlcSapUser (this); LtePdcpSapUser* srb1SapUser = new LtePdcpSpecificLtePdcpSapUser (this); - - m_completeSetupParameters.srb0SapUser=srb0SapUser; - m_completeSetupParameters.srb1SapUser=srb1SapUser; - - m_ueRrcSapProvider->CompleteSetup(m_completeSetupParameters); + + m_completeSetupParameters.srb0SapUser = srb0SapUser; + m_completeSetupParameters.srb1SapUser = srb1SapUser; + + m_ueRrcSapProvider->CompleteSetup (m_completeSetupParameters); } void @@ -121,10 +121,10 @@ LteUeRrcProtocolReal::DoReestablish () // // eNB we are currently attached to // m_rnti = m_rrc->GetRnti (); // SetEnbRrcSapProvider (); - + // if (m_havePendingRrcConnectionRequest == true) - // { + // { // Simulator::Schedule (RRC_REAL_MSG_DELAY, // &LteEnbRrcSapProvider::RecvRrcConnectionRequest, // m_enbRrcSapProvider, @@ -140,12 +140,12 @@ LteUeRrcProtocolReal::DoSendRrcConnectionRequest (LteRrcSap::RrcConnectionReques // eNB we are currently attached to m_rnti = m_rrc->GetRnti (); SetEnbRrcSapProvider (); - + Ptr packet = Create (); RrcConnectionRequestHeader rrcConnectionRequestHeader; rrcConnectionRequestHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionRequestHeader); LteRlcSapProvider::TransmitPdcpPduParameters transmitPdcpPduParameters; @@ -153,7 +153,7 @@ LteUeRrcProtocolReal::DoSendRrcConnectionRequest (LteRrcSap::RrcConnectionReques transmitPdcpPduParameters.rnti = m_rnti; transmitPdcpPduParameters.lcid = 0; - m_setupParameters.srb0SapProvider->TransmitPdcpPdu(transmitPdcpPduParameters); + m_setupParameters.srb0SapProvider->TransmitPdcpPdu (transmitPdcpPduParameters); } void @@ -163,7 +163,7 @@ LteUeRrcProtocolReal::DoSendRrcConnectionSetupCompleted (LteRrcSap::RrcConnectio RrcConnectionSetupCompleteHeader rrcConnectionSetupCompleteHeader; rrcConnectionSetupCompleteHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionSetupCompleteHeader); LtePdcpSapProvider::TransmitPdcpSduParameters transmitPdcpSduParameters; @@ -171,10 +171,10 @@ LteUeRrcProtocolReal::DoSendRrcConnectionSetupCompleted (LteRrcSap::RrcConnectio transmitPdcpSduParameters.rnti = m_rnti; transmitPdcpSduParameters.lcid = 1; - if(m_setupParameters.srb1SapProvider) - { - m_setupParameters.srb1SapProvider->TransmitPdcpSdu(transmitPdcpSduParameters); - } + if (m_setupParameters.srb1SapProvider) + { + m_setupParameters.srb1SapProvider->TransmitPdcpSdu (transmitPdcpSduParameters); + } } void @@ -184,12 +184,12 @@ LteUeRrcProtocolReal::DoSendRrcConnectionReconfigurationCompleted (LteRrcSap::Rr // eNB we are currently attached to m_rnti = m_rrc->GetRnti (); SetEnbRrcSapProvider (); - + Ptr packet = Create (); RrcConnectionReconfigurationCompleteHeader rrcConnectionReconfigurationCompleteHeader; rrcConnectionReconfigurationCompleteHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionReconfigurationCompleteHeader); LtePdcpSapProvider::TransmitPdcpSduParameters transmitPdcpSduParameters; @@ -197,7 +197,7 @@ LteUeRrcProtocolReal::DoSendRrcConnectionReconfigurationCompleted (LteRrcSap::Rr transmitPdcpSduParameters.rnti = m_rnti; transmitPdcpSduParameters.lcid = 1; - m_setupParameters.srb1SapProvider->TransmitPdcpSdu(transmitPdcpSduParameters); + m_setupParameters.srb1SapProvider->TransmitPdcpSdu (transmitPdcpSduParameters); } void @@ -207,7 +207,7 @@ LteUeRrcProtocolReal::DoSendRrcConnectionReestablishmentRequest (LteRrcSap::RrcC RrcConnectionReestablishmentRequestHeader rrcConnectionReestablishmentRequestHeader; rrcConnectionReestablishmentRequestHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionReestablishmentRequestHeader); LteRlcSapProvider::TransmitPdcpPduParameters transmitPdcpPduParameters; @@ -215,7 +215,7 @@ LteUeRrcProtocolReal::DoSendRrcConnectionReestablishmentRequest (LteRrcSap::RrcC transmitPdcpPduParameters.rnti = m_rnti; transmitPdcpPduParameters.lcid = 0; - m_setupParameters.srb0SapProvider->TransmitPdcpPdu(transmitPdcpPduParameters); + m_setupParameters.srb0SapProvider->TransmitPdcpPdu (transmitPdcpPduParameters); } void @@ -225,7 +225,7 @@ LteUeRrcProtocolReal::DoSendRrcConnectionReestablishmentComplete (LteRrcSap::Rrc RrcConnectionReestablishmentCompleteHeader rrcConnectionReestablishmentCompleteHeader; rrcConnectionReestablishmentCompleteHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionReestablishmentCompleteHeader); LtePdcpSapProvider::TransmitPdcpSduParameters transmitPdcpSduParameters; @@ -233,14 +233,14 @@ LteUeRrcProtocolReal::DoSendRrcConnectionReestablishmentComplete (LteRrcSap::Rrc transmitPdcpSduParameters.rnti = m_rnti; transmitPdcpSduParameters.lcid = 1; - m_setupParameters.srb1SapProvider->TransmitPdcpSdu(transmitPdcpSduParameters); + m_setupParameters.srb1SapProvider->TransmitPdcpSdu (transmitPdcpSduParameters); } void LteUeRrcProtocolReal::SetEnbRrcSapProvider () { - uint16_t cellId = m_rrc->GetCellId (); + uint16_t cellId = m_rrc->GetCellId (); // walk list of all nodes to get the peer eNB Ptr enbDev; @@ -265,14 +265,14 @@ LteUeRrcProtocolReal::SetEnbRrcSapProvider () { if (enbDev->GetCellId () == cellId) { - found = true; + found = true; break; } } } } NS_ASSERT_MSG (found, " Unable to find eNB with CellId =" << cellId); - m_enbRrcSapProvider = enbDev->GetRrc ()->GetLteEnbRrcSapProvider (); + m_enbRrcSapProvider = enbDev->GetRrc ()->GetLteEnbRrcSapProvider (); Ptr enbRrcProtocolReal = enbDev->GetRrc ()->GetObject (); enbRrcProtocolReal->SetUeRrcSapProvider (m_rnti, m_ueRrcSapProvider); } @@ -282,19 +282,19 @@ LteUeRrcProtocolReal::DoReceivePdcpPdu (Ptr p) { // Get type of message received RrcDlCcchMessage rrcDlCcchMessage; - p->PeekHeader(rrcDlCcchMessage); - + p->PeekHeader (rrcDlCcchMessage); + // Declare possible headers to receive RrcConnectionReestablishmentHeader rrcConnectionReestablishmentHeader; RrcConnectionSetupHeader rrcConnectionSetupHeader; // Declare possible messages LteRrcSap::RrcConnectionReestablishment rrcConnectionReestablishmentMsg; - LteRrcSap::RrcConnectionSetup rrcConnectionSetupMsg; + LteRrcSap::RrcConnectionSetup rrcConnectionSetupMsg; // Deserialize packet and call member recv function with appropiate structure - switch( rrcDlCcchMessage.GetMessageType() ) - { + switch ( rrcDlCcchMessage.GetMessageType () ) + { case 0: // RrcConnectionReestablishment p->RemoveHeader (rrcConnectionReestablishmentHeader); @@ -315,7 +315,7 @@ LteUeRrcProtocolReal::DoReceivePdcpPdu (Ptr p) rrcConnectionSetupMsg = rrcConnectionSetupHeader.GetMessage (); m_ueRrcSapProvider->RecvRrcConnectionSetup (rrcConnectionSetupMsg); break; - } + } } void @@ -323,22 +323,22 @@ LteUeRrcProtocolReal::DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameters { // Get type of message received RrcDlDcchMessage rrcDlDcchMessage; - params.pdcpSdu->PeekHeader(rrcDlDcchMessage); - + params.pdcpSdu->PeekHeader (rrcDlDcchMessage); + // Declare possible headers to receive RrcConnectionReconfigurationHeader rrcConnectionReconfigurationHeader; - + // Deserialize packet and call member recv function with appropiate structure - switch( rrcDlDcchMessage.GetMessageType() ) - { + switch ( rrcDlDcchMessage.GetMessageType () ) + { case 4: params.pdcpSdu->RemoveHeader (rrcConnectionReconfigurationHeader); LteRrcSap::RrcConnectionReconfiguration rrcConnectionReconfigurationMsg; rrcConnectionReconfigurationMsg = rrcConnectionReconfigurationHeader.GetMessage (); m_ueRrcSapProvider->RecvRrcConnectionReconfiguration (rrcConnectionReconfigurationMsg); break; - } + } } NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal); @@ -359,7 +359,7 @@ void LteEnbRrcProtocolReal::DoDispose () { NS_LOG_FUNCTION (this); - delete m_enbRrcSapUser; + delete m_enbRrcSapUser; } TypeId @@ -368,7 +368,7 @@ LteEnbRrcProtocolReal::GetTypeId (void) static TypeId tid = TypeId ("ns3::LteEnbRrcProtocolReal") .SetParent () .AddConstructor () - ; + ; return tid; } @@ -432,9 +432,9 @@ LteEnbRrcProtocolReal::DoSetupUe (uint16_t rnti, LteEnbRrcSapUser::SetupUeParame // { // ueRrc = ueDev->GetRrc (); // if ((ueRrc->GetRnti () == rnti) && (ueRrc->GetCellId () == m_cellId)) - // { - // found = true; - // break; + // { + // found = true; + // break; // } // } // } @@ -449,18 +449,18 @@ LteEnbRrcProtocolReal::DoSetupUe (uint16_t rnti, LteEnbRrcSapUser::SetupUeParame // Store SetupUeParameters m_setupUeParametersMap[rnti] = params; - + // Create LteRlcSapUser, LtePdcpSapUser LteRlcSapUser* srb0SapUser = new RealProtocolRlcSapUser (this,rnti); LtePdcpSapUser* srb1SapUser = new LtePdcpSpecificLtePdcpSapUser (this); LteEnbRrcSapProvider::CompleteSetupUeParameters completeSetupUeParameters; completeSetupUeParameters.srb0SapUser = srb0SapUser; completeSetupUeParameters.srb1SapUser = srb1SapUser; - + // Store LteRlcSapUser, LtePdcpSapUser m_completeSetupUeParametersMap[rnti] = completeSetupUeParameters; - - m_enbRrcSapProvider->CompleteSetupUe(rnti,completeSetupUeParameters); + + m_enbRrcSapProvider->CompleteSetupUe (rnti,completeSetupUeParameters); } void @@ -490,7 +490,7 @@ void LteEnbRrcProtocolReal::DoSendSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 msg) { NS_LOG_FUNCTION (this << m_cellId); - // walk list of all nodes to get UEs with this cellId + // walk list of all nodes to get UEs with this cellId Ptr ueRrc; for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) { @@ -502,14 +502,14 @@ LteEnbRrcProtocolReal::DoSendSystemInformationBlockType1 (LteRrcSap::SystemInfor if (ueDev != 0) { NS_LOG_LOGIC ("considering UE " << ueDev->GetImsi ()); - Ptr ueRrc = ueDev->GetRrc (); + Ptr ueRrc = ueDev->GetRrc (); if (ueRrc->GetCellId () == m_cellId) - { + { Simulator::Schedule (RRC_REAL_MSG_DELAY, &LteUeRrcSapProvider::RecvSystemInformationBlockType1, ueRrc->GetLteUeRrcSapProvider (), - msg); - } + msg); + } } } } @@ -530,17 +530,17 @@ LteEnbRrcProtocolReal::DoSendSystemInformation (LteRrcSap::SystemInformation msg Ptr ueDev = node->GetDevice (j)->GetObject (); if (ueDev != 0) { - Ptr ueRrc = ueDev->GetRrc (); + Ptr ueRrc = ueDev->GetRrc (); NS_LOG_LOGIC ("considering UE IMSI " << ueDev->GetImsi () << " that has cellId " << ueRrc->GetCellId ()); if (ueRrc->GetCellId () == m_cellId) - { + { NS_LOG_LOGIC ("sending SI to IMSI " << ueDev->GetImsi ()); ueRrc->GetLteUeRrcSapProvider ()->RecvSystemInformation (msg); Simulator::Schedule (RRC_REAL_MSG_DELAY, &LteUeRrcSapProvider::RecvSystemInformation, ueRrc->GetLteUeRrcSapProvider (), - msg); - } + msg); + } } } } @@ -553,7 +553,7 @@ LteEnbRrcProtocolReal::DoSendRrcConnectionSetup (uint16_t rnti, LteRrcSap::RrcCo RrcConnectionSetupHeader rrcConnectionSetupHeader; rrcConnectionSetupHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionSetupHeader); LteRlcSapProvider::TransmitPdcpPduParameters transmitPdcpPduParameters; @@ -562,14 +562,14 @@ LteEnbRrcProtocolReal::DoSendRrcConnectionSetup (uint16_t rnti, LteRrcSap::RrcCo transmitPdcpPduParameters.lcid = 0; std::map::iterator it; - if(m_setupUeParametersMap.find(rnti) == m_setupUeParametersMap.end() ) - { - std::cout << "RNTI not found in Enb setup parameters Map!" << std::endl; - } + if (m_setupUeParametersMap.find (rnti) == m_setupUeParametersMap.end () ) + { + std::cout << "RNTI not found in Enb setup parameters Map!" << std::endl; + } else - { - m_setupUeParametersMap[rnti].srb0SapProvider->TransmitPdcpPdu(transmitPdcpPduParameters); - } + { + m_setupUeParametersMap[rnti].srb0SapProvider->TransmitPdcpPdu (transmitPdcpPduParameters); + } } void @@ -579,7 +579,7 @@ LteEnbRrcProtocolReal::DoSendRrcConnectionReconfiguration (uint16_t rnti, LteRrc RrcConnectionReconfigurationHeader rrcConnectionReconfigurationHeader; rrcConnectionReconfigurationHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionReconfigurationHeader); LtePdcpSapProvider::TransmitPdcpSduParameters transmitPdcpSduParameters; @@ -587,7 +587,7 @@ LteEnbRrcProtocolReal::DoSendRrcConnectionReconfiguration (uint16_t rnti, LteRrc transmitPdcpSduParameters.rnti = rnti; transmitPdcpSduParameters.lcid = 1; - m_setupUeParametersMap[rnti].srb1SapProvider->TransmitPdcpSdu(transmitPdcpSduParameters); + m_setupUeParametersMap[rnti].srb1SapProvider->TransmitPdcpSdu (transmitPdcpSduParameters); } void @@ -597,7 +597,7 @@ LteEnbRrcProtocolReal::DoSendRrcConnectionReestablishment (uint16_t rnti, LteRrc RrcConnectionReestablishmentHeader rrcConnectionReestablishmentHeader; rrcConnectionReestablishmentHeader.SetMessage (msg); - + packet->AddHeader (rrcConnectionReestablishmentHeader); LteRlcSapProvider::TransmitPdcpPduParameters transmitPdcpPduParameters; @@ -605,25 +605,25 @@ LteEnbRrcProtocolReal::DoSendRrcConnectionReestablishment (uint16_t rnti, LteRrc transmitPdcpPduParameters.rnti = rnti; transmitPdcpPduParameters.lcid = 0; - m_setupUeParametersMap[rnti].srb0SapProvider->TransmitPdcpPdu(transmitPdcpPduParameters); + m_setupUeParametersMap[rnti].srb0SapProvider->TransmitPdcpPdu (transmitPdcpPduParameters); } void LteEnbRrcProtocolReal::DoSendRrcConnectionReestablishmentReject (uint16_t rnti, LteRrcSap::RrcConnectionReestablishmentReject msg) { Simulator::Schedule (RRC_REAL_MSG_DELAY, - &LteUeRrcSapProvider::RecvRrcConnectionReestablishmentReject, - GetUeRrcSapProvider (rnti), - msg); + &LteUeRrcSapProvider::RecvRrcConnectionReestablishmentReject, + GetUeRrcSapProvider (rnti), + msg); } void LteEnbRrcProtocolReal::DoSendRrcConnectionRelease (uint16_t rnti, LteRrcSap::RrcConnectionRelease msg) { Simulator::Schedule (RRC_REAL_MSG_DELAY, - &LteUeRrcSapProvider::RecvRrcConnectionRelease, - GetUeRrcSapProvider (rnti), - msg); + &LteUeRrcSapProvider::RecvRrcConnectionRelease, + GetUeRrcSapProvider (rnti), + msg); } void @@ -631,15 +631,15 @@ LteEnbRrcProtocolReal::DoReceivePdcpPdu (uint16_t rnti, Ptr p) { // Get type of message received RrcUlCcchMessage rrcUlCcchMessage; - p->PeekHeader(rrcUlCcchMessage); - + p->PeekHeader (rrcUlCcchMessage); + // Declare possible headers to receive RrcConnectionReestablishmentRequestHeader rrcConnectionReestablishmentRequestHeader; RrcConnectionRequestHeader rrcConnectionRequestHeader; // Deserialize packet and call member recv function with appropiate structure - switch( rrcUlCcchMessage.GetMessageType() ) - { + switch ( rrcUlCcchMessage.GetMessageType () ) + { case 0: p->RemoveHeader (rrcConnectionReestablishmentRequestHeader); LteRrcSap::RrcConnectionReestablishmentRequest rrcConnectionReestablishmentRequestMsg; @@ -652,7 +652,7 @@ LteEnbRrcProtocolReal::DoReceivePdcpPdu (uint16_t rnti, Ptr p) rrcConnectionRequestMsg = rrcConnectionRequestHeader.GetMessage (); m_enbRrcSapProvider->RecvRrcConnectionRequest (rnti,rrcConnectionRequestMsg); break; - } + } } void @@ -660,16 +660,16 @@ LteEnbRrcProtocolReal::DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameter { // Get type of message received RrcUlDcchMessage rrcUlDcchMessage; - params.pdcpSdu->PeekHeader(rrcUlDcchMessage); - + params.pdcpSdu->PeekHeader (rrcUlDcchMessage); + // Declare possible headers to receive RrcConnectionReconfigurationCompleteHeader rrcConnectionReconfigurationCompleteHeader; RrcConnectionReestablishmentCompleteHeader rrcConnectionReestablishmentCompleteHeader; RrcConnectionSetupCompleteHeader rrcConnectionSetupCompleteHeader; // Deserialize packet and call member recv function with appropiate structure - switch( rrcUlDcchMessage.GetMessageType() ) - { + switch ( rrcUlDcchMessage.GetMessageType () ) + { case 2: params.pdcpSdu->RemoveHeader (rrcConnectionReconfigurationCompleteHeader); LteRrcSap::RrcConnectionReconfigurationCompleted rrcConnectionReconfigurationCompleteMsg; @@ -688,15 +688,15 @@ LteEnbRrcProtocolReal::DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameter rrcConnectionSetupCompletedMsg = rrcConnectionSetupCompleteHeader.GetMessage (); m_enbRrcSapProvider->RecvRrcConnectionSetupCompleted (params.rnti, rrcConnectionSetupCompletedMsg); break; - } + } } Ptr LteEnbRrcProtocolReal::DoEncodeHandoverPreparationInformation (LteRrcSap::HandoverPreparationInfo msg) { HandoverPreparationInfoHeader h; - h.SetMessage(msg); - + h.SetMessage (msg); + Ptr p = Create (); p->AddHeader (h); return p; @@ -707,7 +707,7 @@ LteEnbRrcProtocolReal::DoDecodeHandoverPreparationInformation (Ptr p) { HandoverPreparationInfoHeader h; p->RemoveHeader (h); - LteRrcSap::HandoverPreparationInfo msg = h.GetMessage(); + LteRrcSap::HandoverPreparationInfo msg = h.GetMessage (); return msg; } @@ -726,7 +726,7 @@ LteEnbRrcProtocolReal::DoDecodeHandoverCommand (Ptr p) { RrcConnectionReconfigurationHeader h; p->RemoveHeader (h); - LteRrcSap::RrcConnectionReconfiguration msg = h.GetMessage(); + LteRrcSap::RrcConnectionReconfiguration msg = h.GetMessage (); return msg; } diff --git a/src/lte/model/lte-rrc-protocol-real.h b/src/lte/model/lte-rrc-protocol-real.h index 882121cd0..131c8c5ad 100644 --- a/src/lte/model/lte-rrc-protocol-real.h +++ b/src/lte/model/lte-rrc-protocol-real.h @@ -52,9 +52,8 @@ class LteUeRrcProtocolReal : public Object friend class MemberLteUeRrcSapUser; friend class LteRlcSpecificLteRlcSapUser; friend class LtePdcpSpecificLtePdcpSapUser; - -public: +public: LteUeRrcProtocolReal (); virtual ~LteUeRrcProtocolReal (); @@ -64,12 +63,11 @@ public: void SetLteUeRrcSapProvider (LteUeRrcSapProvider* p); LteUeRrcSapUser* GetLteUeRrcSapUser (); - + void SetUeRrc (Ptr rrc); - + private: - // methods forwarded from LteUeRrcSapUser void DoSetup (LteUeRrcSapUser::SetupParameters params); void DoReestablish (); @@ -88,10 +86,10 @@ private: LteUeRrcSapProvider* m_ueRrcSapProvider; LteUeRrcSapUser* m_ueRrcSapUser; LteEnbRrcSapProvider* m_enbRrcSapProvider; - + LteUeRrcSapUser::SetupParameters m_setupParameters; LteUeRrcSapProvider::CompleteSetupParameters m_completeSetupParameters; - + }; @@ -100,16 +98,16 @@ private: * a real fashion, by creating real RRC PDUs and transmitting them * over Signaling Radio Bearers using radio resources allocated by the * LTE MAC scheduler. - * + * */ class LteEnbRrcProtocolReal : public Object { friend class MemberLteEnbRrcSapUser; friend class LtePdcpSpecificLtePdcpSapUser; friend class LteRlcSpecificLteRlcSapUser; - -public: + friend class RealProtocolRlcSapUser; +public: LteEnbRrcProtocolReal (); virtual ~LteEnbRrcProtocolReal (); @@ -125,10 +123,7 @@ public: LteUeRrcSapProvider* GetUeRrcSapProvider (uint16_t rnti); void SetUeRrcSapProvider (uint16_t rnti, LteUeRrcSapProvider* p); - void DoReceivePdcpPdu (uint16_t rnti, Ptr p); - private: - // methods forwarded from LteEnbRrcSapUser void DoSetupUe (uint16_t rnti, LteEnbRrcSapUser::SetupUeParameters params); void DoRemoveUe (uint16_t rnti); @@ -147,6 +142,7 @@ private: LteRrcSap::RrcConnectionReconfiguration DoDecodeHandoverCommand (Ptr p); void DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameters params); + void DoReceivePdcpPdu (uint16_t rnti, Ptr p); uint16_t m_rnti; uint16_t m_cellId; @@ -155,7 +151,7 @@ private: std::map m_enbRrcSapProviderMap; std::map m_setupUeParametersMap; std::map m_completeSetupUeParametersMap; - + }; /////////////////////////////////////// diff --git a/src/lte/test/test-lte-rrc.cc b/src/lte/test/test-lte-rrc.cc index 8223b11c6..89dfdae92 100644 --- a/src/lte/test/test-lte-rrc.cc +++ b/src/lte/test/test-lte-rrc.cc @@ -259,24 +259,24 @@ LteRrcTestSuite::LteRrcTestSuite () // nUes, nBearers, tConnBase, tConnIncrPerUe, delayDiscStart, useIdealRrc AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 0, 0, 0, 1, useIdealRrc)); AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 0, 100, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 1, 0, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 1, 100, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 2, 0, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 2, 100, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 0, 20, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 0, 20, 10, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 0, 20, 100, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 1, 20, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 1, 20, 10, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 1, 20, 100, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 2, 20, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 2, 20, 10, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 2, 20, 100, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 3, 0, 20, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 4, 0, 20, 0, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 4, 0, 20, 300, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 20, 0, 10, 1, 1, useIdealRrc)); - //AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 50, 0, 0, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 1, 0, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 1, 100, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 2, 0, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 1, 2, 100, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 0, 20, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 0, 20, 10, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 0, 20, 100, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 1, 20, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 1, 20, 10, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 1, 20, 100, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 2, 20, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 2, 20, 10, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 2, 2, 20, 100, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 3, 0, 20, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 4, 0, 20, 0, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 4, 0, 20, 300, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 20, 0, 10, 1, 1, useIdealRrc)); + AddTestCase (new LteRrcConnectionEstablishmentTestCase ( 50, 0, 0, 0, 1, useIdealRrc)); // // time consuming tests with a lot of UEs // AddTestCase (new LteRrcConnectionEstablishmentTestCase (100, 0, 10, 0, 1, useIdealRrc));