brmlab/osmo-tetra
4
0
Fork 0
mirror of https://github.com/brmlab/osmo-tetra.git synced 2025-06-09 02:14:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

MAC: correctly decode length of MAC PDU

Browse source
This commit is contained in:
Harald Welte 2011-04-24 08:07:27 +02:00
parent c547e9f0de
commit 863c31401b
3 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tetra_upper_mac.c
View file

@ -114,8 +114,8 @@ static void rx_resrc(struct tetra_tmvsap_prim *tmvp)
memset(&rsd, 0, sizeof(rsd));
tmpdu_offset = macpdu_decode_resource(&rsd, tup->mac_block);
printf("RESOURCE Encr=%u, Length_ind=%u Addr=%s ",
rsd.encryption_mode, rsd.length_ind,
printf("RESOURCE Encr=%u, Length=%d Addr=%s ",
rsd.encryption_mode, rsd.macpdu_length,
tetra_addr_dump(&rsd.addr));
if (rsd.chan_alloc_pres)
@ -125,8 +125,8 @@ static void rx_resrc(struct tetra_tmvsap_prim *tmvp)
printf("SlotGrant=%u/%u\n", rsd.slot_granting.nr_slots,
rsd.slot_granting.delay);
if (rsd.length_ind && rsd.encryption_mode == 0) {
int len_bits = rsd.length_ind*8;
if (rsd.macpdu_length > 0 && rsd.encryption_mode == 0) {
int len_bits = rsd.macpdu_length*8;
if (tup->mac_block + tmpdu_offset + len_bits >
tup->mac_block + tup->mac_block_len)
len_bits = tup->mac_block_len - tmpdu_offset;