fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mux: fix packing of short MAC PDUs

This commit is contained in:
Andre Puschmann 2019-06-26 11:05:04 +02:00
parent dffbc4404f
commit 82a69fb51c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/srslte/common/pdu.h
View File

@ -101,7 +101,7 @@ public:
if (nof_subheaders > 0) {
nof_subheaders--;
}
if (cur_idx > 0) {
if (cur_idx >= 0) {
cur_idx--;
}
}

2
lib/src/common/pdu.cc
View File

@ -126,7 +126,7 @@ uint8_t* sch_pdu::write_packet(srslte::log* log_h)
for (uint32_t i = 0; i < onetwo_padding; i++) {
sch_subh padding;
padding.set_padding();
padding.write_subheader(&ptr, false);
padding.write_subheader(&ptr, pdu_len > onetwo_padding ? false : true);
}
// Then write subheaders for MAC CE

4
srsue/src/stack/mac/mux.cc
View File

@ -326,13 +326,15 @@ bool mux::allocate_sdu(uint32_t lcid, srslte::sch_pdu* pdu_msg, int max_sdu_sz)
buffer_state = rlc->get_buffer_state(lcid);
} else {
Warning("SDU: rlc_buffer=%d, requested_sdu_len=%d, allocated=%d/%d, remaining=%d\n",
Warning("Couldn't allocate new SDU (rlc_buffer=%d, requested_sdu_len=%d, allocated=%d/%d, remaining=%d)\n",
buffer_state,
requested_sdu_len,
sdu_len,
sdu_space,
pdu_msg->rem_size());
pdu_msg->del_subh();
// prevent endless loop
break;
}
} else {
Debug("Couldn't add new MAC subheader (rlc_buffer=%d, requested_sdu_len=%d, sdu_space=%d, remaining=%d)\n",