Addressed review comments

Author: rsarwad

lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c

@@ -695,7 +695,7 @@ void mme_app_handle_initial_ue_message(mme_app_desc_t *mme_app_desc_p,
       /*
        * Error during ue context malloc
        */
-      DevMessage("mme_create_new_ue_context");
+      OAILOG_ERROR(LOG_MME_APP, "Failed to create new ue context \n");
       OAILOG_FUNC_OUT(LOG_MME_APP);
     }
     is_mm_ctx_new = true;
@@ -1628,26 +1628,17 @@ void mme_app_handle_e_rab_setup_rsp(
 void mme_app_handle_mobile_reachability_timer_expiry(void* args)
 {
   OAILOG_FUNC_IN(LOG_MME_APP);
-  mme_app_desc_t* mme_app_desc_p = NULL;
   mme_ue_s1ap_id_t mme_ue_s1ap_id = *((mme_ue_s1ap_id_t *) (args));
   struct ue_mm_context_s* ue_context_p = NULL;
 
-  mme_app_desc_p = get_mme_nas_state(false);
-  ue_context_p = mme_ue_context_exists_mme_ue_s1ap_id(
-    &mme_app_desc_p->mme_ue_contexts, mme_ue_s1ap_id);
+  ue_context_p = mme_app_get_ue_context(
+    mme_ue_s1ap_id,
+    "Mobile reachability timer");
   if (ue_context_p == NULL) {
-    OAILOG_ERROR(
-      LOG_MME_APP,
-      "Mobile Reachability Timer expired, but no assoicated UE context found"
-      " for ue-id " MME_UE_S1AP_ID_FMT "\n",
-      mme_ue_s1ap_id);
     OAILOG_FUNC_OUT(LOG_MME_APP);
   }
   ue_context_p->mobile_reachability_timer.id = MME_APP_TIMER_INACTIVE_ID;
-  OAILOG_INFO(
-    LOG_MME_APP,
-    "Expired- Mobile Reachability Timer for ue_id:" MME_UE_S1AP_ID_FMT " \n",
-    ue_context_p->mme_ue_s1ap_id);
+
   // Start Implicit Detach timer
   nas_itti_timer_arg_t timer_callback_fun = {0};
   timer_callback_fun.nas_timer_callback =
@@ -1685,28 +1676,16 @@ void mme_app_handle_mobile_reachability_timer_expiry(void* args)
 void mme_app_handle_implicit_detach_timer_expiry(void* args)
 {
   OAILOG_FUNC_IN(LOG_MME_APP);
-  mme_app_desc_t* mme_app_desc_p = NULL;
   mme_ue_s1ap_id_t mme_ue_s1ap_id = *((mme_ue_s1ap_id_t*) (args));
   struct ue_mm_context_s* ue_context_p = NULL;
 
-  mme_app_desc_p = get_mme_nas_state(false);
-  ue_context_p = mme_ue_context_exists_mme_ue_s1ap_id(
-    &mme_app_desc_p->mme_ue_contexts, mme_ue_s1ap_id);
+  ue_context_p = mme_app_get_ue_context(
+    mme_ue_s1ap_id,
+    "Implicit detach timer");
   if (ue_context_p == NULL) {
-    OAILOG_ERROR(
-      LOG_MME_APP,
-      "Implicit Detach Timer expired, but no assoicated UE context for"
-      "ue-id " MME_UE_S1AP_ID_FMT "\n",
-      mme_ue_s1ap_id);
     OAILOG_FUNC_OUT(LOG_MME_APP);
   }
-
-  OAILOG_INFO(
-    LOG_MME_APP,
-    "Implicit Detach timer expired for UE id" MME_UE_S1AP_ID_FMT "\n",
-    mme_ue_s1ap_id);
   ue_context_p->implicit_detach_timer.id = MME_APP_TIMER_INACTIVE_ID;
-
   // Initiate Implicit Detach for the UE
   nas_proc_implicit_detach_ue_ind(mme_ue_s1ap_id);
   OAILOG_FUNC_OUT(LOG_MME_APP);
@@ -1716,27 +1695,15 @@ void mme_app_handle_implicit_detach_timer_expiry(void* args)
 void mme_app_handle_initial_context_setup_rsp_timer_expiry(void* args)
 {
   OAILOG_FUNC_IN(LOG_MME_APP);
-  mme_app_desc_t* mme_app_desc_p = NULL;
   mme_ue_s1ap_id_t mme_ue_s1ap_id = *((mme_ue_s1ap_id_t*) (args));
   struct ue_mm_context_s* ue_context_p = NULL;
 
-  mme_app_desc_p = get_mme_nas_state(false);
-  ue_context_p = mme_ue_context_exists_mme_ue_s1ap_id(
-    &mme_app_desc_p->mme_ue_contexts, mme_ue_s1ap_id);
+  ue_context_p = mme_app_get_ue_context(
+     mme_ue_s1ap_id,
+     "Initial context setup response timer");
   if (ue_context_p == NULL) {
-    OAILOG_ERROR(
-      LOG_MME_APP,
-      "Initial context setup rsp Timer expired, but no assoicated UE context found"
-      " for ue_id " MME_UE_S1AP_ID_FMT "\n",
-      mme_ue_s1ap_id);
     OAILOG_FUNC_OUT(LOG_MME_APP);
   }
-
-
-  OAILOG_ERROR(
-    LOG_MME_APP,
-    "Expired- Initial context setup rsp timer for UE id  %d \n",
-    mme_ue_s1ap_id);
   ue_context_p->initial_context_setup_rsp_timer.id = MME_APP_TIMER_INACTIVE_ID;
   /* *********Abort the ongoing procedure*********
    * Check if UE is registered already that implies service request procedure is active. If so then release the S1AP
@@ -2055,27 +2022,13 @@ int mme_app_handle_initial_paging_request(mme_app_desc_t *mme_app_desc_p,
 void mme_app_handle_paging_timer_expiry(void* args)
 {
   OAILOG_FUNC_IN(LOG_MME_APP);
-  mme_app_desc_t* mme_app_desc_p = NULL;
   mme_ue_s1ap_id_t mme_ue_s1ap_id = *((mme_ue_s1ap_id_t*) (args));
   struct ue_mm_context_s* ue_context_p = NULL;
+  ue_context_p = mme_app_get_ue_context(mme_ue_s1ap_id, "Paging timer");
 
-  mme_app_desc_p = get_mme_nas_state(false);
-  ue_context_p = mme_ue_context_exists_mme_ue_s1ap_id(
-    &mme_app_desc_p->mme_ue_contexts, mme_ue_s1ap_id);
   if (ue_context_p == NULL) {
-    OAILOG_ERROR(
-      LOG_MME_APP,
-      "Paging Timer expired, but no assoicated UE context found"
-      " for ue_id " MME_UE_S1AP_ID_FMT "\n",
-      mme_ue_s1ap_id);
     OAILOG_FUNC_OUT(LOG_MME_APP);
   }
-
-  OAILOG_ERROR(
-    LOG_MME_APP,
-    "Paging Timer expired for ue_id " MME_UE_S1AP_ID_FMT "\n",
-    mme_ue_s1ap_id);
-
   ue_context_p->paging_response_timer.id = MME_APP_TIMER_INACTIVE_ID;
   if ((mme_app_paging_request_helper(
     ue_context_p, false, true /* s-tmsi */, CN_DOMAIN_PS)) != RETURNok) {
@@ -2090,26 +2043,15 @@ void mme_app_handle_paging_timer_expiry(void* args)
 void mme_app_handle_ulr_timer_expiry(void* args)
 {
   OAILOG_FUNC_IN(LOG_MME_APP);
-  mme_app_desc_t* mme_app_desc_p = NULL;
   mme_ue_s1ap_id_t mme_ue_s1ap_id = *((mme_ue_s1ap_id_t*) (args));
   struct ue_mm_context_s* ue_context_p = NULL;
 
-  mme_app_desc_p = get_mme_nas_state(false);
-  ue_context_p = mme_ue_context_exists_mme_ue_s1ap_id(
-    &mme_app_desc_p->mme_ue_contexts, mme_ue_s1ap_id);
+  ue_context_p = mme_app_get_ue_context(
+    mme_ue_s1ap_id,
+    "Update location timer");
   if (ue_context_p == NULL) {
-    OAILOG_ERROR(
-      LOG_MME_APP,
-      "Update Location Timer expired, but no assoicated UE context found"
-      " for ue_id " MME_UE_S1AP_ID_FMT "\n",
-      mme_ue_s1ap_id);
     OAILOG_FUNC_OUT(LOG_MME_APP);
   }
-
-  OAILOG_ERROR(
-    LOG_MME_APP,
-    "Update Location Timer expired for ue-id" MME_UE_S1AP_ID_FMT "\n",
-    mme_ue_s1ap_id);
   ue_context_p->ulr_response_timer.id = MME_APP_TIMER_INACTIVE_ID;
 
   // Send PDN CONNECTIVITY FAIL message  to NAS layer
@@ -2332,10 +2274,11 @@ int mme_app_handle_nas_extended_service_req(
          * not when SERVICE ABORT request is received from MSC/VLR
          */
         ue_context_p->sgs_context->mt_call_in_progress = true;
+        /* If call_cancelled is set, send Service Reject to UE as MSC/VLR
+         * has triggered SGSAP SERVICE ABORT procedure
+         */
         if (ue_context_p->sgs_context->call_cancelled) {
-          /* Sending Service Reject to UE as MSC/VLR has triggered
-           * SGSAP SERVICE ABORT
-           * If UE's ECM state is IDLE send
+          /* If UE's ECM state is IDLE send
            * service_reject in Establish cnf else send in DL NAS Transport
            */
           if (ue_context_p->ecm_state == ECM_IDLE) {
@@ -2418,26 +2361,15 @@ int mme_app_handle_nas_extended_service_req(
 void mme_app_handle_ue_context_modification_timer_expiry(void* args)
 {
   OAILOG_FUNC_IN(LOG_MME_APP);
-  mme_app_desc_t* mme_app_desc_p = NULL;
   mme_ue_s1ap_id_t mme_ue_s1ap_id = *((mme_ue_s1ap_id_t *) (args));
   struct ue_mm_context_s* ue_context_p = NULL;
 
-  mme_app_desc_p = get_mme_nas_state(false);
-  ue_context_p = mme_ue_context_exists_mme_ue_s1ap_id(
-    &mme_app_desc_p->mme_ue_contexts, mme_ue_s1ap_id);
+  ue_context_p = mme_app_get_ue_context(
+    mme_ue_s1ap_id,
+    "UE context modification timer");
   if (ue_context_p == NULL) {
-    OAILOG_ERROR(
-      LOG_MME_APP,
-      "UE context modification Timer expired, but no assoicated UE context "
-      "found for ue-id " MME_UE_S1AP_ID_FMT "\n",
-      mme_ue_s1ap_id);
     OAILOG_FUNC_OUT(LOG_MME_APP);
   }
-
-  OAILOG_ERROR(
-    LOG_MME_APP,
-    "Expired- UE context modification timer for UE id  %d \n",
-    mme_ue_s1ap_id);
   ue_context_p->ue_context_modification_timer.id = MME_APP_TIMER_INACTIVE_ID;
 
   if (ue_context_p->sgs_context != NULL) {
@@ -3457,3 +3389,31 @@ void mme_app_update_paging_tai_list(
   }
   OAILOG_FUNC_OUT(LOG_MME_APP);
 }
+
+// Fetch UE context based on mme_ue_s1ap_id and return pointer to UE context
+ue_mm_context_t* mme_app_get_ue_context(
+  mme_ue_s1ap_id_t mme_ue_s1ap_id, char* timer_name)
+{
+  OAILOG_FUNC_IN(LOG_MME_APP);
+  mme_app_desc_t* mme_app_desc_p = NULL;
+  struct ue_mm_context_s* ue_context_p = NULL;
+
+  OAILOG_ERROR(LOG_MME_APP, "Expired- %s for ue_id " MME_UE_S1AP_ID_FMT
+    "\n",
+    timer_name,
+    mme_ue_s1ap_id);
+
+  mme_app_desc_p = get_mme_nas_state(false);
+  ue_context_p = mme_ue_context_exists_mme_ue_s1ap_id(
+    &mme_app_desc_p->mme_ue_contexts, mme_ue_s1ap_id);
+  if (ue_context_p == NULL) {
+    OAILOG_ERROR(
+      LOG_MME_APP,
+      "Failed to get ue context while handling %s for ue_id "
+      MME_UE_S1AP_ID_FMT "\n",
+      timer_name,
+      mme_ue_s1ap_id);
+    return NULL;
+  }
+  return ue_context_p;
+}

lte/gateway/c/oai/tasks/mme_app/mme_app_context.c

@@ -143,21 +143,16 @@ ue_mm_context_t* mme_create_new_ue_context(void)
   new_p->mobile_reachability_timer.id = MME_APP_TIMER_INACTIVE_ID;
   new_p->implicit_detach_timer.id = MME_APP_TIMER_INACTIVE_ID;
 
-  new_p->initial_context_setup_rsp_timer.id = MME_APP_TIMER_INACTIVE_ID;
-  new_p->initial_context_setup_rsp_timer.sec =
-    MME_APP_INITIAL_CONTEXT_SETUP_RSP_TIMER_VALUE;
-  new_p->paging_response_timer.id = MME_APP_TIMER_INACTIVE_ID;
-  new_p->paging_response_timer.sec = MME_APP_PAGING_RESPONSE_TIMER_VALUE;
-  new_p->ulr_response_timer.id = MME_APP_TIMER_INACTIVE_ID;
-  new_p->ulr_response_timer.sec = MME_APP_ULR_RESPONSE_TIMER_VALUE;
-  new_p->ue_context_modification_timer.id = MME_APP_TIMER_INACTIVE_ID;
-  new_p->ue_context_modification_timer.sec =
-      MME_APP_UE_CONTEXT_MODIFICATION_TIMER_VALUE;
+  new_p->initial_context_setup_rsp_timer = (struct mme_app_timer_t) {
+    MME_APP_TIMER_INACTIVE_ID, MME_APP_INITIAL_CONTEXT_SETUP_RSP_TIMER_VALUE};
+  new_p->paging_response_timer = (struct mme_app_timer_t) {
+    MME_APP_TIMER_INACTIVE_ID, MME_APP_PAGING_RESPONSE_TIMER_VALUE};
+  new_p->ulr_response_timer = (struct mme_app_timer_t) {
+    MME_APP_TIMER_INACTIVE_ID, MME_APP_ULR_RESPONSE_TIMER_VALUE};
+  new_p->ue_context_modification_timer = (struct mme_app_timer_t) {
+    MME_APP_TIMER_INACTIVE_ID, MME_APP_UE_CONTEXT_MODIFICATION_TIMER_VALUE};
 
   new_p->ue_context_rel_cause = S1AP_INVALID_CAUSE;
-  new_p->send_ue_purge_request = false;
-  new_p->hss_initiated_detach = false;
-  new_p->location_info_confirmed_in_hss = false;
   new_p->sgs_context = NULL;
   return new_p;
 }

lte/gateway/c/oai/tasks/mme_app/mme_app_defs.h

@@ -146,30 +146,27 @@ void mme_ue_context_update_ue_sig_connection_state(
   struct ue_mm_context_s *ue_context_p,
   ecm_state_t new_ecm_state);
 
-void mme_app_handle_mobile_reachability_timer_expiry(
-  void *args);
+void mme_app_handle_mobile_reachability_timer_expiry(void* args);
 
-void mme_app_handle_implicit_detach_timer_expiry(
-  void *args);
+void mme_app_handle_implicit_detach_timer_expiry(void* args);
 
-void mme_app_handle_initial_context_setup_rsp_timer_expiry(
-  void *args);
+void mme_app_handle_initial_context_setup_rsp_timer_expiry(void* args);
 
-void mme_app_handle_ue_context_modification_timer_expiry(void *args);
+void mme_app_handle_ue_context_modification_timer_expiry(void* args);
 
 void mme_app_handle_enb_reset_req(
   const itti_s1ap_enb_initiated_reset_req_t const *enb_reset_req);
 
 int mme_app_handle_initial_paging_request(mme_app_desc_t *mme_app_desc_p,
     const char *imsi);
 
-void mme_app_handle_paging_timer_expiry(void *args);
-void mme_app_handle_ulr_timer_expiry(void *args);
+void mme_app_handle_paging_timer_expiry(void* args);
+void mme_app_handle_ulr_timer_expiry(void* args);
 
-void mme_app_handle_sgs_eps_detach_timer_expiry(void *args);
-void mme_app_handle_sgs_imsi_detach_timer_expiry(void *args);
-void mme_app_handle_sgs_implicit_imsi_detach_timer_expiry(void *args);
-void mme_app_handle_sgs_implicit_eps_detach_timer_expiry(void *args);
+void mme_app_handle_sgs_eps_detach_timer_expiry(void* args);
+void mme_app_handle_sgs_imsi_detach_timer_expiry(void* args);
+void mme_app_handle_sgs_implicit_imsi_detach_timer_expiry(void* args);
+void mme_app_handle_sgs_implicit_eps_detach_timer_expiry(void* args);
 
 int mme_app_send_s6a_cancel_location_ans(
   int cla_result,
@@ -213,7 +210,7 @@ int send_itti_sgsap_location_update_req(ue_mm_context_t *ue_context);
 int mme_app_handle_sgsap_location_update_rej(mme_app_desc_t *mme_app_desc_p,
   itti_sgsap_location_update_rej_t *const itti_sgsap_location_update_rej);
 
-void mme_app_handle_ts6_1_timer_expiry(void * args);
+void mme_app_handle_ts6_1_timer_expiry(void* args);
 
 int mme_app_handle_sgsap_reset_indication(mme_app_desc_t *mme_app_desc_p,
   itti_sgsap_vlr_reset_indication_t *const reset_indication_pP);
@@ -316,6 +313,10 @@ int mme_app_create_sgs_context(ue_mm_context_t* ue_context_p);
 
 int map_sgs_emm_cause(SgsRejectCause_t sgs_cause);
 
+ue_mm_context_t* mme_app_get_ue_context(
+  mme_ue_s1ap_id_t mme_ue_s1ap_id,
+  char* timer_name);
+
 #define ATTACH_REQ (1 << 0)
 #define TAU_REQUEST (1 << 1)
 #define INTIAL_CONTEXT_SETUP_PROCEDURE_FAILED 0x00