Cleanup test5Gnas.c and MAC references in NR_NAS_defs.h (undefined functions prototypes)

CMakeLists.txt

@@ -1897,12 +1897,6 @@ add_executable(measurement_display
   ${OPENAIR_DIR}/common/utils/threadPool/measurement_display.c)
 target_link_libraries (measurement_display minimal_lib)
 
-add_executable(test5Gnas
-  ${OPENAIR_DIR}/openair3/TEST/test5Gnas.c
-)
-target_link_libraries (test5Gnas LIB_5GNAS_GNB minimal_lib )
-
-
 # lte-softmodem is both eNB and UE implementation
 ###################################################
 

openair3/NAS/COMMON/NR_NAS_defs.h

@@ -25,7 +25,6 @@
 
 #include <common/utils/LOG/log.h>
 #include <openair3/UICC/usim_interface.h>
-#include <openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h>
 
 /* TS 24.007 possible L3 formats:
    Table 11.1: Formats of information elements
@@ -381,18 +380,6 @@ int resToresStar(uint8_t *msg, const uicc_t* uicc);
 
 int identityResponse(void **msg, nr_user_nas_t *UE);
 int authenticationResponse(void **msg, nr_user_nas_t *UE);
-void UEprocessNAS(void *msg,nr_user_nas_t *UE);
-void SGSabortUE(void *msg, NRUEcontext_t *UE) ;
-void SGSregistrationReq(void *msg, NRUEcontext_t *UE);
-void SGSderegistrationUEReq(void *msg, NRUEcontext_t *UE);
-void SGSauthenticationResp(void *msg, NRUEcontext_t *UE);
-void SGSidentityResp(void *msg, NRUEcontext_t *UE);
-void SGSsecurityModeComplete(void *msg, NRUEcontext_t *UE);
-void SGSregistrationComplete(void *msg, NRUEcontext_t *UE);
-void processNAS(void *msg, NRUEcontext_t *UE);
-int identityRequest(void **msg, NRUEcontext_t *UE);
-int authenticationRequest(void **msg, NRUEcontext_t *UE);
-int securityModeCommand(void **msg, NRUEcontext_t *UE);
 void servingNetworkName(uint8_t *msg, char * imsiStr, int nmc_size);
 
 #endif

openair3/NAS/COMMON/nr_common.c

@@ -21,6 +21,7 @@
  *      contact@openairinterface.org
  */
 
+#include <arpa/inet.h>
 #include <openair3/NAS/COMMON/NR_NAS_defs.h>
 #include <openair3/SECU/secu_defs.h>
 #include <openair3/SECU/kdf.h>

openair3/TEST/test5Gnas.c

@@ -1,35 +0,0 @@
-#include <common/config/config_userapi.h>
-#include <openair3/NAS/COMMON/NR_NAS_defs.h>
-
-volatile int oai_exit;
-configmodule_interface_t *uniqCfg = NULL;
-
-int main(int argc, char **argv) {
-  if ((uniqCfg = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY)) == NULL) {
-    exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
-  }
-
-  logInit();
-  char *resp;
-  nr_user_nas_t UErrc= {0};
-  NRUEcontext_t UEnas= {0};
-  // Network generate identity request after a sucessfull radio attach
-  int size=identityRequest((void **)&resp, &UEnas);
-  log_dump(NAS, resp, size, LOG_DUMP_CHAR,"   identity Request:\n" );
-  // UE process the message that it has received from phy layer in a "DL transfer" message
-  UEprocessNAS(resp, &UErrc);
-  // UE Scheduler should later call the response
-  size=identityResponse((void **)&resp, &UErrc);
-  log_dump(NAS, resp, size, LOG_DUMP_CHAR,"   identity Response:\n" );
-  // Now the gNB process the identity response
-  processNAS(resp, &UEnas);
-  // gNB scheduler should call the next query
-  size=authenticationRequest((void **)&resp, &UEnas);
-  log_dump(NAS, resp, size, LOG_DUMP_CHAR,"   authentication request:\n" );
-  // as above
-  UEprocessNAS(resp, &UErrc);
-  size=authenticationResponse((void **)&resp, &UErrc);
-  log_dump(NAS, resp, size, LOG_DUMP_CHAR,"   authentication response:\n" );
-  processNAS(resp, &UEnas);
-  return 0;
-}