From 1944bf9a805021492a198dad1177d765c9af0320 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 2 Jul 2019 15:47:25 +0100 Subject: [PATCH] Continue to split pdcp_entity_lte and pdcp_entity_nr. Compiling now. --- lib/include/srslte/common/interfaces_common.h | 26 ++ lib/include/srslte/upper/pdcp.h | 5 +- lib/include/srslte/upper/pdcp_entity_lte.h | 4 +- lib/include/srslte/upper/pdcp_entity_nr.h | 3 +- lib/src/upper/pdcp_entity_lte.cc | 4 +- lib/src/upper/pdcp_entity_nr.cc | 302 +----------------- srsue/test/upper/nas_test.cc | 4 +- 7 files changed, 41 insertions(+), 307 deletions(-) diff --git a/lib/include/srslte/common/interfaces_common.h b/lib/include/srslte/common/interfaces_common.h index c666a5496..e7fff3ebc 100644 --- a/lib/include/srslte/common/interfaces_common.h +++ b/lib/include/srslte/common/interfaces_common.h @@ -92,6 +92,32 @@ public: // bool do_rohc; }; +class srslte_pdcp_config_nr_t +{ +public: + srslte_pdcp_config_nr_t(uint8_t bearer_id_ = 0, + bool is_control_ = false, + bool is_data_ = false, + uint8_t direction_ = SECURITY_DIRECTION_UPLINK, + uint8_t sn_len_ = 12) : + bearer_id(bearer_id_), + direction(direction_), + is_control(is_control_), + is_data(is_data_), + sn_len(sn_len_) + { + } + + uint32_t bearer_id; + uint8_t direction; + bool is_control; + bool is_data; + uint8_t sn_len; + + // TODO: Support the following configurations + // bool do_rohc; +}; + class mac_interface_timers { public: diff --git a/lib/include/srslte/upper/pdcp.h b/lib/include/srslte/upper/pdcp.h index 184204298..4cd5b87d0 100644 --- a/lib/include/srslte/upper/pdcp.h +++ b/lib/include/srslte/upper/pdcp.h @@ -29,10 +29,7 @@ namespace srslte { -class pdcp - :public srsue::pdcp_interface_gw - ,public srsue::pdcp_interface_rlc - ,public srsue::pdcp_interface_rrc +class pdcp : public srsue::pdcp_interface_gw, public srsue::pdcp_interface_rlc, public srsue::pdcp_interface_rrc { public: pdcp(log* log_); diff --git a/lib/include/srslte/upper/pdcp_entity_lte.h b/lib/include/srslte/upper/pdcp_entity_lte.h index 604b60b41..e59fc005e 100644 --- a/lib/include/srslte/upper/pdcp_entity_lte.h +++ b/lib/include/srslte/upper/pdcp_entity_lte.h @@ -28,7 +28,7 @@ #include "srslte/interfaces/ue_interfaces.h" #include "srslte/common/security.h" #include "srslte/common/threads.h" -#include "pdcp_entity_base.h" +#include "srslte/upper/pdcp_entity_base.h" namespace srslte { @@ -58,8 +58,6 @@ public: void reset(); void reestablish(); - bool is_active(); - // GW/RRC interface void write_sdu(unique_byte_buffer_t sdu, bool blocking); diff --git a/lib/include/srslte/upper/pdcp_entity_nr.h b/lib/include/srslte/upper/pdcp_entity_nr.h index 5503d51ad..367c7ee6c 100644 --- a/lib/include/srslte/upper/pdcp_entity_nr.h +++ b/lib/include/srslte/upper/pdcp_entity_nr.h @@ -30,7 +30,6 @@ #include "srslte/common/threads.h" #include "pdcp_entity_base.h" - namespace srslte { /**************************************************************************** @@ -73,6 +72,8 @@ private: srsue::rrc_interface_pdcp* rrc = nullptr; srsue::gw_interface_pdcp* gw = nullptr; + srslte_pdcp_config_nr_t cfg; + uint32_t rx_count = 0; uint32_t tx_count = 0; diff --git a/lib/src/upper/pdcp_entity_lte.cc b/lib/src/upper/pdcp_entity_lte.cc index 02c07058e..50b94cd48 100644 --- a/lib/src/upper/pdcp_entity_lte.cc +++ b/lib/src/upper/pdcp_entity_lte.cc @@ -227,7 +227,7 @@ void pdcp_entity_lte::handle_um_drb_pdu(const srslte::unique_byte_buffer_t &pdu) uint32_t count = (rx_hfn << cfg.sn_len) | sn; if (do_encryption) { - cipher_decrypt(pdu->msg, count, pdu->N_bytes, pdu->msg); + cipher_decrypt(pdu->msg, pdu->N_bytes, count, cfg.bearer_id, cfg.direction, pdu->msg); log->debug_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str()); } @@ -289,7 +289,7 @@ void pdcp_entity_lte::handle_am_drb_pdu(const srslte::unique_byte_buffer_t &pdu) } // FIXME Check if PDU is not due to re-establishment of lower layers? - cipher_decrypt(pdu->msg, count, pdu->N_bytes, pdu->msg); + cipher_decrypt(pdu->msg, pdu->N_bytes, count, cfg.bearer_id, cfg.direction, pdu->msg); log->debug_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str()); if (!discard) { diff --git a/lib/src/upper/pdcp_entity_nr.cc b/lib/src/upper/pdcp_entity_nr.cc index ba4366eb7..35de3e191 100644 --- a/lib/src/upper/pdcp_entity_nr.cc +++ b/lib/src/upper/pdcp_entity_nr.cc @@ -30,14 +30,14 @@ pdcp_entity_nr::~pdcp_entity_nr() {} void pdcp_entity_nr::init(srsue::rlc_interface_pdcp* rlc_, srsue::rrc_interface_pdcp* rrc_, - srsue::sdap_interface_pdcp* sdap_, + srsue::gw_interface_pdcp* gw_, srslte::log* log_, uint32_t lcid_, - srslte_pdcp_nr_config_t cfg_) + srslte_pdcp_config_nr_t cfg_) { rlc = rlc_; rrc = rrc_; - sdap = sdap_; + gw = gw_; log = log_; lcid = lcid_; cfg = cfg_; @@ -45,54 +45,14 @@ void pdcp_entity_nr::init(srsue::rlc_interface_pdcp* rlc_, do_integrity = false; do_encryption = false; - cfg = cfg_; - - // set length of SN field in bytes - sn_len_bytes = (cfg.sn_len == 5) ? 1 : 2; - - if (cfg.is_control) { - reordering_window = 0; - } else if (cfg.is_data) { - reordering_window = 2048; - } - - rx_hfn = 0; - next_pdcp_rx_sn = 0; - maximum_pdcp_sn = (1 << cfg.sn_len) - 1; - last_submitted_pdcp_rx_sn = maximum_pdcp_sn; - log->info("Init %s with bearer ID: %d\n", rrc->get_rb_name(lcid).c_str(), cfg.bearer_id); - log->info("SN len bits: %d, SN len bytes: %d, reordering window: %d, Maximum SN %d\n", - cfg.sn_len, - sn_len_bytes, - reordering_window, - maximum_pdcp_sn); + // TODO } // Reestablishment procedure: 36.323 5.2 void pdcp_entity_nr::reestablish() { log->info("Re-establish %s with bearer ID: %d\n", rrc->get_rb_name(lcid).c_str(), cfg.bearer_id); - // For SRBs - if (cfg.is_control) { - tx_count = 0; - rx_count = 0; - rx_hfn = 0; - next_pdcp_rx_sn = 0; - } else { - // Only reset counter in RLC-UM - if (rlc->rb_is_um(lcid)) { - tx_count = 0; - rx_count = 0; - rx_hfn = 0; - next_pdcp_rx_sn = 0; - } else { - tx_count = 0; - rx_count = 0; - rx_hfn = 0; - next_pdcp_rx_sn = 0; - last_submitted_pdcp_rx_sn = maximum_pdcp_sn; - } - } + // For TODO } // Used to stop/pause the entity (called on RRC conn release) @@ -112,36 +72,7 @@ void pdcp_entity_nr::write_sdu(unique_byte_buffer_t sdu, bool blocking) rrc->get_rb_name(lcid).c_str(), tx_count, (do_integrity) ? "true" : "false", (do_encryption) ? "true" : "false"); - pthread_mutex_lock(&mutex); - - if (cfg.is_control) { - pdcp_pack_control_pdu(tx_count, sdu.get()); - if(do_integrity) { - integrity_generate(sdu->msg, - sdu->N_bytes-4, - &sdu->msg[sdu->N_bytes-4]); - } - } - - if (cfg.is_data) { - if(12 == cfg.sn_len) { - pdcp_pack_data_pdu_long_sn(tx_count, sdu.get()); - } else { - pdcp_pack_data_pdu_short_sn(tx_count, sdu.get()); - } - } - - if(do_encryption) { - cipher_encrypt(&sdu->msg[sn_len_bytes], - sdu->N_bytes-sn_len_bytes, - &sdu->msg[sn_len_bytes]); - log->info_hex(sdu->msg, sdu->N_bytes, "TX %s SDU (encrypted)", rrc->get_rb_name(lcid).c_str()); - } - tx_count++; - - pthread_mutex_unlock(&mutex); - - rlc->write_sdu(lcid, std::move(sdu), blocking); + // TODO } // RLC interface @@ -155,226 +86,7 @@ void pdcp_entity_nr::write_pdu(unique_byte_buffer_t pdu) (do_integrity) ? "true" : "false", (do_encryption) ? "true" : "false"); - // Sanity check - if (pdu->N_bytes < sn_len_bytes) { - log->debug("Ignoring PDCP PDU: size=%d, sn_len_bytes=%d\n", pdu->N_bytes, sn_len_bytes); - return; - } - - - pthread_mutex_lock(&mutex); - - if (cfg.is_data) { - - // Check PDCP control messages - if ((pdu->msg[0] & 0x80) == 0) { - log->debug("Unhandled PDCP Control PDU\n"); - goto exit; // TODO handle PDCP control PDUs - } - - // Handle DRB messages - if (rlc->rb_is_um(lcid)) { - handle_um_drb_pdu(pdu); - } else { - handle_am_drb_pdu(pdu); - } - gw->write_pdu(lcid, std::move(pdu)); - } else { - // Handle SRB messages - if (cfg.is_control) { - uint32_t sn = *pdu->msg & 0x1F; - if (do_encryption) { - cipher_decrypt(&pdu->msg[sn_len_bytes], sn, pdu->N_bytes - sn_len_bytes, &(pdu->msg[sn_len_bytes])); - log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str()); - } - - if (do_integrity) { - if (not integrity_verify(pdu->msg, sn, pdu->N_bytes - 4, &(pdu->msg[pdu->N_bytes - 4]))) { - log->error_hex(pdu->msg, pdu->N_bytes, "%s Dropping PDU", rrc->get_rb_name(lcid).c_str()); - goto exit; - } - } - - pdcp_unpack_control_pdu(pdu.get(), &sn); - log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU SN: %d", rrc->get_rb_name(lcid).c_str(), sn); - } - // pass to RRC - rrc->write_pdu(lcid, std::move(pdu)); - } -exit: - rx_count++; - pthread_mutex_unlock(&mutex); -} - -/**************************************************************************** - * Rx data/control handler functions - * Ref: 3GPP TS 36.323 v10.1.0 Section 5.1.2 - ***************************************************************************/ -// DRBs mapped on RLC UM (5.1.2.1.3) -void pdcp_entity_nr::handle_um_drb_pdu(const srslte::unique_byte_buffer_t &pdu) -{ - uint32_t sn; - if (12 == cfg.sn_len) { - pdcp_unpack_data_pdu_long_sn(pdu.get(), &sn); - } else { - pdcp_unpack_data_pdu_short_sn(pdu.get(), &sn); - } - - if (sn < next_pdcp_rx_sn) { - rx_hfn++; - } - - uint32_t count = (rx_hfn << cfg.sn_len) | sn; - if (do_encryption) { - cipher_decrypt(pdu->msg, count, pdu->N_bytes, pdu->msg); - log->debug_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str()); - } - - next_pdcp_rx_sn = sn + 1; - if (next_pdcp_rx_sn > maximum_pdcp_sn) { - next_pdcp_rx_sn = 0; - rx_hfn++; - } - - log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU SN: %d", rrc->get_rb_name(lcid).c_str(), sn); - return; -} - -// DRBs mapped on RLC AM, without re-ordering (5.1.2.1.2) -void pdcp_entity_nr::handle_am_drb_pdu(const srslte::unique_byte_buffer_t &pdu) -{ - uint32_t sn, count; - pdcp_unpack_data_pdu_long_sn(pdu.get(), &sn); - - int32_t last_submit_diff_sn = last_submitted_pdcp_rx_sn - sn; - int32_t sn_diff_last_submit = sn - last_submitted_pdcp_rx_sn; - int32_t sn_diff_next_pdcp_rx_sn = sn - next_pdcp_rx_sn; - - log->debug("RX HFN: %d, SN: %d, Last_Submitted_PDCP_RX_SN: %d, Next_PDCP_RX_SN %d\n", - rx_hfn, - sn, - last_submitted_pdcp_rx_sn, - next_pdcp_rx_sn); - - bool discard = false; - if ((0 <= sn_diff_last_submit && sn_diff_last_submit > (int32_t)reordering_window) || - (0 <= last_submit_diff_sn && last_submit_diff_sn < (int32_t)reordering_window)) { - log->debug("|SN - last_submitted_sn| is larger than re-ordering window.\n"); - if (sn > next_pdcp_rx_sn) { - count = (rx_hfn - 1) << cfg.sn_len | sn; - } else { - count = rx_hfn << cfg.sn_len | sn; - } - discard = true; - } else if ((int32_t)(next_pdcp_rx_sn - sn) > (int32_t)reordering_window) { - log->debug("(Next_PDCP_RX_SN - SN) is larger than re-ordering window.\n"); - rx_hfn++; - count = (rx_hfn << cfg.sn_len) | sn; - next_pdcp_rx_sn = sn + 1; - } else if (sn_diff_next_pdcp_rx_sn >= (int32_t)reordering_window) { - log->debug("(SN - Next_PDCP_RX_SN) is larger or equal than re-ordering window.\n"); - count = ((rx_hfn - 1) << cfg.sn_len) | sn; - } else if (sn >= next_pdcp_rx_sn) { - log->debug("SN is larger or equal than Next_PDCP_RX_SN.\n"); - count = (rx_hfn << cfg.sn_len) | sn; - next_pdcp_rx_sn = sn + 1; - if (next_pdcp_rx_sn > maximum_pdcp_sn) { - next_pdcp_rx_sn = 0; - rx_hfn++; - } - } else if (sn < next_pdcp_rx_sn) { - log->debug("SN is smaller than Next_PDCP_RX_SN.\n"); - count = (rx_hfn << cfg.sn_len) | sn; - } - - // FIXME Check if PDU is not due to re-establishment of lower layers? - cipher_decrypt(pdu->msg, count, pdu->N_bytes, pdu->msg); - log->debug_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str()); - - if (!discard) { - last_submitted_pdcp_rx_sn = sn; - } - return; -} - -/**************************************************************************** - * Security functions - ***************************************************************************/ -uint32_t pdcp_entity::get_dl_count() -{ - return rx_count; -} - - -uint32_t pdcp_entity::get_ul_count() -{ - return tx_count; -} - -/**************************************************************************** - * Pack/Unpack helper functions - * Ref: 3GPP TS 38.323 v15.2.0 - ***************************************************************************/ -void pdcp_pack_control_pdu(uint32_t sn, byte_buffer_t *sdu) -{ - // Make room and add header - sdu->msg--; - sdu->N_bytes++; - *sdu->msg = sn & 0x1F; - - // Pack FMC - sdu->msg[sdu->N_bytes++] = (PDCP_CONTROL_MAC_I >> 24) & 0xFF; - sdu->msg[sdu->N_bytes++] = (PDCP_CONTROL_MAC_I >> 16) & 0xFF; - sdu->msg[sdu->N_bytes++] = (PDCP_CONTROL_MAC_I >> 8) & 0xFF; - sdu->msg[sdu->N_bytes++] = PDCP_CONTROL_MAC_I & 0xFF; - -} - -void pdcp_unpack_control_pdu(byte_buffer_t *pdu, uint32_t *sn) -{ - // Strip header - *sn = *pdu->msg & 0x1F; - pdu->msg++; - pdu->N_bytes--; - - // Strip MAC - pdu->N_bytes -= 4; - - // TODO: integrity check MAC -} - -void pdcp_pack_data_pdu_short_sn(uint32_t sn, byte_buffer_t *sdu) -{ - // Make room and add header - sdu->msg--; - sdu->N_bytes++; - sdu->msg[0] = (PDCP_D_C_DATA_PDU << 7) | (sn & 0x7F); -} - -void pdcp_unpack_data_pdu_short_sn(byte_buffer_t *sdu, uint32_t *sn) -{ - // Strip header - *sn = sdu->msg[0] & 0x7F; - sdu->msg++; - sdu->N_bytes--; -} - -void pdcp_pack_data_pdu_long_sn(uint32_t sn, byte_buffer_t *sdu) -{ - // Make room and add header - sdu->msg -= 2; - sdu->N_bytes += 2; - sdu->msg[0] = (PDCP_D_C_DATA_PDU << 7) | ((sn >> 8) & 0x0F); - sdu->msg[1] = sn & 0xFF; -} - -void pdcp_unpack_data_pdu_long_sn(byte_buffer_t *sdu, uint32_t *sn) -{ - // Strip header - *sn = (sdu->msg[0] & 0x0F) << 8; - *sn |= sdu->msg[1]; - sdu->msg += 2; - sdu->N_bytes -= 2; + // TODO } } diff --git a/srsue/test/upper/nas_test.cc b/srsue/test/upper/nas_test.cc index d8663ad44..9cfc2601d 100644 --- a/srsue/test/upper/nas_test.cc +++ b/srsue/test/upper/nas_test.cc @@ -23,7 +23,7 @@ #include "srslte/common/log_filter.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/upper/pdcp.h" -#include "srslte/upper/pdcp_entity.h" +#include "srslte/upper/pdcp_entity_lte.h" #include "srslte/upper/rlc.h" #include "srsue/hdr/stack/mac/mac.h" #include "srsue/hdr/stack/rrc/rrc.h" @@ -90,7 +90,7 @@ public: void write_pdu_mch(uint32_t lcid, srslte::unique_byte_buffer_t sdu) {} std::string get_rb_name(uint32_t lcid) { return std::string("lcid"); } void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, bool blocking) {} - bool is_lcid_enabled(uint32_t lcid) { return false; } + bool is_lcid_enabled(uint32_t lcid) { return false; } }; class rrc_dummy : public rrc_interface_nas