From 2449f901f0e1a3ec6abb884b6677592187856201 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 2 Jul 2019 18:02:33 +0100 Subject: [PATCH] Fixed error in setting Kint in pdcp_entity_lte. --- lib/include/srslte/upper/pdcp_entity_lte.h | 8 ++++---- lib/src/upper/pdcp_entity_base.cc | 3 ++- lib/src/upper/pdcp_entity_lte.cc | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/include/srslte/upper/pdcp_entity_lte.h b/lib/include/srslte/upper/pdcp_entity_lte.h index e59fc005e..a4d0a2349 100644 --- a/lib/include/srslte/upper/pdcp_entity_lte.h +++ b/lib/include/srslte/upper/pdcp_entity_lte.h @@ -72,11 +72,11 @@ private: srsue::rrc_interface_pdcp* rrc = nullptr; srsue::gw_interface_pdcp* gw = nullptr; - srslte_pdcp_config_lte_t cfg = {}; - uint8_t sn_len_bytes = 0; + srslte_pdcp_config_lte_t cfg = {}; + uint8_t sn_len_bytes = 0; - uint32_t rx_count = 0; - uint32_t tx_count = 0; + uint32_t rx_count = 0; + uint32_t tx_count = 0; uint32_t rx_hfn = 0; uint32_t next_pdcp_rx_sn = 0; diff --git a/lib/src/upper/pdcp_entity_base.cc b/lib/src/upper/pdcp_entity_base.cc index 005cc8b65..90f2a9afc 100644 --- a/lib/src/upper/pdcp_entity_base.cc +++ b/lib/src/upper/pdcp_entity_base.cc @@ -35,12 +35,13 @@ void pdcp_entity_base::config_security(uint8_t* k_rrc_enc_, CIPHERING_ALGORITHM_ID_ENUM cipher_algo_, INTEGRITY_ALGORITHM_ID_ENUM integ_algo_) { + // TODO add mutex for (int i = 0; i < 32; i++) { k_rrc_enc[i] = k_rrc_enc_[i]; k_rrc_int[i] = k_rrc_int_[i]; k_up_enc[i] = k_up_enc_[i]; - if (k_up_int != nullptr) { + if (k_up_int_ != nullptr) { k_up_int[i] = k_up_int_[i]; } } diff --git a/lib/src/upper/pdcp_entity_lte.cc b/lib/src/upper/pdcp_entity_lte.cc index 50b94cd48..a2be65949 100644 --- a/lib/src/upper/pdcp_entity_lte.cc +++ b/lib/src/upper/pdcp_entity_lte.cc @@ -51,6 +51,8 @@ void pdcp_entity_lte::init(srsue::rlc_interface_pdcp* rlc_, // set length of SN field in bytes sn_len_bytes = (cfg.sn_len == 5) ? 1 : 2; + + rb_is_control = cfg.is_control; if (cfg.is_control) { reordering_window = 0;