From c5509caece28dbb7e7ce65c69194ee6d9701ea26 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Wed, 3 Jul 2019 20:15:11 +0100 Subject: [PATCH] added extra operators and remove rrc_asn1 in some cmake targets --- lib/include/srslte/asn1/rrc_asn1_utils.h | 1 + lib/src/asn1/rrc_asn1_utils.cc | 6 ++++++ lib/test/upper/CMakeLists.txt | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/include/srslte/asn1/rrc_asn1_utils.h b/lib/include/srslte/asn1/rrc_asn1_utils.h index 55b4775d2..f440b3f2d 100644 --- a/lib/include/srslte/asn1/rrc_asn1_utils.h +++ b/lib/include/srslte/asn1/rrc_asn1_utils.h @@ -52,6 +52,7 @@ struct plmn_id_t { int from_number(uint16_t mcc_num, uint16_t mnc_num); int from_string(const std::string& plmn_str); std::string to_string() const; + bool operator==(const plmn_id_t& other); }; struct s_tmsi_t { diff --git a/lib/src/asn1/rrc_asn1_utils.cc b/lib/src/asn1/rrc_asn1_utils.cc index f81c78776..cde508d9d 100644 --- a/lib/src/asn1/rrc_asn1_utils.cc +++ b/lib/src/asn1/rrc_asn1_utils.cc @@ -110,6 +110,12 @@ std::string plmn_id_t::to_string() const return mcc_str + mnc_str; } +bool plmn_id_t::operator==(const plmn_id_t& other) +{ + return std::equal(&mcc[0], &mcc[3], &other.mcc[0]) and nof_mnc_digits == other.nof_mnc_digits and + std::equal(&mnc[0], &mnc[nof_mnc_digits], &other.mnc[0]); +} + s_tmsi_t::s_tmsi_t(const asn1::rrc::s_tmsi_s& asn1_type) { from_asn1(asn1_type); diff --git a/lib/test/upper/CMakeLists.txt b/lib/test/upper/CMakeLists.txt index 41f6a80de..46fefac67 100644 --- a/lib/test/upper/CMakeLists.txt +++ b/lib/test/upper/CMakeLists.txt @@ -27,11 +27,11 @@ target_link_libraries(rlc_am_control_test srslte_upper srslte_phy) add_test(rlc_am_control_test rlc_am_control_test) add_executable(rlc_am_test rlc_am_test.cc) -target_link_libraries(rlc_am_test srslte_upper srslte_phy srslte_common rrc_asn1) +target_link_libraries(rlc_am_test srslte_upper srslte_phy srslte_common) add_test(rlc_am_test rlc_am_test) add_executable(rlc_stress_test rlc_stress_test.cc) -target_link_libraries(rlc_stress_test srslte_upper srslte_phy srslte_common rrc_asn1 ${Boost_LIBRARIES}) +target_link_libraries(rlc_stress_test srslte_upper srslte_phy srslte_common ${Boost_LIBRARIES}) add_test(rlc_am_stress_test rlc_stress_test --mode=AM --loglevel 1 --sdu_gen_delay 250) add_test(rlc_um_stress_test rlc_stress_test --mode=UM --loglevel 1) add_test(rlc_tm_stress_test rlc_stress_test --mode=TM --loglevel 1 --random_opp=false) @@ -44,7 +44,7 @@ target_link_libraries(rlc_um_data_test srslte_upper srslte_phy srslte_common) add_test(rlc_um_data_test rlc_um_data_test) add_executable(rlc_um_test rlc_um_test.cc) -target_link_libraries(rlc_um_test srslte_upper srslte_phy rrc_asn1) +target_link_libraries(rlc_um_test srslte_upper srslte_phy) add_test(rlc_um_test rlc_um_test) ########################################################################