Merge branch '11191_move_enb_context' of https://github.com/rsarwad/magma into rsarwad_move_s1ap_state_ctx

Author: rsarwad

lte/cloud/go/protos/oai/s1ap_state.pb.go

@@ -226,7 +226,7 @@ void itti_free_msg_content(MessageDef* const message_p) {
       e_rab_admitted_list_t e_rab_admitted_list = {};
       e_rab_admitted_list =
           message_p->ittiMsg.s1ap_handover_notify.e_rab_admitted_list;
-      for (int idx = 0; idx < e_rab_admitted_list.no_of_items; idx++) {
+      for (uint8_t idx = 0; idx < e_rab_admitted_list.no_of_items; idx++) {
         bdestroy_wrapper(
             &e_rab_admitted_list.item[idx].transport_layer_address);
       }

lte/gateway/c/core/oai/common/itti_free_defined_msg.c

@@ -103,6 +103,12 @@ bool trigger_agw_offload_for_ue(const hash_key_t keyP, void* const elementP,
   EnbDescription* enb_ref_p = magma::lte::s1ap_state_get_enb(
       s1ap_state, ue_context_p->sctp_assoc_id_key);
 
+  if (!enb_ref_p) {
+    OAILOG_ERROR_UE(LOG_UTIL, imsi64,
+                    "Failed to find enb_ref_p for assoc_id :%u",
+                    ue_context_p->sctp_assoc_id_key);
+    return false;
+  }
   // Return if this UE does not satisfy any of the filtering criteria
   if ((imsi64 != ue_context_p->emm_context._imsi64) &&
       (offload_request->eNB_id != enb_ref_p->enb_id())) {

lte/gateway/c/core/oai/tasks/ha/ha_service_handler.cpp

@@ -1418,7 +1418,7 @@ status_code_e s1ap_mme_generate_ue_context_release_command(
   }
   if (rc == RETURNok) {
     // Start timer to track UE context release complete from eNB
-    ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CRR);
+    ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CRC);
     ue_ref_p->mutable_s1ap_ue_context_rel_timer()->set_id(s1ap_start_timer(
         ue_ref_p->s1ap_ue_context_rel_timer().msec(), TIMER_REPEAT_ONCE,
         handle_ue_context_rel_timer_expiry, mme_ue_s1ap_id));
@@ -1665,7 +1665,7 @@ status_code_e s1ap_mme_handle_ue_context_release_complete(
       s1ap_imsi_map_t* imsi_map = get_s1ap_imsi_map();
       imsi_map->mme_ueid2imsi_map.get(mme_ue_s1ap_id, &imsi64);
 
-      ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CRR);
+      ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CRC);
       // We can safely remove UE context now and stop timer
       s1ap_mme_release_ue_context(state, ue_ref_p, imsi64);
 
@@ -2201,7 +2201,7 @@ status_code_e s1ap_mme_handle_handover_request_ack(
         ue_ref_p->mutable_s1ap_handover_state();
     handover_state->mutable_e_rab_admitted_list()->set_no_of_items(
         e_rab_list.no_of_items);
-    for (int idx = 0; idx < e_rab_list.no_of_items; idx++) {
+    for (uint8_t idx = 0; idx < e_rab_list.no_of_items; idx++) {
       oai::ERabAdmittedItem* e_rab_admitted_item =
           handover_state->mutable_e_rab_admitted_list()->add_item();
       e_rab_admitted_item->set_e_rab_id(e_rab_list.item[idx].e_rab_id);
@@ -3868,7 +3868,7 @@ void s1ap_mme_release_ue_context(s1ap_state_t* state,
   message_p->ittiMsgHeader.imsi = imsi64;
   send_msg_to_task(&s1ap_task_zmq_ctx, TASK_MME_APP, message_p);
 
-  if (!(ue_ref_p->s1ap_ue_state() == oai::S1AP_UE_WAITING_CRR)) {
+  if (!(ue_ref_p->s1ap_ue_state() == oai::S1AP_UE_WAITING_CRC)) {
     OAILOG_ERROR(LOG_S1AP, "Incorrect S1AP UE state\n");
   }
   OAILOG_DEBUG_UE(LOG_S1AP, imsi64, "Removed S1AP UE " MME_UE_S1AP_ID_FMT "\n",
@@ -4653,7 +4653,7 @@ status_code_e s1ap_mme_handle_erab_modification_indication(
 
   if ((ue_ref_p = s1ap_state_get_ue_mmeid((uint32_t)mme_ue_s1ap_id)) ==
       nullptr) {
-    OAILOG_DEBUG(LOG_S1AP,
+    OAILOG_ERROR(LOG_S1AP,
                  "No UE is attached to this mme UE s1ap id: " MME_UE_S1AP_ID_FMT
                  " %u(10)\n",
                  (uint32_t)mme_ue_s1ap_id, (uint32_t)mme_ue_s1ap_id);
@@ -5063,7 +5063,7 @@ status_code_e s1ap_handle_path_switch_req_ack(
 
   if ((ue_ref_p = s1ap_state_get_ue_mmeid(
            path_switch_req_ack_p->mme_ue_s1ap_id)) == nullptr) {
-    OAILOG_DEBUG_UE(
+    OAILOG_ERROR_UE(
         LOG_S1AP, imsi64,
         "could not get ue context for mme_ue_s1ap_id " MME_UE_S1AP_ID_FMT "\n",
         (uint32_t)path_switch_req_ack_p->mme_ue_s1ap_id);
@@ -5156,7 +5156,7 @@ status_code_e s1ap_handle_path_switch_req_failure(
   mme_ue_s1ap_id = path_switch_req_failure_p->mme_ue_s1ap_id;
   ue_ref_p = s1ap_state_get_ue_mmeid(mme_ue_s1ap_id);
   if (ue_ref_p == nullptr) {
-    OAILOG_DEBUG_UE(
+    OAILOG_ERROR_UE(
         LOG_S1AP, imsi64,
         "could not get ue context for mme_ue_s1ap_id " MME_UE_S1AP_ID_FMT "\n",
         mme_ue_s1ap_id);

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_handlers.cpp

@@ -392,7 +392,7 @@ status_code_e s1ap_mme_itti_s1ap_handover_notify(
       &S1AP_HANDOVER_NOTIFY(message_p).e_rab_admitted_list;
   e_rab_admitted_list->no_of_items =
       handover_state.e_rab_admitted_list().no_of_items();
-  for (int idx = 0; idx < e_rab_admitted_list->no_of_items; idx++) {
+  for (uint8_t idx = 0; idx < e_rab_admitted_list->no_of_items; idx++) {
     const oai::ERabAdmittedItem& proto_e_rab_item =
         handover_state.e_rab_admitted_list().item(idx);
     e_rab_admitted_list->item[idx].e_rab_id = proto_e_rab_item.e_rab_id();

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_itti_messaging.cpp

@@ -162,7 +162,7 @@ status_code_e s1ap_mme_handle_initial_ue_message(s1ap_state_t* state,
 
     OAILOG_DEBUG(LOG_S1AP, "Creating new UE Ref on S1ap");
 
-    ue_ref->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CSR);
+    ue_ref->set_s1ap_ue_state(oai::S1AP_UE_WAITING_ICSR);
 
     ue_ref->set_enb_ue_s1ap_id(enb_ue_s1ap_id);
     // Will be allocated by NAS
@@ -539,11 +539,11 @@ status_code_e s1ap_generate_downlink_nas_transport(
 
     out = &pdu.choice.initiatingMessage.value.choice.DownlinkNASTransport;
 
-    if (ue_ref->s1ap_ue_state() == oai::S1AP_UE_WAITING_CRR) {
+    if (ue_ref->s1ap_ue_state() == oai::S1AP_UE_WAITING_CRC) {
       OAILOG_ERROR_UE(
           LOG_S1AP, imsi64,
           "Already triggered UE Context Release Command and UE is"
-          "in S1AP_UE_WAITING_CRR, so dropping the DownlinkNASTransport \n");
+          "in S1AP_UE_WAITING_CRC, so dropping the DownlinkNASTransport \n");
       OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
     } else {
       ue_ref->set_s1ap_ue_state(oai::S1AP_UE_CONNECTED);

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_nas_procedures.cpp

@@ -64,11 +64,11 @@ message EnbDescription {
 
 enum S1apUeState {
  S1AP_UE_INVALID_STATE = 0;
- S1AP_UE_WAITING_CSR = 1; ///< Waiting for Initial Context Setup Response
+ S1AP_UE_WAITING_ICSR = 1; ///< Waiting for Initial Context Setup Response
  S1AP_UE_HANDOVER = 2;    ///< Handover procedure triggered
  S1AP_UE_CONNECTED = 3;   ///< UE context ready
- S1AP_UE_WAITING_CRR = 4; /// UE Context release Procedure initiated , waiting for
-                          /// UE context Release Complete
+ S1AP_UE_WAITING_CRC = 4; /// UE Context release Procedure initiated , waiting for
+                          /// UE Context Release Complete
 }
 
 message UeDescription {