Commit 7b5431a6 authored by gauthier's avatar gauthier

renamed openair-cn to openair3

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7886 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent c7518ecf
...@@ -36,7 +36,7 @@ set (OPENAIR1_DIR ${OPENAIR_DIR}/openair1) ...@@ -36,7 +36,7 @@ set (OPENAIR1_DIR ${OPENAIR_DIR}/openair1)
set (OPENAIR2_DIR ${OPENAIR_DIR}/openair2) set (OPENAIR2_DIR ${OPENAIR_DIR}/openair2)
set (OPENAIR3_DIR ${OPENAIR_DIR}/openair3) set (OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set (OPENAIR_TARGETS ${OPENAIR_DIR}/targets) set (OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
set (OPENAIRCN_DIR ${OPENAIR_DIR}/openair-cn) set (OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set (OPENAIR_CMAKE ${OPENAIR_DIR}/cmake_targets) set (OPENAIR_CMAKE ${OPENAIR_DIR}/cmake_targets)
set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}) set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
...@@ -214,7 +214,7 @@ if (${ENABLE_ITTI}) ...@@ -214,7 +214,7 @@ if (${ENABLE_ITTI})
${ITTI_DIR}/timer.c ${ITTI_DIR}/timer.c
) )
set(ITTI_LIB ITTI) set(ITTI_LIB ITTI)
set(GTPU_need_ITTI ${OPENAIRCN_DIR}/GTPV1-U/gtpv1u_eNB.c) set(GTPU_need_ITTI ${OPENAIR3_DIR}/GTPV1-U/gtpv1u_eNB.c)
endif (${ENABLE_ITTI}) endif (${ENABLE_ITTI})
add_boolean_option(RTAI False "Use RTAI") add_boolean_option(RTAI False "Use RTAI")
...@@ -278,7 +278,7 @@ add_custom_command ( ...@@ -278,7 +278,7 @@ add_custom_command (
############## ##############
add_list1_option(S1AP_VERSION R10 "S1AP Asn.1 grammar version" R8 R9 R10) add_list1_option(S1AP_VERSION R10 "S1AP Asn.1 grammar version" R8 R9 R10)
set(S1AP_DIR ${OPENAIRCN_DIR}/S1AP) set(S1AP_DIR ${OPENAIR3_DIR}/S1AP)
if (${S1AP_VERSION} STREQUAL "R10") if (${S1AP_VERSION} STREQUAL "R10")
set (ASN1RELDIR R10.5) set (ASN1RELDIR R10.5)
add_definitions("-DUPDATE_RELEASE_9 -DUPDATE_RELEASE_10") add_definitions("-DUPDATE_RELEASE_9 -DUPDATE_RELEASE_10")
...@@ -470,7 +470,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang ...@@ -470,7 +470,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
######################## ########################
# Include order # Include order
########################## ##########################
add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair-cn" ) add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
########################## ##########################
# Emulation options # Emulation options
...@@ -620,11 +620,11 @@ if(ENB_MODE) ...@@ -620,11 +620,11 @@ if(ENB_MODE)
include_directories("${OPENAIR2_DIR}/COMMON") include_directories("${OPENAIR2_DIR}/COMMON")
include_directories("${OPENAIR2_DIR}/UTIL") include_directories("${OPENAIR2_DIR}/UTIL")
include_directories("${OPENAIR2_DIR}/UTIL/LOG") include_directories("${OPENAIR2_DIR}/UTIL/LOG")
include_directories("${OPENAIRCN_DIR}/COMMON") include_directories("${OPENAIR3_DIR}/COMMON")
include_directories("${OPENAIRCN_DIR}/UTILS") include_directories("${OPENAIR3_DIR}/UTILS")
else() else()
include_directories("${OPENAIRCN_DIR}/COMMON") include_directories("${OPENAIR3_DIR}/COMMON")
include_directories("${OPENAIRCN_DIR}/UTILS") include_directories("${OPENAIR3_DIR}/UTILS")
include_directories("${OPENAIR2_DIR}/COMMON") include_directories("${OPENAIR2_DIR}/COMMON")
include_directories("${OPENAIR2_DIR}/UTIL") include_directories("${OPENAIR2_DIR}/UTIL")
include_directories("${OPENAIR2_DIR}/UTIL/LOG") include_directories("${OPENAIR2_DIR}/UTIL/LOG")
...@@ -644,18 +644,18 @@ include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_ENB/INCLUDE") ...@@ -644,18 +644,18 @@ include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_ENB/INCLUDE")
include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_UE/INCLUDE") include_directories("${OPENAIR3_DIR}/RAL-LTE/LTE_RAL_UE/INCLUDE")
include_directories("${OPENAIR_DIR}/common/utils") include_directories("${OPENAIR_DIR}/common/utils")
include_directories("${OPENAIR_DIR}/common/utils/itti") include_directories("${OPENAIR_DIR}/common/utils/itti")
include_directories("${OPENAIRCN_DIR}/NAS/COMMON") include_directories("${OPENAIR3_DIR}/NAS/COMMON")
include_directories("${OPENAIRCN_DIR}/NAS/COMMON/API/NETWORK") include_directories("${OPENAIR3_DIR}/NAS/COMMON/API/NETWORK")
include_directories("${OPENAIRCN_DIR}/NAS/COMMON/EMM/MSG") include_directories("${OPENAIR3_DIR}/NAS/COMMON/EMM/MSG")
include_directories("${OPENAIRCN_DIR}/NAS/COMMON/ESM/MSG") include_directories("${OPENAIR3_DIR}/NAS/COMMON/ESM/MSG")
include_directories("${OPENAIRCN_DIR}/NAS/COMMON/IES") include_directories("${OPENAIR3_DIR}/NAS/COMMON/IES")
include_directories("${OPENAIRCN_DIR}/NAS/COMMON/UTIL") include_directories("${OPENAIR3_DIR}/NAS/COMMON/UTIL")
include_directories("${OPENAIRCN_DIR}/SECU") include_directories("${OPENAIR3_DIR}/SECU")
include_directories("${OPENAIRCN_DIR}/SCTP") include_directories("${OPENAIR3_DIR}/SCTP")
include_directories("${OPENAIRCN_DIR}/S1AP") include_directories("${OPENAIR3_DIR}/S1AP")
include_directories("${OPENAIR2_DIR}/X2AP") include_directories("${OPENAIR2_DIR}/X2AP")
include_directories("${OPENAIRCN_DIR}/UDP") include_directories("${OPENAIR3_DIR}/UDP")
include_directories("${OPENAIRCN_DIR}/GTPV1-U") include_directories("${OPENAIR3_DIR}/GTPV1-U")
include_directories("${OPENAIR_DIR}/targets/COMMON") include_directories("${OPENAIR_DIR}/targets/COMMON")
include_directories("${OPENAIR_DIR}/targets/ARCH/COMMON") include_directories("${OPENAIR_DIR}/targets/ARCH/COMMON")
include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/USERSPACE/LIB/") include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/USERSPACE/LIB/")
...@@ -675,8 +675,8 @@ include_directories("${OPENAIR2_DIR}/UTIL/CLI") ...@@ -675,8 +675,8 @@ include_directories("${OPENAIR2_DIR}/UTIL/CLI")
include_directories("${OPENAIR2_DIR}/UTIL/OPT") include_directories("${OPENAIR2_DIR}/UTIL/OPT")
include_directories("${OPENAIR2_DIR}/UTIL/OMV") include_directories("${OPENAIR2_DIR}/UTIL/OMV")
include_directories("${OPENAIR2_DIR}/RRC/LITE/MESSAGES") include_directories("${OPENAIR2_DIR}/RRC/LITE/MESSAGES")
include_directories("${OPENAIRCN_DIR}/GTPV1-U/nw-gtpv1u/shared") include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/shared")
include_directories("${OPENAIRCN_DIR}/GTPV1-U/nw-gtpv1u/include") include_directories("${OPENAIR3_DIR}/GTPV1-U/nw-gtpv1u/include")
include_directories("${OPENAIR_DIR}") include_directories("${OPENAIR_DIR}")
# Utilities Library # Utilities Library
...@@ -749,14 +749,14 @@ set(SECU_OSA_SRC ...@@ -749,14 +749,14 @@ set(SECU_OSA_SRC
add_library(SECU_OSA ${SECU_OSA_SRC}) add_library(SECU_OSA ${SECU_OSA_SRC})
set(SECU_CN_SRC set(SECU_CN_SRC
${OPENAIRCN_DIR}/SECU/kdf.c ${OPENAIR3_DIR}/SECU/kdf.c
${OPENAIRCN_DIR}/SECU/rijndael.c ${OPENAIR3_DIR}/SECU/rijndael.c
${OPENAIRCN_DIR}/SECU/snow3g.c ${OPENAIR3_DIR}/SECU/snow3g.c
${OPENAIRCN_DIR}/SECU/key_nas_deriver.c ${OPENAIR3_DIR}/SECU/key_nas_deriver.c
${OPENAIRCN_DIR}/SECU/nas_stream_eea1.c ${OPENAIR3_DIR}/SECU/nas_stream_eea1.c
${OPENAIRCN_DIR}/SECU/nas_stream_eia1.c ${OPENAIR3_DIR}/SECU/nas_stream_eia1.c
${OPENAIRCN_DIR}/SECU/nas_stream_eea2.c ${OPENAIR3_DIR}/SECU/nas_stream_eea2.c
${OPENAIRCN_DIR}/SECU/nas_stream_eia2.c ${OPENAIR3_DIR}/SECU/nas_stream_eia2.c
) )
add_library(SECU_CN ${SECU_CN_SRC}) add_library(SECU_CN ${SECU_CN_SRC})
...@@ -988,14 +988,14 @@ endif() ...@@ -988,14 +988,14 @@ endif()
########################## ##########################
add_library(CN_UTILS add_library(CN_UTILS
${OPENAIRCN_DIR}/UTILS/conversions.c ${OPENAIR3_DIR}/UTILS/conversions.c
${OPENAIRCN_DIR}/UTILS/enum_string.c ${OPENAIR3_DIR}/UTILS/enum_string.c
${OPENAIRCN_DIR}/UTILS/log.c ${OPENAIR3_DIR}/UTILS/log.c
${OPENAIRCN_DIR}/UTILS/mme_config.c ${OPENAIR3_DIR}/UTILS/mme_config.c
${OPENAIRCN_DIR}/UTILS/mcc_mnc_itu.c ${OPENAIR3_DIR}/UTILS/mcc_mnc_itu.c
) )
set(GTPV1U_DIR ${OPENAIRCN_DIR}/GTPV1-U) set(GTPV1U_DIR ${OPENAIR3_DIR}/GTPV1-U)
set (GTPV1U_SRC set (GTPV1U_SRC
${RRC_DIR}/rrc_eNB_GTPV1U.c ${RRC_DIR}/rrc_eNB_GTPV1U.c
${GTPV1U_DIR}/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c ${GTPV1U_DIR}/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
...@@ -1007,16 +1007,16 @@ set (GTPV1U_SRC ...@@ -1007,16 +1007,16 @@ set (GTPV1U_SRC
add_library(GTPV1U ${GTPV1U_SRC}) add_library(GTPV1U ${GTPV1U_SRC})
set(SCTP_SRC set(SCTP_SRC
${OPENAIRCN_DIR}/SCTP/sctp_common.c ${OPENAIR3_DIR}/SCTP/sctp_common.c
${OPENAIRCN_DIR}/SCTP/sctp_eNB_task.c ${OPENAIR3_DIR}/SCTP/sctp_eNB_task.c
${OPENAIRCN_DIR}/SCTP/sctp_eNB_itti_messaging.c ${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c
) )
add_library(SCTP_CLIENT ${SCTP_SRC}) add_library(SCTP_CLIENT ${SCTP_SRC})
add_library(UDP ${OPENAIRCN_DIR}/UDP/udp_eNB_task.c) add_library(UDP ${OPENAIR3_DIR}/UDP/udp_eNB_task.c)
set(NAS_SRC ${OPENAIRCN_DIR}/NAS/) set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
set(libnas_api_OBJS set(libnas_api_OBJS
${NAS_SRC}COMMON/API/NETWORK/as_message.c ${NAS_SRC}COMMON/API/NETWORK/as_message.c
${NAS_SRC}COMMON/API/NETWORK/nas_message.c ${NAS_SRC}COMMON/API/NETWORK/nas_message.c
...@@ -1413,7 +1413,7 @@ add_executable(lte-softmodem ...@@ -1413,7 +1413,7 @@ add_executable(lte-softmodem
${OPENAIR_TARGETS}/COMMON/create_tasks.c ${OPENAIR_TARGETS}/COMMON/create_tasks.c
${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
${OPENAIRCN_DIR}/NAS/UE/nas_ue_task.c ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
${GTPU_need_ITTI} ${GTPU_need_ITTI}
${HW_SOURCE} ${HW_SOURCE}
${RTAI_SOURCE} ${RTAI_SOURCE}
...@@ -1496,22 +1496,22 @@ Message("-- HW_SOURCE=${HW_SOURCE}") ...@@ -1496,22 +1496,22 @@ Message("-- HW_SOURCE=${HW_SOURCE}")
# USIM process # USIM process
################# #################
#add_executable(usim #add_executable(usim
# ${OPENAIRCN_DIR}/NAS/TOOLS/usim_data.c # ${OPENAIR3_DIR}/NAS/TOOLS/usim_data.c
# ${OPENAIRCN_DIR}/NAS/USER/API/USIM/usim_api.c # ${OPENAIR3_DIR}/NAS/USER/API/USIM/usim_api.c
# ${OPENAIRCN_DIR}/NAS/USER/API/USIM/aka_functions.c # ${OPENAIR3_DIR}/NAS/USER/API/USIM/aka_functions.c
# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/memory.c # ${OPENAIR3_DIR}/NAS/COMMON/UTIL/memory.c
# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/nas_log.c # ${OPENAIR3_DIR}/NAS/COMMON/UTIL/nas_log.c
# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/OctetString.c # ${OPENAIR3_DIR}/NAS/COMMON/UTIL/OctetString.c
# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/TLVEncoder.c # ${OPENAIR3_DIR}/NAS/COMMON/UTIL/TLVEncoder.c
# ) # )
#target_link_libraries (usim ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m) #target_link_libraries (usim ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
# ??? # ???
##################### #####################
#add_executable(nvram #add_executable(nvram
# ${OPENAIRCN_DIR}/NAS/TOOLS/ue_data.c # ${OPENAIR3_DIR}/NAS/TOOLS/ue_data.c
# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/memory.c # ${OPENAIR3_DIR}/NAS/COMMON/UTIL/memory.c
# ${OPENAIRCN_DIR}/NAS/COMMON/UTIL/nas_log.c # ${OPENAIR3_DIR}/NAS/COMMON/UTIL/nas_log.c
# ) # )
#target_link_libraries (nvram LIB_NAS_UE UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m) #target_link_libraries (nvram LIB_NAS_UE UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
...@@ -1538,7 +1538,7 @@ add_executable(oaisim ...@@ -1538,7 +1538,7 @@ add_executable(oaisim
${OPENAIR2_DIR}/RRC/NAS/nas_config.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
${OPENAIR2_DIR}/RRC/NAS/rb_config.c ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
${OPENAIR2_DIR}/UTIL/OMG/sumo.c ${OPENAIR2_DIR}/UTIL/OMG/sumo.c
${OPENAIRCN_DIR}/NAS/UE/nas_ue_task.c ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
${GTPU_need_ITTI} ${GTPU_need_ITTI}
${OPENAIR_TARGETS}/COMMON/create_tasks.c ${OPENAIR_TARGETS}/COMMON/create_tasks.c
${HW_SOURCE} ${HW_SOURCE}
...@@ -1611,12 +1611,12 @@ foreach(myExe dlsim ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syn ...@@ -1611,12 +1611,12 @@ foreach(myExe dlsim ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syn
endforeach(myExe) endforeach(myExe)
add_executable(test_epc_generate_scenario add_executable(test_epc_generate_scenario
${OPENAIRCN_DIR}/TEST/EPC_TEST/generate_scenario.c ${OPENAIR3_DIR}/TEST/EPC_TEST/generate_scenario.c
${OPENAIR2_DIR}/ENB_APP/enb_config.h ${OPENAIR2_DIR}/ENB_APP/enb_config.h
${OPENAIR2_DIR}/COMMON/commonDef.h ${OPENAIR2_DIR}/COMMON/commonDef.h
${OPENAIR2_DIR}/COMMON/messages_def.h ${OPENAIR2_DIR}/COMMON/messages_def.h
${OPENAIR2_DIR}/COMMON/messages_types.h ${OPENAIR2_DIR}/COMMON/messages_types.h
${OPENAIRCN_DIR}/S1AP/s1ap_eNB_defs.h ${OPENAIR3_DIR}/S1AP/s1ap_eNB_defs.h
${OPENAIR_BIN_DIR}/messages_xml.h ${OPENAIR_BIN_DIR}/messages_xml.h
) )
target_link_libraries (test_epc_generate_scenario target_link_libraries (test_epc_generate_scenario
......
...@@ -47,11 +47,11 @@ endif( NOT DEFINED OPENAIR_DIR) ...@@ -47,11 +47,11 @@ endif( NOT DEFINED OPENAIR_DIR)
set(OPENAIR1_DIR ${OPENAIR_DIR}/openair1) set(OPENAIR1_DIR ${OPENAIR_DIR}/openair1)
set(OPENAIR2_DIR ${OPENAIR_DIR}/openair2) set(OPENAIR2_DIR ${OPENAIR_DIR}/openair2)
set(OPENAIR3_DIR ${OPENAIR_DIR}/openair3) set(OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set(OPENAIRCN_DIR ${OPENAIR_DIR}/openair-cn) set(OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set(OPENAIR_TARGETS ${OPENAIR_DIR}/targets) set(OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
set(OPENAIR_CMAKE_SCRIPTS ${OPENAIR_DIR}/cmake_targets/tools) set(OPENAIR_CMAKE_SCRIPTS ${OPENAIR_DIR}/cmake_targets/tools)
set(OPENAIR_BIN_DIR ${OPENAIR_DIR}/targets/bin) set(OPENAIR_BIN_DIR ${OPENAIR_DIR}/targets/bin)
set(OPENAIR_NAS_DIR ${OPENAIR_DIR}/openair-cn/NAS) set(OPENAIR_NAS_DIR ${OPENAIR_DIR}/openair3/NAS)
set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}") set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")
...@@ -131,20 +131,20 @@ add_boolean_option(NAS_MME False "NAS_UE and NAS_MME are incompa ...@@ -131,20 +131,20 @@ add_boolean_option(NAS_MME False "NAS_UE and NAS_MME are incompa
# SECU LIB # SECU LIB
################################################################################ ################################################################################
set(secu_cn_SRC set(secu_cn_SRC
${OPENAIRCN_DIR}/SECU/kdf.c ${OPENAIR3_DIR}/SECU/kdf.c
${OPENAIRCN_DIR}/SECU/rijndael.c ${OPENAIR3_DIR}/SECU/rijndael.c
${OPENAIRCN_DIR}/SECU/snow3g.c ${OPENAIR3_DIR}/SECU/snow3g.c
${OPENAIRCN_DIR}/SECU/key_nas_deriver.c ${OPENAIR3_DIR}/SECU/key_nas_deriver.c
${OPENAIRCN_DIR}/SECU/nas_stream_eea1.c ${OPENAIR3_DIR}/SECU/nas_stream_eea1.c
${OPENAIRCN_DIR}/SECU/nas_stream_eia1.c ${OPENAIR3_DIR}/SECU/nas_stream_eia1.c
${OPENAIRCN_DIR}/SECU/nas_stream_eea2.c ${OPENAIR3_DIR}/SECU/nas_stream_eea2.c
${OPENAIRCN_DIR}/SECU/nas_stream_eia2.c ${OPENAIR3_DIR}/SECU/nas_stream_eia2.c
) )
add_library(secu_cn ${secu_cn_SRC}) add_library(secu_cn ${secu_cn_SRC})
target_include_directories(secu_cn PRIVATE target_include_directories(secu_cn PRIVATE
${OPENAIR_DIR}/common/utils/itti ${OPENAIR_DIR}/common/utils/itti
${OPENAIR_DIR}/openair2/COMMON ${OPENAIR_DIR}/openair2/COMMON
${OPENAIRCN_DIR}/UTILS ${OPENAIR3_DIR}/UTILS
) )
################################################################################ ################################################################################
...@@ -657,8 +657,8 @@ target_include_directories(ies PRIVATE ...@@ -657,8 +657,8 @@ target_include_directories(ies PRIVATE
################################################################################ ################################################################################
include_directories( include_directories(
${OPENAIR_DIR}/common/utils/msc ${OPENAIR_DIR}/common/utils/msc
${OPENAIRCN_DIR}/COMMON ${OPENAIR3_DIR}/COMMON
${OPENAIRCN_DIR}/SECU ${OPENAIR3_DIR}/SECU
${OPENAIR_NAS_DIR}/src ${OPENAIR_NAS_DIR}/src
${OPENAIR_NAS_DIR}/COMMON ${OPENAIR_NAS_DIR}/COMMON
${OPENAIR_NAS_DIR}/COMMON/API/NETWORK ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK
......
...@@ -12,7 +12,7 @@ set(OPENAIR_DIR $ENV{OPENAIR_DIR}) ...@@ -12,7 +12,7 @@ set(OPENAIR_DIR $ENV{OPENAIR_DIR})
set(OPENAIR1_DIR $ENV{OPENAIR_DIR}/openair1) set(OPENAIR1_DIR $ENV{OPENAIR_DIR}/openair1)
set(OPENAIR2_DIR $ENV{OPENAIR_DIR}/openair2) set(OPENAIR2_DIR $ENV{OPENAIR_DIR}/openair2)
set(OPENAIR3_DIR $ENV{OPENAIR_DIR}/openair3) set(OPENAIR3_DIR $ENV{OPENAIR_DIR}/openair3)
set(OPENAIRCN_DIR $ENV{OPENAIR_DIR}/openair-cn) set(OPENAIR3_DIR $ENV{OPENAIR_DIR}/openair3)
set(OPENAIR_TARGETS $ENV{OPENAIR_DIR}/targets) set(OPENAIR_TARGETS $ENV{OPENAIR_DIR}/targets)
#set(EXECUTABLE_OUTPUT_PATH ${OPENAIR_DIR}/targets/bin) #set(EXECUTABLE_OUTPUT_PATH ${OPENAIR_DIR}/targets/bin)
...@@ -20,30 +20,30 @@ set(OPENAIR_TARGETS $ENV{OPENAIR_DIR}/targets) ...@@ -20,30 +20,30 @@ set(OPENAIR_TARGETS $ENV{OPENAIR_DIR}/targets)
# Add .h files for dependancies # Add .h files for dependancies
set(usim_SRC set(usim_SRC
${OPENAIR_DIR}/openair-cn/NAS/TOOLS/usim_data.c ${OPENAIR_DIR}/openair3/NAS/TOOLS/usim_data.c
${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/usim_api.c ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.c
${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/aka_functions.c ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.c
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.c ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/nas_log.c ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.c
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/OctetString.c ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.c
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/TLVEncoder.c ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.c
) )
set(usim_HDR set(usim_HDR
${OPENAIR_DIR}/openair-cn/NAS/TOOLS/network.h ${OPENAIR_DIR}/openair3/NAS/TOOLS/network.h
${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/usim_api.h ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.h
${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM/aka_functions.h ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.h
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.h ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/nas_log.h ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.h
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/OctetString.h ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.h
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/TLVEncoder.h ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.h
) )
include_directories( include_directories(
${OPENAIR_DIR}/openair-cn/NAS/COMMON ${OPENAIR_DIR}/openair3/NAS/COMMON
${OPENAIR_DIR}/openair-cn/NAS/UE/API/USIM ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM
${OPENAIR_DIR}/openair-cn/NAS/UE/EMM/ ${OPENAIR_DIR}/openair3/NAS/UE/EMM/
${OPENAIR_DIR}/openair-cn/NAS/UE/ESM/ ${OPENAIR_DIR}/openair3/NAS/UE/ESM/
${OPENAIR_DIR}/openair-cn/NAS/COMMON/IES/ ${OPENAIR_DIR}/openair3/NAS/COMMON/IES/
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL
) )
ADD_EXECUTABLE(usim ${usim_SRC} ${usim_HDR}) ADD_EXECUTABLE(usim ${usim_SRC} ${usim_HDR})
...@@ -51,15 +51,15 @@ ADD_EXECUTABLE(usim ${usim_SRC} ${usim_HDR}) ...@@ -51,15 +51,15 @@ ADD_EXECUTABLE(usim ${usim_SRC} ${usim_HDR})
set(nvram_SRC set(nvram_SRC
${OPENAIR_DIR}/openair-cn/NAS/TOOLS/ue_data.c ${OPENAIR_DIR}/openair3/NAS/TOOLS/ue_data.c
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.c ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/nas_log.c ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.c
) )
set(nvram_HDR set(nvram_HDR
${OPENAIR_DIR}/openair-cn/NAS/UE/EMM/emmData.h ${OPENAIR_DIR}/openair3/NAS/UE/EMM/emmData.h
${OPENAIR_DIR}/openair-cn/NAS/COMMON/UTIL/memory.h ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
${OPENAIR_DIR}/openair-cn/NAS/COMMON/userDef.h ${OPENAIR_DIR}/openair3/NAS/COMMON/userDef.h
) )
ADD_EXECUTABLE(nvram ${nvram_SRC} ${nvram_HDR}) ADD_EXECUTABLE(nvram ${nvram_SRC} ${nvram_HDR})
......
...@@ -271,8 +271,8 @@ install_asn1c_from_source(){ ...@@ -271,8 +271,8 @@ install_asn1c_from_source(){
cd /tmp/asn1c-r1516 cd /tmp/asn1c-r1516
rm -rf /tmp/asn1c-r1516/* rm -rf /tmp/asn1c-r1516/*
svn co https://github.com/vlm/asn1c/trunk /tmp/asn1c-r1516 -r 1516 > /tmp/log_compile_asn1c svn co https://github.com/vlm/asn1c/trunk /tmp/asn1c-r1516 -r 1516 > /tmp/log_compile_asn1c
patch -p0 < $OPENAIR_DIR/openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch.p0 >> /tmp/log_compile_asn1c patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch.p0 >> /tmp/log_compile_asn1c
patch -p0 < $OPENAIR_DIR/openair-cn/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 >> /tmp/log_compile_asn1c patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 >> /tmp/log_compile_asn1c
patch -p0 < $OPENAIR_DIR/openair2/RRC/LITE/MESSAGES/asn1c/asn1cpatch.p0 >> /tmp/log_compile_asn1c patch -p0 < $OPENAIR_DIR/openair2/RRC/LITE/MESSAGES/asn1c/asn1cpatch.p0 >> /tmp/log_compile_asn1c
./configure ./configure
make > /tmp/log_compile_asn1c 2>&1 make > /tmp/log_compile_asn1c 2>&1
...@@ -311,13 +311,13 @@ set_openair_env(){ ...@@ -311,13 +311,13 @@ set_openair_env(){
[ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath` [ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath`
openair_path=${fullpath%/cmake_targets/*} openair_path=${fullpath%/cmake_targets/*}
openair_path=${openair_path%/targets/*} openair_path=${openair_path%/targets/*}
openair_path=${openair_path%/openair-cn/*} openair_path=${openair_path%/openair3/*}
openair_path=${openair_path%/openair[123]/*} openair_path=${openair_path%/openair[123]/*}
export OPENAIR_DIR=$openair_path export OPENAIR_DIR=$openair_path
export OPENAIR1_DIR=$openair_path/openair1 export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2 export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3 export OPENAIR3_DIR=$openair_path/openair3
export OPENAIRCN_DIR=$openair_path/openair-cn export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets export OPENAIR_TARGETS=$openair_path/targets
} }
...@@ -50,7 +50,7 @@ set_openair_env ...@@ -50,7 +50,7 @@ set_openair_env
#find $OPENAIR_DIR/openair1 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+ #find $OPENAIR_DIR/openair1 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
#find $OPENAIR_DIR/openair2 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+ #find $OPENAIR_DIR/openair2 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
#find $OPENAIR_DIR/openair3 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+ #find $OPENAIR_DIR/openair3 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
#find $OPENAIR_DIR/openair-cn -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+ #find $OPENAIR_DIR/openair3 -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
#find $OPENAIR_DIR/targets -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+ #find $OPENAIR_DIR/targets -type f \( -name '*.c' -o -name '*.h' \) -exec sed --in-place 's/[[:space:]]\+$//' {} \+
# Style google not available on 14.04 # Style google not available on 14.04
...@@ -65,8 +65,8 @@ set_openair_env ...@@ -65,8 +65,8 @@ set_openair_env
$OPENAIR_DIR/openair2/*.c \ $OPENAIR_DIR/openair2/*.c \
$OPENAIR_DIR/openair3/*.h \ $OPENAIR_DIR/openair3/*.h \
$OPENAIR_DIR/openair3/*.c \ $OPENAIR_DIR/openair3/*.c \
$OPENAIR_DIR/openair-cn/*.h \ $OPENAIR_DIR/openair3/*.h \
$OPENAIR_DIR/openair-cn/*.c \ $OPENAIR_DIR/openair3/*.c \
$OPENAIR_DIR/targets/*.h \ $OPENAIR_DIR/targets/*.h \
$OPENAIR_DIR/targets/*.c $OPENAIR_DIR/targets/*.c
} }
......
...@@ -736,7 +736,7 @@ function main() ...@@ -736,7 +736,7 @@ function main()
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
...@@ -744,7 +744,7 @@ function main() ...@@ -744,7 +744,7 @@ function main()
echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> results/${oai_exp_date} echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> results/${oai_exp_date}
echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> results/${oai_exp_date} echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> results/${oai_exp_date}
echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date} echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
echo "OPENAIRCN_DIR = $OPENAIRCN_DIR" >> results/${oai_exp_date} echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> results/${oai_exp_date} echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> results/${oai_exp_date}
......
...@@ -4,7 +4,6 @@ export OPENAIR_DIR=$(pwd) ...@@ -4,7 +4,6 @@ export OPENAIR_DIR=$(pwd)
export OPENAIR1_DIR=$OPENAIR_HOME/openair1 export OPENAIR1_DIR=$OPENAIR_HOME/openair1
export OPENAIR2_DIR=$OPENAIR_HOME/openair2 export OPENAIR2_DIR=$OPENAIR_HOME/openair2
export OPENAIR3_DIR=$OPENAIR_HOME/openair3 export OPENAIR3_DIR=$OPENAIR_HOME/openair3
export OPENAIRCN_DIR=$OPENAIR_HOME/openair-cn
export OPENAIR_TARGETS=$OPENAIR_HOME/targets export OPENAIR_TARGETS=$OPENAIR_HOME/targets
export OPENAIRITS_DIR=$OPENAIR_HOME/openairITS export OPENAIRITS_DIR=$OPENAIR_HOME/openairITS
...@@ -17,4 +16,3 @@ alias oait='cd $OPENAIR_TARGETS' ...@@ -17,4 +16,3 @@ alias oait='cd $OPENAIR_TARGETS'
alias oailte='cd $OPENAIR_TARGETS/RT/USER' alias oailte='cd $OPENAIR_TARGETS/RT/USER'
alias oais='cd $OPENAIR_TARGETS/SIMU/USER' alias oais='cd $OPENAIR_TARGETS/SIMU/USER'
alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES' alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
alias oaicn='cd OPENAIRCN_DIR'
# This file gathers compilation directive shared between lte-softmodem and oaisim # This file gathers compilation directive shared between lte-softmodem and oaisim
export COMMON_UTILS_DIR = $(OPENAIR_DIR)/common/utils export COMMON_UTILS_DIR = $(OPENAIR_DIR)/common/utils
export UE_NAS_DIR = $(OPENAIR_DIR)/openair-cn/NAS export UE_NAS_DIR = $(OPENAIR_DIR)/openair3/NAS
export S1AP_DIR = $(OPENAIR_DIR)/openair-cn/S1AP export S1AP_DIR = $(OPENAIR_DIR)/openair3/S1AP
export X2AP_DIR = $(OPENAIR_DIR)/openair2/X2AP export X2AP_DIR = $(OPENAIR_DIR)/openair2/X2AP
export SCTP_DIR = $(OPENAIR_DIR)/openair-cn/SCTP export SCTP_DIR = $(OPENAIR_DIR)/openair3/SCTP
export UDP_DIR = $(OPENAIR_DIR)/openair-cn/UDP export UDP_DIR = $(OPENAIR_DIR)/openair3/UDP
export GTPV1U_DIR = $(OPENAIR_DIR)/openair-cn/GTPV1-U export GTPV1U_DIR = $(OPENAIR_DIR)/openair3/GTPV1-U
export SECU_DIR = $(OPENAIR_DIR)/openair-cn/SECU export SECU_DIR = $(OPENAIR_DIR)/openair3/SECU
UE_NAS_OBJ_DIR = $(subst $(OPENAIR_DIR),$(OBJS_DIR),$(UE_NAS_DIR)) UE_NAS_OBJ_DIR = $(subst $(OPENAIR_DIR),$(OBJS_DIR),$(UE_NAS_DIR))
SECU_OBJ_DIR = $(subst $(OPENAIR_DIR),$(OBJS_DIR),$(SECU_DIR)) SECU_OBJ_DIR = $(subst $(OPENAIR_DIR),$(OBJS_DIR),$(SECU_DIR))
...@@ -112,12 +112,12 @@ COMMON_CFLAGS += -DLOG_NO_THREAD ...@@ -112,12 +112,12 @@ COMMON_CFLAGS += -DLOG_NO_THREAD
openair_cn_available := $(shell if [ -d "$(UE_NAS_DIR)" ]; then echo "0" ; else echo "1" ; fi ) openair_cn_available := $(shell if [ -d "$(UE_NAS_DIR)" ]; then echo "0" ; else echo "1" ; fi )
ifeq ($(openair_cn_available), 0) ifeq ($(openair_cn_available), 0)
COMMON_CFLAGS += -DENABLE_NAS_UE_LOGGING COMMON_CFLAGS += -DENABLE_NAS_UE_LOGGING
COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/api/network COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/api/network
COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/include COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/include
COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/ies COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/ies
COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/emm/msg COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/emm/msg
COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/esm/msg COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/esm/msg
COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/NAS/EURECOM-NAS/src/util COMMON_CFLAGS += -I$(OPENAIR_DIR)/openair3/NAS/EURECOM-NAS/src/util
endif endif
UENAS_CFLAGS = $(COMMON_CFLAGS) UENAS_CFLAGS = $(COMMON_CFLAGS)
...@@ -125,8 +125,8 @@ UENAS_CFLAGS += -I$(SECU_DIR) ...@@ -125,8 +125,8 @@ UENAS_CFLAGS += -I$(SECU_DIR)
export UENAS_CFLAGS export UENAS_CFLAGS
SECU_CFLAGS = $(COMMON_CFLAGS) SECU_CFLAGS = $(COMMON_CFLAGS)
SECU_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/COMMON SECU_CFLAGS += -I$(OPENAIR_DIR)/openair3/COMMON
SECU_CFLAGS += -I$(OPENAIR_DIR)/openair-cn/UTILS SECU_CFLAGS += -I$(OPENAIR_DIR)/openair3/UTILS
SECU_CFLAGS += -I$(SECU_DIR) SECU_CFLAGS += -I$(SECU_DIR)
export SECU_CFLAGS export SECU_CFLAGS
...@@ -162,7 +162,7 @@ GTPV1U_CFLAGS += -I$(TOP_DIR) ...@@ -162,7 +162,7 @@ GTPV1U_CFLAGS += -I$(TOP_DIR)
GTPV1U_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/include GTPV1U_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/include
GTPV1U_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/shared GTPV1U_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/shared
GTPV1U_CFLAGS += -I$(OPENAIR_DIR)/openair2/ENB_APP GTPV1U_CFLAGS += -I$(OPENAIR_DIR)/openair2/ENB_APP
GTPV1U_CFLAGS += $(UTIL_incl) -I$(OPENAIRCN_DIR)/UTILS GTPV1U_CFLAGS += $(UTIL_incl) -I$(OPENAIR3_DIR)/UTILS
export GTPV1U_CFLAGS export GTPV1U_CFLAGS
GTPV1U_ENB_CFLAGS = $(COMMON_CFLAGS) GTPV1U_ENB_CFLAGS = $(COMMON_CFLAGS)
...@@ -176,7 +176,7 @@ GTPV1U_ENB_CFLAGS += -I$(TOP_DIR) ...@@ -176,7 +176,7 @@ GTPV1U_ENB_CFLAGS += -I$(TOP_DIR)
GTPV1U_ENB_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/include GTPV1U_ENB_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/include
GTPV1U_ENB_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/shared GTPV1U_ENB_CFLAGS += -I$(GTPV1U_DIR)/nw-gtpv1u/shared
GTPV1U_ENB_CFLAGS += -I$(OPENAIR_DIR)/openair2/ENB_APP GTPV1U_ENB_CFLAGS += -I$(OPENAIR_DIR)/openair2/ENB_APP
GTPV1U_ENB_CFLAGS += $(UTIL_incl) -I$(OPENAIRCN_DIR)/UTILS GTPV1U_ENB_CFLAGS += $(UTIL_incl) -I$(OPENAIR3_DIR)/UTILS
export GTPV1U_ENB_CFLAGS export GTPV1U_ENB_CFLAGS
......
...@@ -178,7 +178,7 @@ set_openair() { ...@@ -178,7 +178,7 @@ set_openair() {
declare -i index declare -i index
length_path=${#path} length_path=${#path}
for i in 'openair1' 'openair2' 'openair3' 'openair-cn' 'targets' for i in 'openair1' 'openair2' 'openair3' 'openair3' 'targets'
do do
index=`echo $path | grep -b -o $i | cut -d: -f1` index=`echo $path | grep -b -o $i | cut -d: -f1`
#echo ${path%$token*} #echo ${path%$token*}
...@@ -193,7 +193,7 @@ set_openair() { ...@@ -193,7 +193,7 @@ set_openair() {
export OPENAIR1_DIR=$openair_path/openair1 export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2 export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3 export OPENAIR3_DIR=$openair_path/openair3
export OPENAIRCN_DIR=$openair_path/openair-cn export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets export OPENAIR_TARGETS=$openair_path/targets
return 0 return 0
fi fi
...@@ -367,7 +367,7 @@ declare -x OPENAIR_DIR="" ...@@ -367,7 +367,7 @@ declare -x OPENAIR_DIR=""
declare -x OPENAIR1_DIR="" declare -x OPENAIR1_DIR=""
declare -x OPENAIR2_DIR="" declare -x OPENAIR2_DIR=""
declare -x OPENAIR3_DIR="" declare -x OPENAIR3_DIR=""
declare -x OPENAIRCN_DIR="" declare -x OPENAIR3_DIR=""
declare -x OPENAIR_TARGETS="" declare -x OPENAIR_TARGETS=""
########################################################### ###########################################################
...@@ -377,5 +377,5 @@ cecho "OPENAIR_DIR = $OPENAIR_DIR" $green ...@@ -377,5 +377,5 @@ cecho "OPENAIR_DIR = $OPENAIR_DIR" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
...@@ -191,7 +191,7 @@ P-GW = ...@@ -191,7 +191,7 @@ P-GW =
"2014:02:26::0/120" "2014:02:26::0/120"
); );
}; };
#WARNING DNS ARE HARDCODED IN openair-cn/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305 #WARNING DNS ARE HARDCODED IN openair3/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
DEFAULT_DNS_IPV4_ADDRESS = "192.168.12.100"; DEFAULT_DNS_IPV4_ADDRESS = "192.168.12.100";
DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.106.12"; DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.106.12";
}; };
......
...@@ -165,7 +165,7 @@ P-GW = ...@@ -165,7 +165,7 @@ P-GW =
); );
}; };
#WARNING DNS ARE HARDCODED IN openair-cn/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305 #WARNING DNS ARE HARDCODED IN openair3/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
DEFAULT_DNS_IPV4_ADDRESS = "192.168.12.100"; DEFAULT_DNS_IPV4_ADDRESS = "192.168.12.100";
DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.106.106"; DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.106.106";
}; };
......
...@@ -125,13 +125,13 @@ fi ...@@ -125,13 +125,13 @@ fi
####################################################### #######################################################
export NVRAM_DIR=$THIS_SCRIPT_PATH export NVRAM_DIR=$THIS_SCRIPT_PATH
if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data ] || [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ] || [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
if [ ! -f /tmp/nas_cleaned ]; then if [ ! -f /tmp/nas_cleaned ]; then
echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean" echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean"
make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
fi fi
echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS -f Makefile PROCESS=UE all" echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS -f Makefile PROCESS=UE all"
make -f Makefile --debug=b --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE all make -f Makefile --debug=b --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE all
rm .ue.nvram rm .ue.nvram
rm .usim.nvram rm .usim.nvram
touch /tmp/nas_cleaned touch /tmp/nas_cleaned
...@@ -139,15 +139,15 @@ fi ...@@ -139,15 +139,15 @@ fi
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram ]; then
echo_success "generate .ue_emm.nvram .ue.nvram" echo_success "generate .ue_emm.nvram .ue.nvram"
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram ]; then
echo_success "generate .usim.nvram" echo_success "generate .usim.nvram"
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
################################################## ##################################################
# LAUNCH eNB + UE executable # LAUNCH eNB + UE executable
...@@ -226,7 +226,7 @@ cd $THIS_SCRIPT_PATH ...@@ -226,7 +226,7 @@ cd $THIS_SCRIPT_PATH
#nohup tshark -i $ENB_INTERFACE_NAME_FOR_S1_MME -i $ENB_INTERFACE_NAME_FOR_S1U -w OUTPUT/$HOSTNAME/tshark_enb_ue.$HOSTNAME.pcap & #nohup tshark -i $ENB_INTERFACE_NAME_FOR_S1_MME -i $ENB_INTERFACE_NAME_FOR_S1U -w OUTPUT/$HOSTNAME/tshark_enb_ue.$HOSTNAME.pcap &
# To start NAS connectivity: AT+CFUN=1 # To start NAS connectivity: AT+CFUN=1
# nohup xterm -hold -e $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess & # nohup xterm -hold -e $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/UserProcess &
export MALLOC_TRACE=/tmp/malloc_trace.txt export MALLOC_TRACE=/tmp/malloc_trace.txt
touch /tmp/malloc_trace.txt touch /tmp/malloc_trace.txt
......
...@@ -72,27 +72,27 @@ EMULATION_DEV_ADDRESS=`ifconfig $EMULATION_DEV_INTERFACE | grep 'inet addr:'| gr ...@@ -72,27 +72,27 @@ EMULATION_DEV_ADDRESS=`ifconfig $EMULATION_DEV_INTERFACE | grep 'inet addr:'| gr
####################################################### #######################################################
export NVRAM_DIR=$THIS_SCRIPT_PATH export NVRAM_DIR=$THIS_SCRIPT_PATH
if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then
make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
rm .ue.nvram rm .ue.nvram
fi fi
if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
rm .usim.nvram rm .usim.nvram
fi fi
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram ]; then
# generate .ue_emm.nvram .ue.nvram # generate .ue_emm.nvram .ue.nvram
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram ]; then
# generate .usim.nvram # generate .usim.nvram
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
################################################## ##################################################
# LAUNCH UE executable # LAUNCH UE executable
...@@ -145,7 +145,7 @@ if [ x$hard_real_time != "xyes" ]; then ...@@ -145,7 +145,7 @@ if [ x$hard_real_time != "xyes" ]; then
cd $THIS_SCRIPT_PATH cd $THIS_SCRIPT_PATH
nohup xterm -e $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess & nohup xterm -e $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/UserProcess &
cp $OPENAIR_TARGETS/SIMU/USER/oaisim $OPENAIR_TARGETS/SIMU/USER/oaisim_ue cp $OPENAIR_TARGETS/SIMU/USER/oaisim $OPENAIR_TARGETS/SIMU/USER/oaisim_ue
gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim_ue -a -l9 -u1 -b0 -M1 -p2 -g$EMULATION_MULTICAST_GROUP -D $EMULATION_DEV_ADDRESS -K $ITTI_LOG_FILE 2>&1 | tee $STDOUT_LOG_FILE gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim_ue -a -l9 -u1 -b0 -M1 -p2 -g$EMULATION_MULTICAST_GROUP -D $EMULATION_DEV_ADDRESS -K $ITTI_LOG_FILE 2>&1 | tee $STDOUT_LOG_FILE
......
...@@ -186,7 +186,7 @@ set_openair() { ...@@ -186,7 +186,7 @@ set_openair() {
export OPENAIR1_DIR=$openair_path/openair1 export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2 export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3 export OPENAIR3_DIR=$openair_path/openair3
export OPENAIRCN_DIR=$openair_path/openair-cn export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets export OPENAIR_TARGETS=$openair_path/targets
export CDPATH=$CDPATH:$openair_path export CDPATH=$CDPATH:$openair_path
} }
...@@ -302,7 +302,7 @@ start_openswitch_daemon() { ...@@ -302,7 +302,7 @@ start_openswitch_daemon() {
bash_exec "insmod /lib/modules/`uname -r`/extra/openvswitch.ko" > /dev/null 2>&1 bash_exec "insmod /lib/modules/`uname -r`/extra/openvswitch.ko" > /dev/null 2>&1
else else
echo_error "/lib/modules/`uname -r`/extra/openvswitch.ko not found" echo_error "/lib/modules/`uname -r`/extra/openvswitch.ko not found"
bash $OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash bash $OPENAIR3_DIR/SCRIPTS/install_openvswitch1.9.0.bash
fi fi
is_process_started "ovsdb-server" is_process_started "ovsdb-server"
if [ $? -ne 0 ] if [ $? -ne 0 ]
...@@ -349,26 +349,26 @@ check_epc_s6a_certificate() { ...@@ -349,26 +349,26 @@ check_epc_s6a_certificate() {
fi fi
echo_error "MME S6A: Did not find valid certificate in /usr/local/etc/freeDiameter" echo_error "MME S6A: Did not find valid certificate in /usr/local/etc/freeDiameter"
echo_warning "MME S6A: generatting new certificate in /usr/local/etc/freeDiameter..." echo_warning "MME S6A: generatting new certificate in /usr/local/etc/freeDiameter..."
cd $OPENAIRCN_DIR/S6A/freediameter cd $OPENAIR3_DIR/S6A/freediameter
./make_certs.sh ${1:-'eur'} ./make_certs.sh ${1:-'eur'}
check_epc_s6a_certificate ${1:-'eur'} check_epc_s6a_certificate ${1:-'eur'}
return 1 return 1
} }
check_hss_s6a_certificate() { check_hss_s6a_certificate() {
if [ -f $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.cert.pem ] if [ -f $OPENAIR3_DIR/OPENAIRHSS/conf/hss.cert.pem ]
then then
full_hostname=`cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.cert.pem | grep "Subject" | grep "CN" | cut -d '=' -f6` full_hostname=`cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.cert.pem | grep "Subject" | grep "CN" | cut -d '=' -f6`
# we should replace 'hss' with hostname # we should replace 'hss' with hostname
if [ a$full_hostname == ahss.${1:-'eur'} ] if [ a$full_hostname == ahss.${1:-'eur'} ]
then then
echo_success "HSS S6A: Found valid certificate in $OPENAIRCN_DIR/OPENAIRHSS/conf/" echo_success "HSS S6A: Found valid certificate in $OPENAIR3_DIR/OPENAIRHSS/conf/"
return 1 return 1
fi fi
fi fi
echo_error "HSS S6A: Did not find valid certificate in $OPENAIRCN_DIR/OPENAIRHSS/conf" echo_error "HSS S6A: Did not find valid certificate in $OPENAIR3_DIR/OPENAIRHSS/conf"
echo_warning "HSS S6A: generatting new certificate in $OPENAIRCN_DIR/OPENAIRHSS/conf..." echo_warning "HSS S6A: generatting new certificate in $OPENAIR3_DIR/OPENAIRHSS/conf..."
cd $OPENAIRCN_DIR/OPENAIRHSS/conf cd $OPENAIR3_DIR/OPENAIRHSS/conf
./make_certs.sh ${1:-'eur'} ./make_certs.sh ${1:-'eur'}
check_hss_s6a_certificate ${1:-'eur'} check_hss_s6a_certificate ${1:-'eur'}
return 1 return 1
...@@ -406,7 +406,7 @@ create_hss_database(){ ...@@ -406,7 +406,7 @@ create_hss_database(){
echo_success "oai_db creation succeeded" echo_success "oai_db creation succeeded"
fi fi
$MYSQL -u $1 --password=$2 oai_db < $OPENAIRCN_DIR/OPENAIRHSS/db/oai_db.sql $MYSQL -u $1 --password=$2 oai_db < $OPENAIR3_DIR/OPENAIRHSS/db/oai_db.sql
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo_error "oai_db tables creation failed" echo_error "oai_db tables creation failed"
else else
...@@ -539,13 +539,13 @@ check_install_epc_software() { ...@@ -539,13 +539,13 @@ check_install_epc_software() {
if [ ! -d /usr/local/etc/freeDiameter ] if [ ! -d /usr/local/etc/freeDiameter ]
then then
# This script make certificates also # This script make certificates also
cd $OPENAIRCN_DIR/S6A/freediameter && ./install_freediameter.sh cd $OPENAIR3_DIR/S6A/freediameter && ./install_freediameter.sh
else else
echo_success "freediameter is installed" echo_success "freediameter is installed"
check_epc_s6a_certificate check_epc_s6a_certificate
fi fi
test_command_install_script "asn1c" "$OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash" test_command_install_script "asn1c" "$OPENAIR3_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash"
# One mor check about version of asn1c # One mor check about version of asn1c
ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE="ASN.1 Compiler, v0.9.24" ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE="ASN.1 Compiler, v0.9.24"
...@@ -558,7 +558,7 @@ check_install_epc_software() { ...@@ -558,7 +558,7 @@ check_install_epc_software() {
echo_error "$ASN1C_COMPILER_VERSION_MESSAGE" echo_error "$ASN1C_COMPILER_VERSION_MESSAGE"
while read -r -n 1 -s answer; do while read -r -n 1 -s answer; do
if [[ $answer = [YyNn] ]]; then if [[ $answer = [YyNn] ]]; then
[[ $answer = [Yy] ]] && $OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash [[ $answer = [Yy] ]] && $OPENAIR3_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash
[[ $answer = [Nn] ]] && echo_error "Version of asn1c is not the required one, exiting." && exit 1 [[ $answer = [Nn] ]] && echo_error "Version of asn1c is not the required one, exiting." && exit 1
break break
fi fi
...@@ -577,7 +577,7 @@ function cgrp() ...@@ -577,7 +577,7 @@ function cgrp()
find $OPENAIR2_DIR -name *.c -exec grep --color=auto -Hni $1 {} \; find $OPENAIR2_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR1_DIR -name *.c -exec grep --color=auto -Hni $1 {} \; find $OPENAIR1_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR3_DIR -name *.c -exec grep --color=auto -Hni $1 {} \; find $OPENAIR3_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
find $OPENAIRCN_DIR -name *.c -exec grep --color=auto -Hni $1 {} \; find $OPENAIR3_DIR -name *.c -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR_TARGETS -name *.c -exec grep --color=auto -Hni $1 {} \; find $OPENAIR_TARGETS -name *.c -exec grep --color=auto -Hni $1 {} \;
} }
...@@ -591,7 +591,7 @@ function hgrp() ...@@ -591,7 +591,7 @@ function hgrp()
find $OPENAIR2_DIR -name *.h -exec grep --color=auto -Hni $1 {} \; find $OPENAIR2_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR1_DIR -name *.h -exec grep --color=auto -Hni $1 {} \; find $OPENAIR1_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR3_DIR -name *.h -exec grep --color=auto -Hni $1 {} \; find $OPENAIR3_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
find $OPENAIRCN_DIR -name *.h -exec grep --color=auto -Hni $1 {} \; find $OPENAIR3_DIR -name *.h -exec grep --color=auto -Hni $1 {} \;
find $OPENAIR_TARGETS -name *.h -exec grep --color=auto -Hni $1 {} \; find $OPENAIR_TARGETS -name *.h -exec grep --color=auto -Hni $1 {} \;
} }
...@@ -606,7 +606,7 @@ function svn_find_str_in_file_history() ...@@ -606,7 +606,7 @@ function svn_find_str_in_file_history()
} }
compile_hss() { compile_hss() {
cd $OPENAIRCN_DIR/OPENAIRHSS cd $OPENAIR3_DIR/OPENAIRHSS
OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*` OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*`
if [ ! -n "$OBJ_DIR" ] if [ ! -n "$OBJ_DIR" ]
then then
...@@ -646,7 +646,7 @@ compile_hss() { ...@@ -646,7 +646,7 @@ compile_hss() {
compile_epc() { compile_epc() {
cd $OPENAIRCN_DIR cd $OPENAIR3_DIR
OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*` OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*`
if [ ! -n "$OBJ_DIR" ] if [ ! -n "$OBJ_DIR" ]
then then
...@@ -695,7 +695,7 @@ declare -x OPENAIR_DIR="" ...@@ -695,7 +695,7 @@ declare -x OPENAIR_DIR=""
declare -x OPENAIR1_DIR="" declare -x OPENAIR1_DIR=""
declare -x OPENAIR2_DIR="" declare -x OPENAIR2_DIR=""
declare -x OPENAIR3_DIR="" declare -x OPENAIR3_DIR=""
declare -x OPENAIRCN_DIR="" declare -x OPENAIR3_DIR=""
declare -x OPENAIR_TARGETS="" declare -x OPENAIR_TARGETS=""
########################################################### ###########################################################
...@@ -705,7 +705,7 @@ cecho "OPENAIR_DIR = $OPENAIR_DIR" $green ...@@ -705,7 +705,7 @@ cecho "OPENAIR_DIR = $OPENAIR_DIR" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
export UTILS_ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/') export UTILS_ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
$1 rm -Rf /usr/local/src/asn1c-r1516 $1 rm -Rf /usr/local/src/asn1c-r1516
$1 svn co https://github.com/vlm/asn1c/trunk /usr/local/src/asn1c-r1516 -r 1516 > /tmp/install_log.txt $1 svn co https://github.com/vlm/asn1c/trunk /usr/local/src/asn1c-r1516 -r 1516 > /tmp/install_log.txt
cd /usr/local/src/asn1c-r1516 cd /usr/local/src/asn1c-r1516
$1 patch -p0 < $OPENAIRCN_DIR/S1AP/MESSAGES/ASN1/asn1cpatch.p0 > /tmp/install_log.txt $1 patch -p0 < $OPENAIR3_DIR/S1AP/MESSAGES/ASN1/asn1cpatch.p0 > /tmp/install_log.txt
$1 ./configure > /tmp/install_log.txt $1 ./configure > /tmp/install_log.txt
$1 make > /tmp/install_log.txt $1 make > /tmp/install_log.txt
$1 make install > /tmp/install_log.txt $1 make install > /tmp/install_log.txt
\ No newline at end of file
...@@ -288,7 +288,7 @@ check_install_freediamter(){ ...@@ -288,7 +288,7 @@ check_install_freediamter(){
$SUDO tar -xzf 1.1.5.tar.gz $SUDO tar -xzf 1.1.5.tar.gz
echo "Uncompressing freeDiameter archive" echo "Uncompressing freeDiameter archive"
cd freeDiameter-1.1.5 cd freeDiameter-1.1.5
$SUDO patch -p1 < $OPENAIRCN_DIR/S6A/freediameter/freediameter-1.1.5.patch $SUDO patch -p1 < $OPENAIR3_DIR/S6A/freediameter/freediameter-1.1.5.patch
$SUDO mkdir build $SUDO mkdir build
cd build cd build
$SUDO cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ../ $SUDO cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ../
...@@ -327,7 +327,7 @@ check_epc_s6a_certificate() { ...@@ -327,7 +327,7 @@ check_epc_s6a_certificate() {
fi fi
echo_error "EPC S6A: Did not find valid certificate in /usr/local/etc/freeDiameter" echo_error "EPC S6A: Did not find valid certificate in /usr/local/etc/freeDiameter"
echo_warning "EPC S6A: generatting new certificate in /usr/local/etc/freeDiameter..." echo_warning "EPC S6A: generatting new certificate in /usr/local/etc/freeDiameter..."
cd $OPENAIRCN_DIR/S6A/freediameter cd $OPENAIR3_DIR/S6A/freediameter
./make_certs.sh ${1:-'eur'} ./make_certs.sh ${1:-'eur'}
if [ $# -lt 2 ] ; then if [ $# -lt 2 ] ; then
check_epc_s6a_certificate ${1:-'eur'} 2 check_epc_s6a_certificate ${1:-'eur'} 2
...@@ -353,7 +353,7 @@ check_hss_s6a_certificate() { ...@@ -353,7 +353,7 @@ check_hss_s6a_certificate() {
fi fi
echo_error "S6A: Did not find valid certificate in /usr/local/etc/freeDiameter" echo_error "S6A: Did not find valid certificate in /usr/local/etc/freeDiameter"
echo_warning "S6A: generatting new certificate in /usr/local/etc/freeDiameter..." echo_warning "S6A: generatting new certificate in /usr/local/etc/freeDiameter..."
cd $OPENAIRCN_DIR/OPENAIRHSS/conf cd $OPENAIR3_DIR/OPENAIRHSS/conf
./make_certs.sh ${1:-'eur'} ./make_certs.sh ${1:-'eur'}
if [ $# -lt 2 ] ; then if [ $# -lt 2 ] ; then
check_hss_s6a_certificate ${1:-'eur'} 2 check_hss_s6a_certificate ${1:-'eur'} 2
...@@ -638,7 +638,7 @@ check_install_asn1c(){ ...@@ -638,7 +638,7 @@ check_install_asn1c(){
# 2. compile # 2. compile
################################################ ################################################
compile_hss() { compile_hss() {
cd $OPENAIRCN_DIR/OPENAIRHSS cd $OPENAIR3_DIR/OPENAIRHSS
if [ "$1" -eq 1 ]; then if [ "$1" -eq 1 ]; then
echo_info "build a clean HSS" echo_info "build a clean HSS"
...@@ -693,7 +693,7 @@ compile_hss() { ...@@ -693,7 +693,7 @@ compile_hss() {
compile_epc() { compile_epc() {
cd $OPENAIRCN_DIR cd $OPENAIR3_DIR
if [ $1 = 1 ]; then if [ $1 = 1 ]; then
echo_info "build a clean EPC" echo_info "build a clean EPC"
bash_exec "rm -rf objs" bash_exec "rm -rf objs"
...@@ -742,7 +742,7 @@ compile_epc() { ...@@ -742,7 +742,7 @@ compile_epc() {
return 1 return 1
fi fi
cd $OPENAIRCN_DIR/GTPV1-U/GTPUAH; cd $OPENAIR3_DIR/GTPV1-U/GTPUAH;
make make
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo_error "Build GTPUAH module failed, exiting" echo_error "Build GTPUAH module failed, exiting"
...@@ -752,7 +752,7 @@ compile_epc() { ...@@ -752,7 +752,7 @@ compile_epc() {
$SUDO cp -pfv ./Bin/*.ko $OPENAIR_TARGETS/bin $SUDO cp -pfv ./Bin/*.ko $OPENAIR_TARGETS/bin
fi fi
cd $OPENAIRCN_DIR/GTPV1-U/GTPURH; cd $OPENAIR3_DIR/GTPV1-U/GTPURH;
make make
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo_error "Build GTPURH module failed, exiting" echo_error "Build GTPURH module failed, exiting"
...@@ -854,11 +854,11 @@ compile_nas_tools() { ...@@ -854,11 +854,11 @@ compile_nas_tools() {
cd $NVRAM_DIR cd $NVRAM_DIR
if [ ! -f /tmp/nas_cleaned ]; then if [ ! -f /tmp/nas_cleaned ]; then
echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools veryveryclean" echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools veryveryclean"
make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools veryveryclean make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools veryveryclean
fi fi
echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools all" echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all"
make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools all make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all
rm .ue.nvram rm .ue.nvram
rm .usim.nvram rm .usim.nvram
touch /tmp/nas_cleaned touch /tmp/nas_cleaned
...@@ -882,21 +882,21 @@ check_for_ltesoftmodem_executable() { ...@@ -882,21 +882,21 @@ check_for_ltesoftmodem_executable() {
} }
check_for_epc_executable() { check_for_epc_executable() {
if [ ! -f $OPENAIRCN_DIR/objs/OAI_EPC/oai_epc ]; then if [ ! -f $OPENAIR3_DIR/objs/OAI_EPC/oai_epc ]; then
echo_error "Cannot find oai_epc executable object in directory $OPENAIRCN_DIR/objs/OAI_EPC/" echo_error "Cannot find oai_epc executable object in directory $OPENAIR3_DIR/objs/OAI_EPC/"
echo_fatal "Please make sure you have compiled OAI EPC with --enable-standalone-epc option" echo_fatal "Please make sure you have compiled OAI EPC with --enable-standalone-epc option"
fi fi
} }
check_for_hss_executable() { check_for_hss_executable() {
if [ ! -f $OPENAIRCN_DIR/OPENAIRHSS/objs/openair-hss ]; then if [ ! -f $OPENAIR3_DIR/OPENAIRHSS/objs/openair-hss ]; then
echo_error "Cannot find openair-hss executable object in directory $OPENAIRCN_DIR/OPENAIRHSS/objs/" echo_error "Cannot find openair-hss executable object in directory $OPENAIR3_DIR/OPENAIRHSS/objs/"
echo_fatal "Please make sure you have compiled OAI HSS" echo_fatal "Please make sure you have compiled OAI HSS"
fi fi
} }
check_for_sgw_executable() { check_for_sgw_executable() {
if [ ! -f $OPENAIRCN_DIR/objs/OAI_SGW/oai_sgw ]; then if [ ! -f $OPENAIR3_DIR/objs/OAI_SGW/oai_sgw ]; then
echo_error "Cannot find oai_sgw executable object in directory $OPENAIR3_DIR/OPENAIRMME/objs/OAI_SGW/" echo_error "Cannot find oai_sgw executable object in directory $OPENAIR3_DIR/OPENAIRMME/objs/OAI_SGW/"
echo_fatal "Please make sure you have compiled OAI EPC without --enable-standalone-epc option" echo_fatal "Please make sure you have compiled OAI EPC without --enable-standalone-epc option"
fi fi
...@@ -959,8 +959,8 @@ check_for_mbmssim_executable() { ...@@ -959,8 +959,8 @@ check_for_mbmssim_executable() {
} }
check_for_nas_ue_executable() { check_for_nas_ue_executable() {
if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess ]; then if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/UserProcess ]; then
echo_error "Cannot find UserProcess executable object in directory $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin" echo_error "Cannot find UserProcess executable object in directory $OPENAIR3_DIR/NAS/EURECOM-NAS/bin"
echo_fatal "Check the compilation logs in bin/install_log.txt" echo_fatal "Check the compilation logs in bin/install_log.txt"
fi fi
} }
...@@ -1036,15 +1036,15 @@ install_nas_tools() { ...@@ -1036,15 +1036,15 @@ install_nas_tools() {
cd $OPENAIR_TARGETS/bin cd $OPENAIR_TARGETS/bin
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram ]; then
echo_success "generate .ue_emm.nvram .ue.nvram" echo_success "generate .ue_emm.nvram .ue.nvram"
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram ]; then
echo_success "generate .usim.nvram" echo_success "generate .usim.nvram"
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
} }
install_nasmesh(){ install_nasmesh(){
...@@ -1106,7 +1106,7 @@ create_hss_database(){ ...@@ -1106,7 +1106,7 @@ create_hss_database(){
mysql -u $3 --password=$4 -e "desc $5.users" > /dev/null 2>&1 mysql -u $3 --password=$4 -e "desc $5.users" > /dev/null 2>&1
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
$MYSQL -u $3 --password=$4 $5 < $OPENAIRCN_DIR/OPENAIRHSS/db/oai_db.sql $MYSQL -u $3 --password=$4 $5 < $OPENAIR3_DIR/OPENAIRHSS/db/oai_db.sql
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo_error "$5 tables creation failed" echo_error "$5 tables creation failed"
return 1 return 1
...@@ -1126,7 +1126,7 @@ set_openair_env(){ ...@@ -1126,7 +1126,7 @@ set_openair_env(){
fullpath=`readlink -f $BASH_SOURCE` fullpath=`readlink -f $BASH_SOURCE`
[ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath` [ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath`
openair_path=${fullpath%/targets/*} openair_path=${fullpath%/targets/*}
openair_path=${openair_path%/openair-cn/*} openair_path=${openair_path%/openair3/*}
openair_path=${openair_path%/openair[123]/*} openair_path=${openair_path%/openair[123]/*}
export OPENAIR_DIR=$openair_path export OPENAIR_DIR=$openair_path
...@@ -1134,7 +1134,7 @@ set_openair_env(){ ...@@ -1134,7 +1134,7 @@ set_openair_env(){
export OPENAIR1_DIR=$openair_path/openair1 export OPENAIR1_DIR=$openair_path/openair1
export OPENAIR2_DIR=$openair_path/openair2 export OPENAIR2_DIR=$openair_path/openair2
export OPENAIR3_DIR=$openair_path/openair3 export OPENAIR3_DIR=$openair_path/openair3
export OPENAIRCN_DIR=$openair_path/openair-cn export OPENAIR3_DIR=$openair_path/openair3
export OPENAIR_TARGETS=$openair_path/targets export OPENAIR_TARGETS=$openair_path/targets
} }
......
...@@ -301,7 +301,7 @@ cecho "OPENAIR_HOME = $OPENAIR_HOME" $green ...@@ -301,7 +301,7 @@ cecho "OPENAIR_HOME = $OPENAIR_HOME" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
...@@ -309,7 +309,7 @@ echo "OPENAIR_HOME = $OPENAIR_HOME" >> bin/${oai_build_date} ...@@ -309,7 +309,7 @@ echo "OPENAIR_HOME = $OPENAIR_HOME" >> bin/${oai_build_date}
echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> bin/${oai_build_date} echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> bin/${oai_build_date}
echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> bin/${oai_build_date} echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> bin/${oai_build_date}
echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> bin/${oai_build_date} echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> bin/${oai_build_date}
echo "OPENAIRCN_DIR = $OPENAIRCN_DIR" >> bin/${oai_build_date} echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> bin/${oai_build_date}
echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> bin/${oai_build_date} echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> bin/${oai_build_date}
...@@ -607,7 +607,7 @@ build_epc(){ ...@@ -607,7 +607,7 @@ build_epc(){
echo_success "target epc built and installed in the bin directory" echo_success "target epc built and installed in the bin directory"
echo "target epc built and installed in the bin directory" >> bin/${oai_build_date} echo "target epc built and installed in the bin directory" >> bin/${oai_build_date}
cp -f $CONFIG_FILE $OPENAIR_TARGETS/bin cp -f $CONFIG_FILE $OPENAIR_TARGETS/bin
cp -f $OPENAIRCN_DIR/objs/UTILS/CONF/s6a.conf $OPENAIR_TARGETS/bin/epc_s6a.conf cp -f $OPENAIR3_DIR/objs/UTILS/CONF/s6a.conf $OPENAIR_TARGETS/bin/epc_s6a.conf
fi fi
} }
...@@ -648,10 +648,10 @@ build_hss(){ ...@@ -648,10 +648,10 @@ build_hss(){
###################################### ######################################
TEMP_FILE=`tempfile` TEMP_FILE=`tempfile`
cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss_fd.conf | grep -w "Identity" | tr -d " " | tr -d ";" > $TEMP_FILE cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss_fd.conf | grep -w "Identity" | tr -d " " | tr -d ";" > $TEMP_FILE
cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_user" | tr -d " " | tr -d ";" >> $TEMP_FILE cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_user" | tr -d " " | tr -d ";" >> $TEMP_FILE
cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_pass" | tr -d " " | tr -d ";" >> $TEMP_FILE cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_pass" | tr -d " " | tr -d ";" >> $TEMP_FILE
cat $OPENAIRCN_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_db" | tr -d " " | tr -d ";" >> $TEMP_FILE cat $OPENAIR3_DIR/OPENAIRHSS/conf/hss.conf | grep -w "MYSQL_db" | tr -d " " | tr -d ";" >> $TEMP_FILE
source $TEMP_FILE source $TEMP_FILE
rm -f $TEMP_FILE rm -f $TEMP_FILE
...@@ -664,7 +664,7 @@ build_hss(){ ...@@ -664,7 +664,7 @@ build_hss(){
NEW_HOSTNAME=`hostname -s` NEW_HOSTNAME=`hostname -s`
if [ "x$HSS_HOSTNAME" != "x$NEW_HOSTNAME" ]; then if [ "x$HSS_HOSTNAME" != "x$NEW_HOSTNAME" ]; then
echo_warning "Changing identity of HSS from <$HSS_HOSTNAME.$HSS_REALM> to <$NEW_HOSTNAME.$HSS_REALM>" echo_warning "Changing identity of HSS from <$HSS_HOSTNAME.$HSS_REALM> to <$NEW_HOSTNAME.$HSS_REALM>"
sed -ibak "s/$HSS_HOSTNAME/$NEW_HOSTNAME/" $OPENAIRCN_DIR/OPENAIRHSS/conf/hss_fd.conf sed -ibak "s/$HSS_HOSTNAME/$NEW_HOSTNAME/" $OPENAIR3_DIR/OPENAIRHSS/conf/hss_fd.conf
fi fi
check_hss_s6a_certificate $HSS_REALM check_hss_s6a_certificate $HSS_REALM
...@@ -765,15 +765,15 @@ if [ $RUN -ne 0 ]; then ...@@ -765,15 +765,15 @@ if [ $RUN -ne 0 ]; then
# prepare NAS for UE # prepare NAS for UE
if [ ! -f .ue.nvram ]; then if [ ! -f .ue.nvram ]; then
echo_success "generate .ue_emm.nvram .ue.nvram" echo_success "generate .ue_emm.nvram .ue.nvram"
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi fi
if [ ! -f .usim.nvram ]; then if [ ! -f .usim.nvram ]; then
echo_success "generate .usim.nvram" echo_success "generate .usim.nvram"
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi fi
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --print
insmod $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/ue_ip.ko insmod $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/ue_ip.ko
...@@ -813,7 +813,7 @@ if [ $RUN -ne 0 ]; then ...@@ -813,7 +813,7 @@ if [ $RUN -ne 0 ]; then
'HSS') 'HSS')
echo "############# running HSS #############" echo "############# running HSS #############"
cd $OPENAIRCN_DIR/OPENAIRHSS/objs cd $OPENAIR3_DIR/OPENAIRHSS/objs
if [ $RUN_GDB -eq 0 ]; then if [ $RUN_GDB -eq 0 ]; then
$SUDO exec ./openair-hss -c ./conf/hss.conf $SUDO exec ./openair-hss -c ./conf/hss.conf
else else
......
...@@ -167,7 +167,7 @@ cecho "OPENAIR_HOME = $OPENAIR_HOME" $green ...@@ -167,7 +167,7 @@ cecho "OPENAIR_HOME = $OPENAIR_HOME" $green
cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green
cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green
cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
...@@ -175,7 +175,7 @@ echo "OPENAIR_HOME = $OPENAIR_HOME" >> results/${oai_exp_date} ...@@ -175,7 +175,7 @@ echo "OPENAIR_HOME = $OPENAIR_HOME" >> results/${oai_exp_date}
echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> results/${oai_exp_date} echo "OPENAIR1_DIR = $OPENAIR1_DIR" >> results/${oai_exp_date}
echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> results/${oai_exp_date} echo "OPENAIR2_DIR = $OPENAIR2_DIR" >> results/${oai_exp_date}
echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date} echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
echo "OPENAIRCN_DIR = $OPENAIRCN_DIR" >> results/${oai_exp_date} echo "OPENAIR3_DIR = $OPENAIR3_DIR" >> results/${oai_exp_date}
echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> results/${oai_exp_date} echo "OPENAIR_TARGETS = $OPENAIR_TARGETS" >> results/${oai_exp_date}
################################ ################################
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment