Fix #582, DISABLE_USE_NAS removed

cmake_targets/CMakeLists.txt

@@ -587,7 +587,6 @@ add_boolean_option(NO_RRM                  True  "DO WE HAVE A RADIO RESSOURCE M
 add_boolean_option(RRC_DEFAULT_RAB_IS_AM False "set the RLC mode to AM for the default bearer")
 
 add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????")
-add_boolean_option(DISABLE_USE_NAS False "???")
 add_boolean_option(DEADLINE_SCHEDULER True "Use the Linux scheduler SCHED_DEADLINE: kernel >= 3.14")
 add_boolean_option(CPU_AFFINITY False "Enable CPU Affinity of threads (only valid without deadline scheduler). It is enabled only with >2 CPUs")
 add_boolean_option(NAS_ADDRESS_FIX False "specific to oaisim: for nasmesh driver")

openair3/COMMON/nas_messages_def.h

@@ -61,9 +61,3 @@ MESSAGE_DEF(NAS_PDN_CONNECTIVITY_FAIL,          MESSAGE_PRIORITY_MED,   nas_pdn_
 MESSAGE_DEF(NAS_AUTHENTICATION_PARAM_RSP,       MESSAGE_PRIORITY_MED,   nas_auth_param_rsp_t,        nas_auth_param_rsp)
 MESSAGE_DEF(NAS_AUTHENTICATION_PARAM_FAIL,      MESSAGE_PRIORITY_MED,   nas_auth_param_fail_t,       nas_auth_param_fail)
 
-#if defined(DISABLE_USE_NAS)
-MESSAGE_DEF(NAS_ATTACH_REQ,                     MESSAGE_PRIORITY_MED,   nas_attach_req_t,           nas_attach_req)
-MESSAGE_DEF(NAS_ATTACH_ACCEPT,                  MESSAGE_PRIORITY_MED,   nas_attach_accept_t,        nas_attach_accept)
-MESSAGE_DEF(NAS_AUTHENTICATION_RESP,            MESSAGE_PRIORITY_MED,   nas_auth_resp_t,            nas_auth_resp)
-MESSAGE_DEF(NAS_AUTHENTICATION_REQ,             MESSAGE_PRIORITY_MED,   nas_auth_req_t,             nas_auth_req)
-#endif

openair3/COMMON/nas_messages_types.h

@@ -233,17 +233,7 @@ typedef struct nas_conn_est_ind_s {
 typedef nas_establish_rsp_t nas_conn_est_rej_t;
 
 
-#if defined(DISABLE_USE_NAS)
-typedef struct nas_conn_est_cnf_s {
-  uint32_t ue_id;
-
-  nas_establish_cnf_t nas_establish_cnf;
-  /* Transparent message from MME_APP to S1AP */
-  s1ap_initial_ctxt_setup_req_t transparent;
-} nas_conn_est_cnf_t;
-#else
 typedef nas_establish_cnf_t nas_conn_est_cnf_t;
-#endif
 
 
 typedef struct nas_conn_rel_ind_s {
@@ -336,10 +326,4 @@ typedef struct nas_auth_param_fail_s {
 } nas_auth_param_fail_t;
 
 
-#if defined(DISABLE_USE_NAS)
-typedef struct nas_attach_accept_s {
-  s1ap_initial_ctxt_setup_req_t transparent;
-} nas_attach_accept_t;
-#endif
-
 #endif /* NAS_MESSAGES_TYPES_H_ */