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

Resolved conflicts with unique pointers after rebase in PDCP entity.

This commit is contained in:
Pedro Alvarez 2019-06-18 12:42:53 +01:00 committed by Andre Puschmann
parent 2643b9070f
commit 53d2220aab
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/include/srslte/upper/pdcp_entity.h
View File

@ -119,8 +119,8 @@ private:
pthread_mutex_t mutex; pthread_mutex_t mutex;
void handle_um_drb_pdu(srslte::byte_buffer_t *pdu); void handle_um_drb_pdu(const srslte::unique_byte_buffer_t& pdu);
void handle_am_drb_pdu(srslte::byte_buffer_t *pdu); void handle_am_drb_pdu(const srslte::unique_byte_buffer_t& pdu);
void integrity_generate(uint8_t *msg, void integrity_generate(uint8_t *msg,
uint32_t msg_len, uint32_t msg_len,

12
lib/src/upper/pdcp_entity.cc
View File

@ -221,7 +221,7 @@ void pdcp_entity::write_pdu(unique_byte_buffer_t pdu)
} else { } else {
handle_am_drb_pdu(pdu); handle_am_drb_pdu(pdu);
} }
gw->write_pdu(lcid, pdu); gw->write_pdu(lcid, std::move(pdu));
} else { } else {
// Handle SRB messages // Handle SRB messages
if (cfg.is_control) { if (cfg.is_control) {
@ -260,13 +260,13 @@ exit:
* Ref: 3GPP TS 36.323 v10.1.0 Section 5.1.2 * Ref: 3GPP TS 36.323 v10.1.0 Section 5.1.2
***************************************************************************/ ***************************************************************************/
// DRBs mapped on RLC UM (5.1.2.1.3) // DRBs mapped on RLC UM (5.1.2.1.3)
void pdcp_entity::handle_um_drb_pdu(srslte::byte_buffer_t* pdu) void pdcp_entity::handle_um_drb_pdu(const srslte::unique_byte_buffer_t &pdu)
{ {
uint32_t sn; uint32_t sn;
if (12 == cfg.sn_len) { if (12 == cfg.sn_len) {
pdcp_unpack_data_pdu_long_sn(pdu, &sn); pdcp_unpack_data_pdu_long_sn(pdu.get(), &sn);
} else { } else {
pdcp_unpack_data_pdu_short_sn(pdu, &sn); pdcp_unpack_data_pdu_short_sn(pdu.get(), &sn);
} }
if (sn < next_pdcp_rx_sn) { if (sn < next_pdcp_rx_sn) {
@ -290,10 +290,10 @@ void pdcp_entity::handle_um_drb_pdu(srslte::byte_buffer_t* pdu)
} }
// DRBs mapped on RLC AM, without re-ordering (5.1.2.1.2) // DRBs mapped on RLC AM, without re-ordering (5.1.2.1.2)
void pdcp_entity::handle_am_drb_pdu(srslte::byte_buffer_t* pdu) void pdcp_entity::handle_am_drb_pdu(const srslte::unique_byte_buffer_t &pdu)
{ {
uint32_t sn, count; uint32_t sn, count;
pdcp_unpack_data_pdu_long_sn(pdu, &sn); pdcp_unpack_data_pdu_long_sn(pdu.get(), &sn);
int32_t last_submit_diff_sn = last_submitted_pdcp_rx_sn - 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_last_submit = sn - last_submitted_pdcp_rx_sn;