Fix valgrind errors in real RRC protocol implementation due to unitialized RRC struct.
authorLluis Parcerisa <parcerisa@gmail.com>
Mon, 17 Dec 2012 11:08:05 +0100
changeset 9558 4f1c670cae45
parent 9557 931cd2808793
child 9559 2640d2e05446
Fix valgrind errors in real RRC protocol implementation due to unitialized RRC struct.
src/lte/model/lte-enb-rrc.cc
--- a/src/lte/model/lte-enb-rrc.cc	Mon Dec 17 09:55:59 2012 +0100
+++ b/src/lte/model/lte-enb-rrc.cc	Mon Dec 17 11:08:05 2012 +0100
@@ -155,6 +155,7 @@
   m_physicalConfigDedicated.haveSoundingRsUlConfigDedicated = true;
   m_physicalConfigDedicated.soundingRsUlConfigDedicated.srsConfigIndex = m_rrc->GetNewSrsConfigurationIndex ();
   m_physicalConfigDedicated.soundingRsUlConfigDedicated.type = LteRrcSap::SoundingRsUlConfigDedicated::SETUP;
+  m_physicalConfigDedicated.soundingRsUlConfigDedicated.srsBandwidth = 1;
 
   m_rrc->m_cmacSapProvider->AddUe (m_rnti);
   m_rrc->m_cphySapProvider->AddUe (m_rnti);
@@ -467,6 +468,12 @@
         hpi.asConfig.sourceUeIdentity = m_rnti;
         hpi.asConfig.sourceDlCarrierFreq = m_rrc->m_dlEarfcn;
         hpi.asConfig.sourceRadioResourceConfig = GetRadioResourceConfigForHandoverPreparationInfo ();
+        hpi.asConfig.sourceMasterInformationBlock.dlBandwidth = 1;
+        hpi.asConfig.sourceMasterInformationBlock.systemFrameNumber = 1;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity = 1;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.cellIdentity = cellId;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIndication = 1;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity = 1;
         params.rrcContext = m_rrc->m_rrcSapUser->EncodeHandoverPreparationInformation (hpi);
   
         NS_LOG_LOGIC ("oldEnbUeX2apId = " << params.oldEnbUeX2apId);