From 4c7d1e03819ca7331d16f35b290188c3a0fc021a Mon Sep 17 00:00:00 2001
From: Xenofon Foukas <x.foukas@sms.ed.ac.uk>
Date: Wed, 24 Feb 2016 17:31:13 +0000
Subject: [PATCH] Added support for indication of a UE state in both
 RRC_CONNECTED and RRC_RECONFIGURED STATES

---
 openair2/RRC/LITE/rrc_eNB.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 4d5d390d0d..adaf50d62e 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -4013,6 +4013,12 @@ rrc_eNB_decode_dcch(
         LOG_I(RRC,
               PROTOCOL_RRC_CTXT_UE_FMT" UE State = RRC_RECONFIGURED \n",
               PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
+	//WARNING:Inform the controller about the UE activation. Should be moved to RRC agent in the future
+	if (mac_agent_registered[ctxt_pP->eNB_index]) {
+	  agent_mac_xface[ctxt_pP->eNB_index]->enb_agent_notify_ue_state_change(ctxt_pP->eNB_index,
+										ue_context_p->ue_id_rnti,
+										PROTOCOL__PRP_UE_STATE_CHANGE_TYPE__PRUESC_UPDATED);
+	}
       }
 
 #if defined(ENABLE_USE_MME)
@@ -4095,14 +4101,14 @@ rrc_eNB_decode_dcch(
             ue_context_p,
             &ul_dcch_msg->message.choice.c1.choice.rrcConnectionSetupComplete.criticalExtensions.choice.c1.choice.rrcConnectionSetupComplete_r8);
           ue_context_p->ue_context.Status = RRC_CONNECTED;
-	  //WARNING:Inform the controller about the UE activation. Should be moved to RRC agent in the future
-	  if (mac_agent_registered[ctxt_pP->eNB_index]) {
-	      agent_mac_xface[ctxt_pP->eNB_index]->enb_agent_notify_ue_state_change(ctxt_pP->eNB_index,
-	    								    ue_context_p->ue_id_rnti,
-	    								    PROTOCOL__PRP_UE_STATE_CHANGE_TYPE__PRUESC_ACTIVATED);
-	    }
           LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT" UE State = RRC_CONNECTED \n",
                 PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
+	  //WARNING:Inform the controller about the UE activation. Should be moved to RRC agent in the future
+	  if (mac_agent_registered[ctxt_pP->eNB_index]) {
+	    agent_mac_xface[ctxt_pP->eNB_index]->enb_agent_notify_ue_state_change(ctxt_pP->eNB_index,
+										  ue_context_p->ue_id_rnti,
+										  PROTOCOL__PRP_UE_STATE_CHANGE_TYPE__PRUESC_ACTIVATED);
+	  }
         }
       }
 
-- 
2.26.2