From 994ed53c080b8fadde47560cb3da338e0c7f7761 Mon Sep 17 00:00:00 2001 From: Budiarto Herman Date: Tue, 25 Jun 2013 14:41:32 +0300 Subject: [PATCH] Removed assumption of Event A2 and A4 in LteEnbRrc upon receiving measurement report --- src/lte/model/lte-enb-rrc.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc index 3f437797b..8bf71d5ad 100644 --- a/src/lte/model/lte-enb-rrc.cc +++ b/src/lte/model/lte-enb-rrc.cc @@ -945,9 +945,13 @@ UeManager::RecvMeasurementReport (LteRrcSap::MeasurementReport msg) m_rrc->m_recvMeasurementReportTrace (m_imsi, m_rrc->m_cellId, m_rnti, msg); - // Just these two measId are supported - NS_ASSERT_MSG ((msg.measResults.measId == 1) || (msg.measResults.measId == 2), - "Measure identity is unknown"); + /* + * The code below assumes event A2 at measId 1 and A4 at measId 2, which is + * the default configuration from previous release of LENA. This section will + * be moved as a separate handover algorithm. To avoid automatically invoking + * handover, disable it by setting ns3::LteEnbRrc::AdmitHandoverRequest + * attribute to false. + */ /// Event A2 (Serving becomes worse than threshold) if (msg.measResults.measId == 1)