From 6efa944b5e0ccf449e7037c72674f45d6729396a Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 25 Jul 2019 17:31:04 +0100 Subject: [PATCH] Removed srslte prefix from pdcp_config_t --- lib/include/srslte/common/interfaces_common.h | 12 +++---- .../srslte/interfaces/enb_interfaces.h | 2 +- lib/include/srslte/interfaces/ue_interfaces.h | 2 +- lib/include/srslte/upper/pdcp.h | 4 +-- lib/include/srslte/upper/pdcp_entity_base.h | 3 +- lib/include/srslte/upper/pdcp_entity_lte.h | 2 +- lib/include/srslte/upper/pdcp_entity_nr.h | 2 +- lib/src/upper/pdcp.cc | 4 +-- lib/src/upper/pdcp_entity_lte.cc | 2 +- lib/src/upper/pdcp_entity_nr.cc | 2 +- lib/test/upper/pdcp_nr_test.cc | 14 ++++---- srsenb/hdr/stack/upper/pdcp.h | 8 ++--- srsenb/src/stack/rrc/rrc.cc | 34 +++++++++---------- srsenb/src/stack/upper/pdcp.cc | 2 +- 14 files changed, 45 insertions(+), 48 deletions(-) diff --git a/lib/include/srslte/common/interfaces_common.h b/lib/include/srslte/common/interfaces_common.h index 15016c5e2..88d8177ac 100644 --- a/lib/include/srslte/common/interfaces_common.h +++ b/lib/include/srslte/common/interfaces_common.h @@ -74,14 +74,14 @@ const uint8_t PDCP_SN_LEN_18 = 18; typedef enum { PDCP_RB_IS_SRB, PDCP_RB_IS_DRB } pdcp_rb_type_t; -class srslte_pdcp_config_t +class pdcp_config_t { public: - srslte_pdcp_config_t(uint8_t bearer_id_, - pdcp_rb_type_t rb_type_, - security_direction_t tx_direction_, - security_direction_t rx_direction_, - uint8_t sn_len_) : + pdcp_config_t(uint8_t bearer_id_, + pdcp_rb_type_t rb_type_, + security_direction_t tx_direction_, + security_direction_t rx_direction_, + uint8_t sn_len_) : bearer_id(bearer_id_), rb_type(rb_type_), tx_direction(tx_direction_), diff --git a/lib/include/srslte/interfaces/enb_interfaces.h b/lib/include/srslte/interfaces/enb_interfaces.h index 9d8c27aca..a07e84ac2 100644 --- a/lib/include/srslte/interfaces/enb_interfaces.h +++ b/lib/include/srslte/interfaces/enb_interfaces.h @@ -211,7 +211,7 @@ public: virtual void add_user(uint16_t rnti) = 0; virtual void rem_user(uint16_t rnti) = 0; virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; - virtual void add_bearer(uint16_t rnti, uint32_t lcid, srslte::srslte_pdcp_config_t cnfg) = 0; + virtual void add_bearer(uint16_t rnti, uint32_t lcid, srslte::pdcp_config_t cnfg) = 0; virtual void config_security(uint16_t rnti, uint32_t lcid, uint8_t* k_rrc_enc_, diff --git a/lib/include/srslte/interfaces/ue_interfaces.h b/lib/include/srslte/interfaces/ue_interfaces.h index 0e9ff0dea..3e2b8ac81 100644 --- a/lib/include/srslte/interfaces/ue_interfaces.h +++ b/lib/include/srslte/interfaces/ue_interfaces.h @@ -232,7 +232,7 @@ public: virtual void reestablish(uint32_t lcid) = 0; virtual void reset() = 0; virtual void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, bool blocking = true) = 0; - virtual void add_bearer(uint32_t lcid, srslte::srslte_pdcp_config_t cnfg) = 0; + virtual void add_bearer(uint32_t lcid, srslte::pdcp_config_t cnfg) = 0; virtual void change_lcid(uint32_t old_lcid, uint32_t new_lcid) = 0; virtual void config_security(uint32_t lcid, uint8_t* k_rrc_enc_, diff --git a/lib/include/srslte/upper/pdcp.h b/lib/include/srslte/upper/pdcp.h index 9b0774b91..1c6ab546c 100644 --- a/lib/include/srslte/upper/pdcp.h +++ b/lib/include/srslte/upper/pdcp.h @@ -46,8 +46,8 @@ public: void reset(); void write_sdu(uint32_t lcid, unique_byte_buffer_t sdu, bool blocking = true); void write_sdu_mch(uint32_t lcid, unique_byte_buffer_t sdu); - void add_bearer(uint32_t lcid, srslte_pdcp_config_t cnfg); - void add_bearer_mrb(uint32_t lcid, srslte_pdcp_config_t cnfg); + void add_bearer(uint32_t lcid, pdcp_config_t cnfg); + void add_bearer_mrb(uint32_t lcid, pdcp_config_t cnfg); void del_bearer(uint32_t lcid); void change_lcid(uint32_t old_lcid, uint32_t new_lcid); void config_security(uint32_t lcid, diff --git a/lib/include/srslte/upper/pdcp_entity_base.h b/lib/include/srslte/upper/pdcp_entity_base.h index 9a688e7fc..0476306b7 100644 --- a/lib/include/srslte/upper/pdcp_entity_base.h +++ b/lib/include/srslte/upper/pdcp_entity_base.h @@ -97,8 +97,7 @@ protected: bool do_integrity = false; bool do_encryption = false; - srslte_pdcp_config_t cfg = { - 1, PDCP_RB_IS_DRB, SECURITY_DIRECTION_DOWNLINK, SECURITY_DIRECTION_UPLINK, PDCP_SN_LEN_12}; + pdcp_config_t cfg = {1, PDCP_RB_IS_DRB, SECURITY_DIRECTION_DOWNLINK, SECURITY_DIRECTION_UPLINK, PDCP_SN_LEN_12}; std::mutex mutex; diff --git a/lib/include/srslte/upper/pdcp_entity_lte.h b/lib/include/srslte/upper/pdcp_entity_lte.h index be1af9a66..a6df1f52a 100644 --- a/lib/include/srslte/upper/pdcp_entity_lte.h +++ b/lib/include/srslte/upper/pdcp_entity_lte.h @@ -53,7 +53,7 @@ public: srsue::gw_interface_pdcp* gw_, srslte::log* log_, uint32_t lcid_, - srslte_pdcp_config_t cfg_); + pdcp_config_t cfg_); void reset(); void reestablish(); diff --git a/lib/include/srslte/upper/pdcp_entity_nr.h b/lib/include/srslte/upper/pdcp_entity_nr.h index 7e8032d28..d5e783f7b 100644 --- a/lib/include/srslte/upper/pdcp_entity_nr.h +++ b/lib/include/srslte/upper/pdcp_entity_nr.h @@ -46,7 +46,7 @@ public: srsue::gw_interface_pdcp* gw_, srslte::log* log_, uint32_t lcid_, - srslte_pdcp_config_t cfg_); + pdcp_config_t cfg_); void reset(); void reestablish(); diff --git a/lib/src/upper/pdcp.cc b/lib/src/upper/pdcp.cc index 3ab35d8aa..390913554 100644 --- a/lib/src/upper/pdcp.cc +++ b/lib/src/upper/pdcp.cc @@ -120,7 +120,7 @@ void pdcp::write_sdu_mch(uint32_t lcid, unique_byte_buffer_t sdu) pthread_rwlock_unlock(&rwlock); } -void pdcp::add_bearer(uint32_t lcid, srslte_pdcp_config_t cfg) +void pdcp::add_bearer(uint32_t lcid, pdcp_config_t cfg) { pthread_rwlock_wrlock(&rwlock); if (not valid_lcid(lcid)) { @@ -141,7 +141,7 @@ unlock_and_exit: pthread_rwlock_unlock(&rwlock); } -void pdcp::add_bearer_mrb(uint32_t lcid, srslte_pdcp_config_t cfg) +void pdcp::add_bearer_mrb(uint32_t lcid, pdcp_config_t cfg) { pthread_rwlock_wrlock(&rwlock); if (not valid_mch_lcid(lcid)) { diff --git a/lib/src/upper/pdcp_entity_lte.cc b/lib/src/upper/pdcp_entity_lte.cc index 4f13bd269..cfdb35aba 100644 --- a/lib/src/upper/pdcp_entity_lte.cc +++ b/lib/src/upper/pdcp_entity_lte.cc @@ -33,7 +33,7 @@ void pdcp_entity_lte::init(srsue::rlc_interface_pdcp* rlc_, srsue::gw_interface_pdcp* gw_, srslte::log* log_, uint32_t lcid_, - srslte_pdcp_config_t cfg_) + pdcp_config_t cfg_) { rlc = rlc_; rrc = rrc_; diff --git a/lib/src/upper/pdcp_entity_nr.cc b/lib/src/upper/pdcp_entity_nr.cc index 1ae4470f6..d14a8dd94 100644 --- a/lib/src/upper/pdcp_entity_nr.cc +++ b/lib/src/upper/pdcp_entity_nr.cc @@ -34,7 +34,7 @@ void pdcp_entity_nr::init(srsue::rlc_interface_pdcp* rlc_, srsue::gw_interface_pdcp* gw_, srslte::log* log_, uint32_t lcid_, - srslte_pdcp_config_t cfg_) + pdcp_config_t cfg_) { rlc = rlc_; rrc = rrc_; diff --git a/lib/test/upper/pdcp_nr_test.cc b/lib/test/upper/pdcp_nr_test.cc index 437b5d1e0..6db148604 100644 --- a/lib/test/upper/pdcp_nr_test.cc +++ b/lib/test/upper/pdcp_nr_test.cc @@ -33,7 +33,7 @@ } \ } -// Encription and Integrity Keys +// Encryption and Integrity Keys uint8_t k_int[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, 0x31}; uint8_t k_enc[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, @@ -139,8 +139,8 @@ int test_tx(uint32_t n_packets, srslte::byte_buffer_pool* pool, srslte::log* log) { - srslte::pdcp_entity_nr pdcp; - srslte::srslte_pdcp_config_t cfg = { + srslte::pdcp_entity_nr pdcp; + srslte::pdcp_config_t cfg = { 1, srslte::PDCP_RB_IS_DRB, srslte::SECURITY_DIRECTION_UPLINK, srslte::SECURITY_DIRECTION_DOWNLINK, pdcp_sn_len}; rlc_dummy rlc(log); @@ -262,11 +262,11 @@ int test_tx_all(srslte::byte_buffer_pool* pool, srslte::log* log) */ int test_rx_in_sequence(uint64_t n_packets, uint8_t pdcp_sn_len, srslte::byte_buffer_pool* pool, srslte::log* log) { - srslte::pdcp_entity_nr pdcp_tx; - srslte::pdcp_entity_nr pdcp_rx; - srslte::srslte_pdcp_config_t cfg_tx = { + srslte::pdcp_entity_nr pdcp_tx; + srslte::pdcp_entity_nr pdcp_rx; + srslte::pdcp_config_t cfg_tx = { 1, srslte::PDCP_RB_IS_DRB, srslte::SECURITY_DIRECTION_UPLINK, srslte::SECURITY_DIRECTION_DOWNLINK, pdcp_sn_len}; - srslte::srslte_pdcp_config_t cfg_rx = { + srslte::pdcp_config_t cfg_rx = { 1, srslte::PDCP_RB_IS_DRB, srslte::SECURITY_DIRECTION_DOWNLINK, srslte::SECURITY_DIRECTION_UPLINK, pdcp_sn_len}; rlc_dummy rlc_tx(log); diff --git a/srsenb/hdr/stack/upper/pdcp.h b/srsenb/hdr/stack/upper/pdcp.h index df9918fa9..2b62b6d26 100644 --- a/srsenb/hdr/stack/upper/pdcp.h +++ b/srsenb/hdr/stack/upper/pdcp.h @@ -28,10 +28,8 @@ #define SRSENB_PDCP_H namespace srsenb { - -class pdcp : public pdcp_interface_rlc, - public pdcp_interface_gtpu, - public pdcp_interface_rrc + +class pdcp : public pdcp_interface_rlc, public pdcp_interface_gtpu, public pdcp_interface_rrc { public: pdcp(srslte::log* pdcp_log_); @@ -48,7 +46,7 @@ public: void add_user(uint16_t rnti); void rem_user(uint16_t rnti); void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu); - void add_bearer(uint16_t rnti, uint32_t lcid, srslte::srslte_pdcp_config_t cnfg); + void add_bearer(uint16_t rnti, uint32_t lcid, srslte::pdcp_config_t cnfg); void config_security(uint16_t rnti, uint32_t lcid, uint8_t* k_rrc_enc_, diff --git a/srsenb/src/stack/rrc/rrc.cc b/srsenb/src/stack/rrc/rrc.cc index bb5e3933b..6a1820f92 100644 --- a/srsenb/src/stack/rrc/rrc.cc +++ b/srsenb/src/stack/rrc/rrc.cc @@ -193,7 +193,7 @@ void rrc::add_user(uint16_t rnti) } if (rnti == SRSLTE_MRNTI) { - srslte::srslte_pdcp_config_t cfg = { + srslte::pdcp_config_t cfg = { .bearer_id = 1, .rb_type = srslte::PDCP_RB_IS_DRB, .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, @@ -1532,11 +1532,11 @@ void rrc::ue::send_connection_setup(bool is_setup) parent->rlc->add_bearer(rnti, 1, srslte::rlc_config_t::srb_config(1)); // Configure SRB1 in PDCP - srslte::srslte_pdcp_config_t pdcp_cnfg{.bearer_id = 1, - .rb_type = srslte::PDCP_RB_IS_SRB, - .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, - .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, - .sn_len = srslte::PDCP_SN_LEN_5}; + srslte::pdcp_config_t pdcp_cnfg{.bearer_id = 1, + .rb_type = srslte::PDCP_RB_IS_SRB, + .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, + .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, + .sn_len = srslte::PDCP_SN_LEN_5}; parent->pdcp->add_bearer(rnti, 1, pdcp_cnfg); // Configure PHY layer @@ -1741,11 +1741,11 @@ void rrc::ue::send_connection_reconf(srslte::unique_byte_buffer_t pdu) parent->rlc->add_bearer(rnti, 2, srslte::rlc_config_t::srb_config(2)); // Configure SRB2 in PDCP - srslte::srslte_pdcp_config_t pdcp_cnfg_srb = {.bearer_id = 2, - .rb_type = srslte::PDCP_RB_IS_SRB, - .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, - .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, - .sn_len = srslte::PDCP_SN_LEN_5}; + srslte::pdcp_config_t pdcp_cnfg_srb = {.bearer_id = 2, + .rb_type = srslte::PDCP_RB_IS_SRB, + .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, + .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, + .sn_len = srslte::PDCP_SN_LEN_5}; parent->pdcp->add_bearer(rnti, 2, pdcp_cnfg_srb); parent->pdcp->config_security(rnti, 2, k_rrc_enc, k_rrc_int, k_up_enc, cipher_algo, integ_algo); parent->pdcp->enable_integrity(rnti, 2); @@ -1755,11 +1755,11 @@ void rrc::ue::send_connection_reconf(srslte::unique_byte_buffer_t pdu) parent->rlc->add_bearer(rnti, 3, srslte::make_rlc_config_t(conn_reconf->rr_cfg_ded.drb_to_add_mod_list[0].rlc_cfg)); // Configure DRB1 in PDCP - srslte::srslte_pdcp_config_t pdcp_cnfg_drb = {.bearer_id = 1, - .rb_type = srslte::PDCP_RB_IS_DRB, - .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, - .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, - .sn_len = srslte::PDCP_SN_LEN_12}; + srslte::pdcp_config_t pdcp_cnfg_drb = {.bearer_id = 1, + .rb_type = srslte::PDCP_RB_IS_DRB, + .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, + .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, + .sn_len = srslte::PDCP_SN_LEN_12}; if (conn_reconf->rr_cfg_ded.drb_to_add_mod_list[0].pdcp_cfg.rlc_um_present) { if (conn_reconf->rr_cfg_ded.drb_to_add_mod_list[0].pdcp_cfg.rlc_um.pdcp_sn_size.value == pdcp_cfg_s::rlc_um_s_::pdcp_sn_size_e_::len7bits) { @@ -1823,7 +1823,7 @@ void rrc::ue::send_connection_reconf_new_bearer(LIBLTE_S1AP_E_RABTOBESETUPLISTBE parent->rlc->add_bearer(rnti, lcid, srslte::make_rlc_config_t(drb_item.rlc_cfg)); // Configure DRB in PDCP - srslte::srslte_pdcp_config_t pdcp_config = { + srslte::pdcp_config_t pdcp_config = { .bearer_id = (uint8_t)(drb_item.drb_id - 1), // TODO: Review all ID mapping LCID DRB ERAB EPSBID Mapping .rb_type = srslte::PDCP_RB_IS_DRB, .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, diff --git a/srsenb/src/stack/upper/pdcp.cc b/srsenb/src/stack/upper/pdcp.cc index c75a81b48..685633236 100644 --- a/srsenb/src/stack/upper/pdcp.cc +++ b/srsenb/src/stack/upper/pdcp.cc @@ -82,7 +82,7 @@ void pdcp::rem_user(uint16_t rnti) pthread_rwlock_unlock(&rwlock); } -void pdcp::add_bearer(uint16_t rnti, uint32_t lcid, srslte::srslte_pdcp_config_t cfg) +void pdcp::add_bearer(uint16_t rnti, uint32_t lcid, srslte::pdcp_config_t cfg) { pthread_rwlock_rdlock(&rwlock); if (users.count(rnti)) {