Re-oganize utils

README.txt

@@ -26,7 +26,6 @@ openair-cn5g-smf
     ├── pfcp:      Generic PFCP stack implementation.
     ├── smf_app:   SMF network functions procedures and contexts.
     ├── test:      Minimal implementation for AMF, UDM network functions for testing purpose.
-    ├── utils:     Common utilities.   
     └── udp :      UDP server implementation.
 
 # OAI-SMF testbed: network topology

src/api-server/CMakeLists.txt

@@ -4,12 +4,12 @@ include_directories(${SMF_API_SERVER_DIR}/api)
 include_directories(${SMF_API_SERVER_DIR}/impl)
 include_directories(${SMF_API_SERVER_DIR}/model)
 include_directories(${SMF_API_SERVER_DIR}/)
-include_directories(${SRC_TOP_DIR}/utils/bstr)
 include_directories(${SRC_TOP_DIR}/smf_app)
 include_directories(${SRC_TOP_DIR}/itti)
 include_directories(${SRC_TOP_DIR}/common)
 include_directories(${SRC_TOP_DIR}/common/msg)
 include_directories(${SRC_TOP_DIR}/common/utils)
+include_directories(${SRC_TOP_DIR}/common/utils/bstr)
 include_directories(${SRC_TOP_DIR}/common/nas)
 include_directories(${SRC_TOP_DIR}/common/ngap)
 include_directories(${SRC_TOP_DIR}/pfcp)

src/api-server/smf-api-server.cpp

@@ -76,7 +76,7 @@ using namespace oai::smf_server::api;
 void SMFApiServer::init(size_t thr) {
   auto opts = Pistache::Http::Endpoint::options().threads(thr);
   opts.flags(Pistache::Tcp::Options::ReuseAddr);
-  opts.maxPayload(PISTACHE_SERVER_MAX_PAYLOAD);
+  opts.maxRequestSize(PISTACHE_SERVER_MAX_PAYLOAD);
   m_httpEndpoint->init(opts);
   m_individualPDUSessionHSMFApiImpl->init();
   m_individualSMContextApiImpl->init();

src/common/CMakeLists.txt

@@ -22,7 +22,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/msg)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/nas)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ngap)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/utils)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/utils)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 include_directories(${SRC_TOP_DIR}/../build/ext/spdlog/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)

src/nas/CMakeLists.txt

@@ -6,13 +6,12 @@ include_directories(${NAS_DIR}/mm/msg)
 include_directories(${NAS_DIR}/sm)
 include_directories(${NAS_DIR}/sm/msg)
 include_directories(${NAS_DIR}/security)
-include_directories(${SRC_TOP_DIR}/utils)
-include_directories(${SRC_TOP_DIR}/utils/bstr)
 include_directories(${SRC_TOP_DIR}/ngap/asn1c)
 include_directories(${SRC_TOP_DIR}/ngap/ies)
 include_directories(${SRC_TOP_DIR}/common)
 include_directories(${SRC_TOP_DIR}/common/msg)
 include_directories(${SRC_TOP_DIR}/common/utils)
+include_directories(${SRC_TOP_DIR}/common/utils/bstr)
 include_directories(${SRC_TOP_DIR}/common/nas)
 include_directories(${SRC_TOP_DIR}/common/ngap)
   
@@ -24,15 +23,8 @@ file(GLOB NAS_src_files
     ${NAS_DIR}/mm/*.c
     ${NAS_DIR}/sm/*.c
     ${NAS_DIR}/sm/msg/*.c
-    ${SRC_TOP_DIR}/utils/conversions.c
-    ${SRC_TOP_DIR}/utils/pid_file.c
-    ${SRC_TOP_DIR}/utils/hashtable.c
-    ${SRC_TOP_DIR}/utils/TLVDecoder.c
-    ${SRC_TOP_DIR}/utils/TLVEncoder.c
-    ${SRC_TOP_DIR}/utils/dynamic_memory_check.c
-    ${SRC_TOP_DIR}/utils/backtrace.c
-    ${SRC_TOP_DIR}/utils/bstr/*.c
-    ${SRC_TOP_DIR}/utils/multipartparser.c
+    ${SRC_TOP_DIR}/common/utils/*.c
+    ${SRC_TOP_DIR}/common/utils/bstr/*.c
     ${SRC_TOP_DIR}/nas/security/*.c
     ${SRC_TOP_DIR}/common/*.c
     ${SRC_TOP_DIR}/ngap/asn1c/*.c

src/oai_smf/CMakeLists.txt

@@ -23,7 +23,7 @@
 
 cmake_minimum_required (VERSION 3.0.2)
 
-project (OpenAirInterface)
+project(OpenAirInterface)
 
 ###########################################
 # macros to define options as there is numerous options in oai
@@ -286,6 +286,7 @@ include_directories(${SRC_TOP_DIR}/common/msg)
 include_directories(${SRC_TOP_DIR}/common/nas)
 include_directories(${SRC_TOP_DIR}/common/ngap)
 include_directories(${SRC_TOP_DIR}/common/utils)
+include_directories(${SRC_TOP_DIR}/common/utils/bstr)
 include_directories(${SRC_TOP_DIR}/pfcp)
 include_directories(${SRC_TOP_DIR}/udp)
 include_directories(${SRC_TOP_DIR}/../build/ext/spdlog/include)
@@ -303,8 +304,6 @@ include_directories(${SRC_TOP_DIR}/nas/security)
 include_directories(${SRC_TOP_DIR}/ngap)
 include_directories(${SRC_TOP_DIR}/ngap/asn1c)
 include_directories(${SRC_TOP_DIR}/ngap/ies)
-include_directories(${SRC_TOP_DIR}/utils)
-include_directories(${SRC_TOP_DIR}/utils/bstr)
 
 add_executable(smf
   ${SRC_TOP_DIR}/oai_smf/main.cpp