Moved UE activation notification to RRC

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -56,8 +56,6 @@
 #include "RRC/LITE/extern.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 
-#include "enb_agent_extern.h"
-
 //#include "LAYER2/MAC/pre_processor.c"
 #include "pdcp.h"
 
@@ -257,12 +255,6 @@ void rx_sdu(
             } else
               LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d Added user with rnti %x => UE %d\n",
                     enb_mod_idP,CC_idP,frameP,eNB->common_channels[CC_idP].RA_template[ii].rnti,UE_id);
-	    //WARNING:Inform the controller about the UE activation. Should be moved to RRC agent in the future
-	    if (mac_agent_registered[enb_mod_idP]) {
-	      agent_mac_xface[enb_mod_idP]->enb_agent_notify_ue_state_change(enb_mod_idP,
-	    								    eNB->common_channels[CC_idP].RA_template[ii].rnti,
-	    								    PROTOCOL__PRP_UE_STATE_CHANGE_TYPE__PRUESC_ACTIVATED);
-	    }
           } else {
             LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3 from already registered UE %d: length %d, offset %d\n",
                   enb_mod_idP,CC_idP,frameP,UE_id,rx_lengths[i],payload_ptr-sduP);

openair2/RRC/LITE/rrc_eNB.c

@@ -99,6 +99,8 @@
 
 #include "SIMULATION/TOOLS/defs.h" // for taus
 
+#include "enb_agent_extern.h"
+
 //#define XER_PRINT
 
 #ifdef PHY_EMUL
@@ -4093,6 +4095,12 @@ 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));
         }