PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed rx_count state variable from PDCP LTE entity. Updated get_bearer_status(...) acordingly. Added get_last_submitted_rx_count() getter.

This commit is contained in:
Pedro Alvarez 2020-04-03 12:06:48 +01:00 committed by Andre Puschmann
parent 70b13198b2
commit f4d648b26e
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/include/srslte/upper/pdcp_entity_lte.h
View File

@ -60,8 +60,8 @@ public:
void write_sdu(unique_byte_buffer_t sdu, bool blocking);
void get_bearer_status(uint16_t* dlsn, uint16_t* dlhfn, uint16_t* ulsn, uint16_t* ulhfn);
uint32_t get_dl_count();
uint32_t get_ul_count();
uint32_t get_last_submitted_rx_count();
// RLC interface
void write_pdu(unique_byte_buffer_t pdu);
@ -80,7 +80,6 @@ private:
srsue::rrc_interface_pdcp* rrc = nullptr;
srsue::gw_interface_pdcp* gw = nullptr;
uint32_t rx_count = 0;
uint32_t tx_count = 0;
uint32_t rx_hfn = 0;

33
lib/src/upper/pdcp_entity_lte.cc
View File

@ -44,7 +44,6 @@ void pdcp_entity_lte::init(uint32_t lcid_, pdcp_config_t cfg_)
cfg = cfg_;
active = true;
tx_count = 0;
rx_count = 0;
integrity_direction = DIRECTION_NONE;
encryption_direction = DIRECTION_NONE;
@ -72,17 +71,15 @@ void pdcp_entity_lte::reestablish()
log->info("Re-establish %s with bearer ID: %d\n", rrc->get_rb_name(lcid).c_str(), cfg.bearer_id);
// For SRBs
if (is_srb()) {
tx_count = 0;
rx_count = 0;
rx_hfn = 0;
next_pdcp_rx_sn = 0;
tx_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;
tx_count = 0;
rx_hfn = 0;
next_pdcp_rx_sn = 0;
}
}
}
@ -197,8 +194,6 @@ void pdcp_entity_lte::handle_srb_pdu(srslte::unique_byte_buffer_t pdu)
}
}
rx_count = sn;
// Discard header
discard_data_header(pdu);
@ -234,8 +229,6 @@ void pdcp_entity_lte::handle_um_drb_pdu(srslte::unique_byte_buffer_t pdu)
log->debug_hex(pdu->msg, pdu->N_bytes, "%s Rx PDU (decrypted)", rrc->get_rb_name(lcid).c_str());
}
rx_count = sn;
next_pdcp_rx_sn = sn + 1;
if (next_pdcp_rx_sn > maximum_pdcp_sn) {
next_pdcp_rx_sn = 0;
@ -302,8 +295,6 @@ void pdcp_entity_lte::handle_am_drb_pdu(srslte::unique_byte_buffer_t pdu)
// Update info on last PDU submitted to upper layers
last_submitted_pdcp_rx_sn = sn;
rx_count = sn;
// Pass to upper layers
log->info_hex(pdu->msg, pdu->N_bytes, "%s Rx PDU SN=%d", rrc->get_rb_name(lcid).c_str(), sn);
gw->write_pdu(lcid, std::move(pdu));
@ -312,9 +303,9 @@ void pdcp_entity_lte::handle_am_drb_pdu(srslte::unique_byte_buffer_t pdu)
/****************************************************************************
* Security functions
***************************************************************************/
uint32_t pdcp_entity_lte::get_dl_count()
uint32_t pdcp_entity_lte::get_last_submitted_rx_count()
{
return rx_count;
return COUNT(rx_hfn, last_submitted_pdcp_rx_sn);
}
uint32_t pdcp_entity_lte::get_ul_count()
@ -328,20 +319,16 @@ void pdcp_entity_lte::get_bearer_status(uint16_t* dlsn, uint16_t* dlhfn, uint16_
if (12 == cfg.sn_len) {
*dlsn = (uint16_t)(tx_count & 0xFFFu);
*dlhfn = (uint16_t)((tx_count - *dlsn) >> 12u);
*ulsn = (uint16_t)(rx_count & 0xFFFu);
*ulhfn = (uint16_t)((rx_count - *ulsn) >> 12u);
} else {
*dlsn = (uint16_t)(tx_count & 0x7Fu);
*dlhfn = (uint16_t)((tx_count - *dlsn) >> 7u);
*ulsn = (uint16_t)(rx_count & 0x7Fu);
*ulhfn = (uint16_t)((rx_count - *ulsn) >> 7u);
}
} else { // is control
*dlsn = (uint16_t)(tx_count & 0x1Fu);
*dlhfn = (uint16_t)((tx_count - *dlsn) >> 5u);
*ulsn = (uint16_t)(rx_count & 0x1Fu);
*ulhfn = (uint16_t)((rx_count - *ulsn) >> 5u);
}
*ulsn = (uint16_t)next_pdcp_rx_sn;
*ulhfn = (uint16_t)rx_hfn;
}
} // namespace srslte