Source tree refactored

.gitignore

@@ -38,8 +38,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
-lib64/
 parts/
 sdist/
 var/

CMakeLists.txt

@@ -8,20 +8,12 @@ include_directories(src)
 #################### SUB DIRECTORIES ####################
 
 add_subdirectory(src/ext)
+add_subdirectory(src/utils)
 add_subdirectory(src/asn/asn1c)
 add_subdirectory(src/asn/rrc)
 add_subdirectory(src/asn/ngap)
-add_subdirectory(src/asn/utils)
-add_subdirectory(src/utils)
-add_subdirectory(src/sctp)
+add_subdirectory(src/lib)
 add_subdirectory(src/gnb)
-add_subdirectory(src/rlc)
-add_subdirectory(src/nas)
-add_subdirectory(src/rrc)
-add_subdirectory(src/udp)
-add_subdirectory(src/app)
-add_subdirectory(src/urs)
-add_subdirectory(src/crypt)
 add_subdirectory(src/ue)
 
 #################### GNB EXECUTABLE ####################
@@ -34,14 +26,8 @@ target_compile_options(nr-gnb PRIVATE -Wall -Wextra -pedantic)
 
 target_link_libraries(nr-gnb asn-rrc)
 target_link_libraries(nr-gnb asn-ngap)
-target_link_libraries(nr-gnb utils)
+target_link_libraries(nr-gnb common-lib)
 target_link_libraries(nr-gnb gnb)
-target_link_libraries(nr-gnb rlc)
-target_link_libraries(nr-gnb rrc)
-target_link_libraries(nr-gnb udp)
-target_link_libraries(nr-gnb app)
-target_link_libraries(nr-gnb urs)
-target_link_libraries(nr-gnb crypt)
 
 #################### UE EXECUTABLE ####################
 
@@ -49,14 +35,7 @@ add_executable(nr-ue src/ue.cpp)
 target_link_libraries(nr-ue pthread)
 target_compile_options(nr-ue PRIVATE -Wall -Wextra -pedantic)
 
-target_link_libraries(nr-ue utils)
-target_link_libraries(nr-ue rlc)
-target_link_libraries(nr-ue nas)
-target_link_libraries(nr-ue rrc)
-target_link_libraries(nr-ue udp)
-target_link_libraries(nr-ue app)
-target_link_libraries(nr-ue urs)
-target_link_libraries(nr-ue crypt)
+target_link_libraries(nr-ue common-lib)
 target_link_libraries(nr-ue ue)
 
 ###################### IF BINDER ######################
@@ -70,6 +49,4 @@ add_executable(nr-cli src/cli.cpp)
 target_link_libraries(nr-cli pthread)
 target_compile_options(nr-cli PRIVATE -Wall -Wextra -pedantic)
 
-target_link_libraries(nr-cli app)
-target_link_libraries(nr-cli udp)
-target_link_libraries(nr-cli utils)
+target_link_libraries(nr-cli common-lib)

src/asn/utils/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
-
-add_library(asn-utils ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(asn-utils PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(asn-utils utils)
-target_link_libraries(asn-utils sctp-cxx)
-target_link_libraries(asn-utils asn-ngap)
-target_link_libraries(asn-utils asn-rrc)

src/cli.cpp

@@ -7,9 +7,9 @@
 //
 
 #include <algorithm>
-#include <app/cli_base.hpp>
-#include <app/proc_table.hpp>
 #include <iostream>
+#include <lib/app/cli_base.hpp>
+#include <lib/app/proc_table.hpp>
 #include <set>
 #include <stdexcept>
 #include <string>

src/crypt/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB_RECURSE EXT_C_HDR_FILES *.h)
-file(GLOB_RECURSE EXT_CXX_HDR_FILES *.hpp)
-file(GLOB_RECURSE EXT_C_SRC_FILES *.c)
-file(GLOB_RECURSE EXT_CXX_SRC_FILES *.cpp)
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
-
-add_library(crypt ${EXT_C_HDR_FILES} ${EXT_C_SRC_FILES} ${EXT_CXX_HDR_FILES} ${EXT_CXX_SRC_FILES} ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(crypt PUBLIC -Wno-format-security)
-
-target_link_libraries(crypt utils)
-target_link_libraries(crypt ext)

src/gnb.cpp

@@ -6,12 +6,12 @@
 // and subject to the terms and conditions defined in LICENSE file.
 //
 
-#include <app/base_app.hpp>
-#include <app/cli_base.hpp>
-#include <app/cli_cmd.hpp>
-#include <app/proc_table.hpp>
 #include <gnb/gnb.hpp>
 #include <iostream>
+#include <lib/app/base_app.hpp>
+#include <lib/app/cli_base.hpp>
+#include <lib/app/cli_cmd.hpp>
+#include <lib/app/proc_table.hpp>
 #include <stdexcept>
 #include <unistd.h>
 #include <unordered_map>

src/gnb/CMakeLists.txt

@@ -7,14 +7,7 @@ add_library(gnb ${HDR_FILES} ${SRC_FILES})
 
 target_compile_options(gnb PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
 
-target_link_libraries(gnb utils)
-target_link_libraries(gnb sctp-cxx)
 target_link_libraries(gnb asn-ngap)
 target_link_libraries(gnb asn-rrc)
-target_link_libraries(gnb asn-utils)
-target_link_libraries(gnb rrc)
-target_link_libraries(gnb udp)
-target_link_libraries(gnb app)
-target_link_libraries(gnb urs)
-
+target_link_libraries(gnb common-lib)
 

src/gnb/gnb.cpp

@@ -9,12 +9,12 @@
 #include "gnb.hpp"
 #include "app/task.hpp"
 #include "gtp/task.hpp"
-#include "rls/task.hpp"
 #include "ngap/task.hpp"
+#include "rls/task.hpp"
 #include "rrc/task.hpp"
 #include "sctp/task.hpp"
 
-#include <app/cli_base.hpp>
+#include <lib/app/cli_base.hpp>
 
 namespace nr::gnb
 {

src/gnb/gnb.hpp

@@ -10,8 +10,8 @@
 
 #include "types.hpp"
 
-#include <app/cli_cmd.hpp>
-#include <app/monitor.hpp>
+#include <lib/app/cli_cmd.hpp>
+#include <lib/app/monitor.hpp>
 #include <memory>
 #include <string>
 #include <utils/logger.hpp>

src/gnb/gtp/task.hpp

@@ -10,9 +10,9 @@
 
 #include "utils.hpp"
 #include <gnb/nts.hpp>
+#include <lib/udp/server_task.hpp>
 #include <memory>
 #include <thread>
-#include <udp/server_task.hpp>
 #include <unordered_map>
 #include <utils/logger.hpp>
 #include <utils/nts.hpp>

src/gnb/ngap/encode.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <asn/utils/utils.hpp>
+#include <lib/asn/utils.hpp>
 #include <asn_application.h>
 #include <utils/octet_string.hpp>
 

src/gnb/ngap/task.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <app/monitor.hpp>
+#include <lib/app/monitor.hpp>
 #include <optional>
 #include <unordered_map>
 #include <utils/logger.hpp>

src/gnb/ngap/transport.cpp

@@ -9,11 +9,11 @@
 #include "encode.hpp"
 #include "task.hpp"
 #include "utils.hpp"
-#include <asn/utils/ngap.hpp>
-#include <asn/utils/utils.hpp>
 #include <gnb/app/task.hpp>
 #include <gnb/nts.hpp>
 #include <gnb/sctp/task.hpp>
+#include <lib/asn/ngap.hpp>
+#include <lib/asn/utils.hpp>
 
 #include <asn/ngap/ASN_NGAP_AMF-UE-NGAP-ID.h>
 #include <asn/ngap/ASN_NGAP_InitiatingMessage.h>

src/gnb/ngap/utils.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <asn/utils/ngap.hpp>
-#include <asn/utils/utils.hpp>
+#include <lib/asn/ngap.hpp>
+#include <lib/asn/utils.hpp>
 #include <utils/common.hpp>
 #include <utils/common_types.hpp>
 

src/gnb/nts.hpp

@@ -9,11 +9,11 @@
 #pragma once
 
 #include "types.hpp"
-#include <app/cli_base.hpp>
-#include <app/cli_cmd.hpp>
-#include <asn/utils/utils.hpp>
-#include <rrc/rrc.hpp>
-#include <sctp/sctp.hpp>
+#include <lib/asn/utils.hpp>
+#include <lib/app/cli_base.hpp>
+#include <lib/app/cli_cmd.hpp>
+#include <lib/rrc/rrc.hpp>
+#include <lib/sctp/sctp.hpp>
 #include <utility>
 #include <utils/network.hpp>
 #include <utils/nts.hpp>

src/gnb/rls/task.hpp

@@ -10,11 +10,11 @@
 
 #include <gnb/nts.hpp>
 #include <gnb/types.hpp>
+#include <lib/rls/rls_pdu.hpp>
+#include <lib/udp/server_task.hpp>
 #include <memory>
 #include <thread>
-#include <udp/server_task.hpp>
 #include <unordered_map>
-#include <urs/rls_pdu.hpp>
 #include <utils/logger.hpp>
 #include <utils/nts.hpp>
 #include <vector>

src/gnb/rrc/channel.cpp

@@ -10,7 +10,7 @@
 #include <asn/rrc/ASN_RRC_UL-CCCH-Message.h>
 #include <asn/rrc/ASN_RRC_UL-DCCH-Message.h>
 #include <gnb/rls/task.hpp>
-#include <rrc/encode.hpp>
+#include <lib/rrc/encode.hpp>
 
 namespace nr::gnb
 {

src/gnb/rrc/handler.cpp

@@ -9,7 +9,7 @@
 #include "task.hpp"
 
 #include <gnb/ngap/task.hpp>
-#include <rrc/encode.hpp>
+#include <lib/rrc/encode.hpp>
 
 #include <asn/ngap/ASN_NGAP_FiveG-S-TMSI.h>
 #include <asn/rrc/ASN_RRC_BCCH-BCH-Message.h>

src/gnb/rrc/task.cpp

@@ -11,7 +11,7 @@
 #include <asn/rrc/ASN_RRC_DLInformationTransfer.h>
 #include <gnb/nts.hpp>
 #include <gnb/rls/task.hpp>
-#include <rrc/encode.hpp>
+#include <lib/rrc/encode.hpp>
 
 namespace nr::gnb
 {

src/gnb/sctp/task.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include <lib/sctp/sctp.hpp>
 #include <memory>
-#include <sctp/sctp.hpp>
 #include <thread>
 #include <unordered_map>
 #include <utils/logger.hpp>

src/gnb/types.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include <app/monitor.hpp>
 #include <asn/ngap/ASN_NGAP_QosFlowSetupRequestList.h>
 #include <asn/rrc/ASN_RRC_InitialUE-Identity.h>
-#include <asn/utils/utils.hpp>
+#include <lib/asn/utils.hpp>
+#include <lib/app/monitor.hpp>
 #include <string>
 #include <utils/common_types.hpp>
 #include <utils/logger.hpp>

src/lib/CMakeLists.txt

+cmake_minimum_required(VERSION 3.17)
+
+file(GLOB_RECURSE HDR_FILES *.hpp)
+file(GLOB_RECURSE SRC_FILES *.cpp)
+
+add_library(common-lib ${HDR_FILES} ${SRC_FILES})
+
+target_compile_options(common-lib PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
+
+target_link_libraries(common-lib utils)
+target_link_libraries(common-lib asn-ngap)
+target_link_libraries(common-lib asn-rrc)
+
+target_link_libraries(common-lib sctp) # Linux SCTP

src/app/cli_base.hpp → src/lib/app/cli_base.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include <lib/udp/server.hpp>
 #include <string>
-#include <udp/server.hpp>
 #include <utility>
 #include <utils/constants.hpp>
 #include <utils/network.hpp>

src/rrc/encode.hpp → src/lib/rrc/encode.hpp

@@ -16,7 +16,7 @@
 #include <asn/rrc/ASN_RRC_UL-CCCH-Message.h>
 #include <asn/rrc/ASN_RRC_UL-CCCH1-Message.h>
 #include <asn/rrc/ASN_RRC_UL-DCCH-Message.h>
-#include <asn/utils/utils.hpp>
+#include <lib/asn/utils.hpp>
 #include <utils/octet_string.hpp>
 
 namespace rrc::encode

src/udp/server_task.hpp → src/lib/udp/server_task.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <udp/server.hpp>
+#include <lib/udp/server.hpp>
 #include <utils/nts.hpp>
 #include <utils/octet_string.hpp>
 

src/nas/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
-
-add_library(nas ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(nas PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(nas utils)

src/rlc/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
-
-add_library(rlc ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(rlc PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(rlc utils)
-target_link_libraries(rlc sctp)
-

src/rrc/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
-
-add_library(rrc ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(rrc PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(rrc utils)
-target_link_libraries(rrc asn-rrc)
-target_link_libraries(rrc asn-utils)
-

src/sctp/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
-
-add_library(sctp-cxx ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(sctp-cxx PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(sctp-cxx utils)
-target_link_libraries(sctp-cxx sctp)

src/udp/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
-
-add_library(udp ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(udp PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(udp utils)
-target_link_libraries(udp sctp)

src/ue.cpp

@@ -6,12 +6,12 @@
 // and subject to the terms and conditions defined in LICENSE file.
 //
 
-#include <app/base_app.hpp>
-#include <app/cli_base.hpp>
-#include <app/cli_cmd.hpp>
-#include <app/proc_table.hpp>
-#include <app/ue_ctl.hpp>
 #include <iostream>
+#include <lib/app/base_app.hpp>
+#include <lib/app/cli_base.hpp>
+#include <lib/app/cli_cmd.hpp>
+#include <lib/app/proc_table.hpp>
+#include <lib/app/ue_ctl.hpp>
 #include <stdexcept>
 #include <ue/ue.hpp>
 #include <unistd.h>

src/ue/CMakeLists.txt

@@ -6,11 +6,4 @@ file(GLOB_RECURSE SRC_FILES *.cpp)
 add_library(ue ${HDR_FILES} ${SRC_FILES})
 
 target_compile_options(ue PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(ue utils)
-target_link_libraries(ue rrc)
-target_link_libraries(ue crypt)
-target_link_libraries(ue nas)
-target_link_libraries(ue urs)
-target_link_libraries(ue app)
-
+target_link_libraries(ue common-lib)

src/ue/app/task.cpp

@@ -8,7 +8,7 @@
 
 #include "task.hpp"
 #include "cmd_handler.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/nas/task.hpp>
 #include <ue/rls/task.hpp>
 #include <ue/tun/tun.hpp>

src/ue/nas/enc.cpp

@@ -8,7 +8,7 @@
 
 #include "enc.hpp"
 
-#include <crypt/crypt.hpp>
+#include <lib/crypt/crypt.hpp>
 #include <stdexcept>
 
 namespace nr::ue::nas_enc

src/ue/nas/enc.hpp

@@ -8,16 +8,17 @@
 
 #pragma once
 
+#include <lib/nas/nas.hpp>
 #include <ue/types.hpp>
-#include <nas/nas.hpp>
 
 namespace nr::ue::nas_enc
 {
 
-std::unique_ptr<nas::SecuredMmMessage> Encrypt(NasSecurityContext &ctx, const nas::PlainMmMessage &msg, bool bypassCiphering);
+std::unique_ptr<nas::SecuredMmMessage> Encrypt(NasSecurityContext &ctx, const nas::PlainMmMessage &msg,
+                                               bool bypassCiphering);
 std::unique_ptr<nas::NasMessage> Decrypt(NasSecurityContext &ctx, const nas::SecuredMmMessage &msg);
 
-uint32_t ComputeMac(nas::ETypeOfIntegrityProtectionAlgorithm alg, NasCount count, bool is3gppAccess,
-                    bool isUplink, const OctetString &key, const OctetString &plainMessage);
+uint32_t ComputeMac(nas::ETypeOfIntegrityProtectionAlgorithm alg, NasCount count, bool is3gppAccess, bool isUplink,
+                    const OctetString &key, const OctetString &plainMessage);
 
 } // namespace nr::ue::nas_enc

src/ue/nas/keys.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "keys.hpp"
-#include <crypt/crypt.hpp>
+#include <lib/crypt/crypt.hpp>
 #include <stdexcept>
 
 static const int N_NAS_enc_alg = 0x01;
@@ -20,7 +20,7 @@ static const int N_UP_int_alg = 0x06;
 namespace nr::ue::keys
 {
 
-void DeriveKeysSeafAmf(const UeConfig &ueConfig, const Plmn& currentPlmn, NasSecurityContext &nasSecurityContext)
+void DeriveKeysSeafAmf(const UeConfig &ueConfig, const Plmn &currentPlmn, NasSecurityContext &nasSecurityContext)
 {
     auto &keys = nasSecurityContext.keys;
     std::string snn = ConstructServingNetworkName(currentPlmn);

src/ue/nas/mm/access.cpp

@@ -8,7 +8,7 @@
 
 #include "mm.hpp"
 
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue

src/ue/nas/mm/base.cpp

@@ -8,7 +8,7 @@
 
 #include "mm.hpp"
 
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/task.hpp>
 #include <ue/nas/usim.hpp>

src/ue/nas/mm/config.cpp

@@ -8,7 +8,7 @@
 
 #include "mm.hpp"
 
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 
 namespace nr::ue
 {

src/ue/nas/mm/dereg.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "mm.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/sm/sm.hpp>
 

src/ue/nas/mm/ecall.cpp

@@ -8,7 +8,7 @@
 
 #include "mm.hpp"
 
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <stdexcept>
 #include <ue/app/task.hpp>
 #include <ue/nas/task.hpp>

src/ue/nas/mm/mm.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <crypt/milenage.hpp>
-#include <nas/nas.hpp>
-#include <nas/timer.hpp>
+#include <lib/crypt/milenage.hpp>
+#include <lib/nas/nas.hpp>
+#include <lib/nas/timer.hpp>
 #include <ue/nas/usim.hpp>
 #include <ue/nts.hpp>
 #include <ue/types.hpp>

src/ue/nas/mm/radio.cpp

@@ -8,7 +8,7 @@
 
 #include "mm.hpp"
 #include <algorithm>
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/sm/sm.hpp>
 #include <ue/rrc/task.hpp>

src/ue/nas/mm/register.cpp

@@ -9,7 +9,7 @@
 #include "mm.hpp"
 
 #include <algorithm>
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/nas/task.hpp>
 #include <utils/common.hpp>
 

src/ue/nas/mm/security.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "mm.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/nas/keys.hpp>
 
 namespace nr::ue

src/ue/nas/mm/service.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "mm.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue

src/ue/nas/mm/slice.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "mm.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/sm/sm.hpp>
 

src/ue/nas/mm/timer.cpp

@@ -8,11 +8,10 @@
 
 #include "mm.hpp"
 
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/task.hpp>
 #include <ue/rrc/task.hpp>
-#include <utils/common.hpp>
 
 namespace nr::ue
 {

src/ue/nas/mm/transport.cpp

@@ -8,7 +8,7 @@
 
 #include "mm.hpp"
 #include <asn/rrc/ASN_RRC_EstablishmentCause.h>
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/nas/enc.hpp>
 #include <ue/nas/sm/sm.hpp>
 #include <ue/rrc/task.hpp>

src/ue/nas/sm/allocation.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "sm.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 
 namespace nr::ue
 {

src/ue/nas/sm/establishment.cpp

@@ -8,8 +8,8 @@
 
 #include "sm.hpp"
 #include <algorithm>
-#include <nas/proto_conf.hpp>
-#include <nas/utils.hpp>
+#include <lib/nas/proto_conf.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/mm/mm.hpp>
 

src/ue/nas/sm/interface.cpp

@@ -8,8 +8,8 @@
 
 #include "sm.hpp"
 #include <algorithm>
-#include <nas/proto_conf.hpp>
-#include <nas/utils.hpp>
+#include <lib/nas/proto_conf.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/mm/mm.hpp>
 

src/ue/nas/sm/procedure.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "sm.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <set>
 #include <ue/app/task.hpp>
 #include <ue/nas/mm/mm.hpp>

src/ue/nas/sm/release.cpp

@@ -7,8 +7,8 @@
 //
 
 #include "sm.hpp"
-#include <nas/proto_conf.hpp>
-#include <nas/utils.hpp>
+#include <lib/nas/proto_conf.hpp>
+#include <lib/nas/utils.hpp>
 #include <optional>
 #include <ue/app/task.hpp>
 #include <ue/nas/mm/mm.hpp>

src/ue/nas/sm/resource.cpp

@@ -8,8 +8,8 @@
 
 #include "sm.hpp"
 #include <algorithm>
-#include <nas/proto_conf.hpp>
-#include <nas/utils.hpp>
+#include <lib/nas/proto_conf.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/mm/mm.hpp>
 

src/ue/nas/sm/sm.hpp

@@ -10,8 +10,8 @@
 
 #include <array>
 #include <bitset>
-#include <nas/nas.hpp>
-#include <nas/timer.hpp>
+#include <lib/nas/nas.hpp>
+#include <lib/nas/timer.hpp>
 #include <ue/nts.hpp>
 #include <ue/types.hpp>
 #include <utils/nts.hpp>

src/ue/nas/sm/timer.cpp

@@ -8,8 +8,8 @@
 
 #include "sm.hpp"
 #include <algorithm>
-#include <nas/proto_conf.hpp>
-#include <nas/utils.hpp>
+#include <lib/nas/proto_conf.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/mm/mm.hpp>
 

src/ue/nas/sm/transport.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "sm.hpp"
-#include <nas/utils.hpp>
+#include <lib/nas/utils.hpp>
 #include <ue/nas/mm/mm.hpp>
 
 namespace nr::ue

src/ue/nas/task.hpp

@@ -9,9 +9,9 @@
 #pragma once
 
 #include "usim.hpp"
-#include <crypt/milenage.hpp>
-#include <nas/nas.hpp>
-#include <nas/timer.hpp>
+#include <lib/crypt/milenage.hpp>
+#include <lib/nas/nas.hpp>
+#include <lib/nas/timer.hpp>
 #include <ue/nas/mm/mm.hpp>
 #include <ue/nas/sm/sm.hpp>
 #include <ue/nts.hpp>

src/ue/nas/usim.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include <lib/nas/msg.hpp>
 #include <memory>
-#include <nas/msg.hpp>
 #include <optional>
 #include <ue/types.hpp>
 #include <utils/common_types.hpp>

src/ue/nts.hpp

@@ -10,9 +10,9 @@
 
 #include "types.hpp"
 #include "ue.hpp"
-#include <app/cli_base.hpp>
-#include <nas/timer.hpp>
-#include <rrc/rrc.hpp>
+#include <lib/app/cli_base.hpp>
+#include <lib/nas/timer.hpp>
+#include <lib/rrc/rrc.hpp>
 #include <utility>
 #include <utils/network.hpp>
 #include <utils/nts.hpp>

src/ue/rls/task.hpp

@@ -8,14 +8,14 @@
 
 #pragma once
 
+#include <lib/rrc/rrc.hpp>
+#include <lib/udp/server_task.hpp>
+#include <lib/rls/rls_pdu.hpp>
 #include <memory>
 #include <optional>
-#include <rrc/rrc.hpp>
 #include <thread>
-#include <udp/server_task.hpp>
 #include <ue/types.hpp>
 #include <unordered_map>
-#include <urs/rls_pdu.hpp>
 #include <utils/common_types.hpp>
 #include <utils/logger.hpp>
 #include <utils/nts.hpp>

src/ue/rrc/channel.cpp

@@ -8,7 +8,7 @@
 
 #include "task.hpp"
 
-#include <rrc/encode.hpp>
+#include <lib/rrc/encode.hpp>
 #include <ue/rls/task.hpp>
 
 #include <asn/rrc/ASN_RRC_RRCReject.h>

src/ue/rrc/handler.cpp

@@ -7,8 +7,8 @@
 //
 
 #include "task.hpp"
-#include <asn/utils/utils.hpp>
-#include <rrc/encode.hpp>
+#include <lib/asn/utils.hpp>
+#include <lib/rrc/encode.hpp>
 #include <ue/nas/task.hpp>
 #include <ue/nts.hpp>
 #include <utils/common.hpp>

src/ue/rrc/task.cpp

@@ -11,7 +11,7 @@
 #include <asn/rrc/ASN_RRC_RRCSetupRequest.h>
 #include <asn/rrc/ASN_RRC_ULInformationTransfer-IEs.h>
 #include <asn/rrc/ASN_RRC_ULInformationTransfer.h>
-#include <rrc/encode.hpp>
+#include <lib/rrc/encode.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/task.hpp>
 #include <ue/rls/task.hpp>

src/ue/types.hpp

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include <app/monitor.hpp>
-#include <app/ue_ctl.hpp>
 #include <array>
+#include <lib/app/monitor.hpp>
+#include <lib/app/ue_ctl.hpp>
+#include <lib/nas/nas.hpp>
+#include <lib/nas/timer.hpp>
 #include <memory>
-#include <nas/nas.hpp>
-#include <nas/timer.hpp>
 #include <utils/common_types.hpp>
 #include <utils/json.hpp>
 #include <utils/logger.hpp>

src/ue/ue.hpp

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "types.hpp"
-#include <app/cli_cmd.hpp>
+#include <lib/app/cli_cmd.hpp>
 #include <memory>
 #include <utils/network.hpp>
 #include <utils/nts.hpp>

src/urs/CMakeLists.txt

-cmake_minimum_required(VERSION 3.17)
-
-file(GLOB_RECURSE HDR_FILES *.hpp)
-file(GLOB_RECURSE SRC_FILES *.cpp)
-
-add_library(urs ${HDR_FILES} ${SRC_FILES})
-
-target_compile_options(urs PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
-
-target_link_libraries(urs utils)
-target_link_libraries(urs udp)

src/utils/CMakeLists.txt

 cmake_minimum_required(VERSION 3.17)
 
-file(GLOB_RECURSE YAML_HDR_FILES *.h)
-file(GLOB_RECURSE YAML_SRC_FILES *.cpp)
+file(GLOB_RECURSE HDR_FILES *.hpp)
+file(GLOB_RECURSE SRC_FILES *.cpp)
 
-file(GLOB HDR_FILES *.hpp)
-file(GLOB SRC_FILES *.cpp)
+add_library(utils ${HDR_FILES} ${SRC_FILES})
 
-add_library(utils ${YAML_HDR_FILES} ${YAML_SRC_FILES} ${HDR_FILES} ${SRC_FILES})
+target_compile_options(utils PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter)
+target_compile_options(utils PUBLIC -Wno-format-security)
 
-target_link_libraries(utils pthread)
 target_link_libraries(utils ext)
-
-target_compile_options(utils PRIVATE -Wall -Wextra -pedantic -Wno-unused-parameter -Wno-format-security)
-target_compile_options(utils PUBLIC -Wno-format-security)