Merge mme app and nas task and remove lock on UE context

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

@@ -35,7 +35,6 @@
 #include "itti_free_defined_msg.h"
 #include "async_system_messages_types.h"
 #include "ip_forward_messages_types.h"
-#include "nas_messages_types.h"
 #include "s11_messages_types.h"
 #include "sctp_messages_types.h"
 
@@ -80,12 +79,14 @@ void itti_free_msg_content(MessageDef* const message_p)
     case MME_APP_CONNECTION_ESTABLISHMENT_CNF: {
       itti_mme_app_connection_establishment_cnf_t mme_app_est_cnf = {0};
       mme_app_est_cnf = message_p->ittiMsg.mme_app_connection_establishment_cnf;
-      bdestroy_wrapper(&mme_app_est_cnf.nas_pdu[0]);
+      for (uint8_t index = 0; index < BEARERS_PER_UE; index++) {
+        bdestroy_wrapper(&mme_app_est_cnf.nas_pdu[index]);
+      }
       for (uint8_t index = 0; index < mme_app_est_cnf.no_of_e_rabs; index++) {
         bdestroy_wrapper(&(mme_app_est_cnf.transport_layer_address[index]));
       }
-      break;
-    }
+      bdestroy_wrapper(&mme_app_est_cnf.ue_radio_capability);
+    } break;
 
     case MME_APP_INITIAL_CONTEXT_SETUP_RSP: break;
 
@@ -100,9 +101,6 @@ void itti_free_msg_content(MessageDef* const message_p)
         "TODO clean pointer");
       break;
 
-    case NAS_AUTHENTICATION_PARAM_REQ:
-      break;
-
     case S11_CREATE_SESSION_REQUEST: {
       // DO nothing
     } break;
@@ -153,7 +151,6 @@ void itti_free_msg_content(MessageDef* const message_p)
 
     case S1AP_UE_CAPABILITIES_IND:
     case S1AP_ENB_DEREGISTERED_IND:
-    case S1AP_DEREGISTER_UE_REQ:
     case S1AP_UE_CONTEXT_RELEASE_REQ:
     case S1AP_UE_CONTEXT_RELEASE_COMMAND:
     case S1AP_UE_CONTEXT_RELEASE_COMPLETE:

lte/gateway/c/oai/include/messages_def.h

@@ -33,7 +33,6 @@
 // Messages files used between tasks
 #include "gtpv1_u_messages_def.h"
 #include "ip_forward_messages_def.h"
-#include "nas_messages_def.h"
 #include "s11_messages_def.h"
 #include "s1ap_messages_def.h"
 #include "s6a_messages_def.h"

lte/gateway/c/oai/include/messages_types.h

@@ -40,7 +40,6 @@
 #include "s11_messages_types.h"
 #include "s5_messages_types.h"
 #include "s1ap_messages_types.h"
-#include "nas_messages_types.h"
 #include "s6a_messages_types.h"
 #include "sctp_messages_types.h"
 #include "sgw_messages_types.h"

lte/gateway/c/oai/include/mme_app_messages_types.h

@@ -43,6 +43,7 @@
 #include "3gpp_36.401.h"
 #include "common_types.h"
 #include "nas/securityDef.h"
+#include "nas/as_message.h"
 
 #define MME_APP_CONNECTION_ESTABLISHMENT_CNF(mSGpTR)                           \
   (mSGpTR)->ittiMsg.mme_app_connection_establishment_cnf

lte/gateway/c/oai/include/mme_app_ue_context.h

@@ -44,7 +44,6 @@
 #include "common_types.h"
 #include "common_defs.h"
 #include "s1ap_messages_types.h"
-#include "nas_messages_types.h"
 #include "s6a_messages_types.h"
 #include "security_types.h"
 #include "sgw_ie_defs.h"
@@ -358,9 +357,6 @@ typedef struct sgs_context_s {
  * according to 3GPP TS.23.401 #5.7.2
  */
 typedef struct ue_mm_context_s {
-  /* mutex on the ue_mm_context_t + emm_context_s + esm_context_t */
-  pthread_mutex_t recmutex;
-
   /* msisdn: The basic MSISDN of the UE. The presence is dictated by its storage
    *         in the HSS, set by S6A UPDATE LOCATION ANSWER
    */
@@ -602,10 +598,6 @@ void mme_remove_ue_context(
   mme_ue_context_t *const mme_ue_context,
   struct ue_mm_context_s *const ue_context_p);
 
-int lock_ue_contexts(ue_mm_context_t *const ue_context_p);
-
-int unlock_ue_contexts(ue_mm_context_t *const ue_context_p);
-
 /** \brief Allocate memory for a new UE context
  * @returns Pointer to the new structure, NULL if allocation failed
  **/

lte/gateway/c/oai/include/s1ap_messages_def.h

@@ -106,11 +106,6 @@ MESSAGE_DEF(
   MESSAGE_PRIORITY_MED,
   itti_s1ap_eNB_deregistered_ind_t,
   s1ap_eNB_deregistered_ind)
-MESSAGE_DEF(
-  S1AP_DEREGISTER_UE_REQ,
-  MESSAGE_PRIORITY_MED,
-  itti_s1ap_deregister_ue_req_t,
-  s1ap_deregister_ue_req)
 MESSAGE_DEF(
   S1AP_UE_CONTEXT_RELEASE_REQ,
   MESSAGE_PRIORITY_MED,

lte/gateway/c/oai/include/s1ap_messages_types.h

@@ -50,7 +50,6 @@
   (mSGpTR)->ittiMsg.s1ap_enb_initiated_reset_req
 #define S1AP_ENB_INITIATED_RESET_ACK(mSGpTR)                                   \
   (mSGpTR)->ittiMsg.s1ap_enb_initiated_reset_ack
-#define S1AP_DEREGISTER_UE_REQ(mSGpTR) (mSGpTR)->ittiMsg.s1ap_deregister_ue_req
 #define S1AP_UE_CONTEXT_RELEASE_REQ(mSGpTR)                                    \
   (mSGpTR)->ittiMsg.s1ap_ue_context_release_req
 #define S1AP_UE_CONTEXT_RELEASE_COMMAND(mSGpTR)                                \
@@ -149,10 +148,6 @@ typedef struct itti_s1ap_eNB_deregistered_ind_s {
   uint32_t enb_id;
 } itti_s1ap_eNB_deregistered_ind_t;
 
-typedef struct itti_s1ap_deregister_ue_req_s {
-  mme_ue_s1ap_id_t mme_ue_s1ap_id;
-} itti_s1ap_deregister_ue_req_t;
-
 typedef enum s1ap_reset_type_e {
   RESET_ALL = 0,
   RESET_PARTIAL

lte/gateway/c/oai/oai_mme/CMakeLists.txt

@@ -34,7 +34,6 @@ add_executable(mme
     ${PROJECT_SOURCE_DIR}/oai_mme/oai_mme.c
     ${PROJECT_SOURCE_DIR}/common/common_types.c
     ${PROJECT_SOURCE_DIR}/common/itti_free_defined_msg.c
-    ${PROJECT_SOURCE_DIR}/tasks/nas/nas_mme_task.c
     ${PROJECT_SOURCE_DIR}/tasks/service303/service303_task.c
     ${PROJECT_SOURCE_DIR}/tasks/service303/service303_mme_stats.c
     ${PROJECT_SOURCE_DIR}/tasks/grpc_service/grpc_service_task.c

lte/gateway/c/oai/oai_mme/oai_mme.c

@@ -39,7 +39,6 @@
 #include "sctp_primitives_server.h"
 #include "s1ap_mme.h"
 #include "mme_app_extern.h"
-#include "nas_defs.h"
 /* FreeDiameter headers for support of S6A interface */
 #include "s6a_defs.h"
 #include "sgs_defs.h"
@@ -101,7 +100,6 @@ int main(int argc, char *argv[])
   send_app_health_to_service303(TASK_MME_APP, false);
 
   CHECK_INIT_RETURN(mme_app_init(&mme_config));
-  CHECK_INIT_RETURN(nas_init(&mme_config));
   CHECK_INIT_RETURN(sctp_init(&mme_config));
 #if EMBEDDED_SGW
   CHECK_INIT_RETURN(sgw_init(&spgw_config, mme_config.use_stateless));