laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41680?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Small bugfix in SYSINFO parsing ...................................................................... Small bugfix in SYSINFO parsing Small bugfix. We now increases the position in the SYSINFO read buffer when parsing hyperframe or cck number. Change-Id: Ic35f5106c096a7a3dd0d2302ad53fa00c69ab76d --- M src/tetra_mac_pdu.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/tetra_mac_pdu.c b/src/tetra_mac_pdu.c index 06c93ef..b81edcb 100644 --- a/src/tetra_mac_pdu.c +++ b/src/tetra_mac_pdu.c @@ -57,10 +57,11 @@ sid->access_parameter = bits_to_uint(cur, 4); cur += 4; sid->radio_dl_timeout = bits_to_uint(cur, 4); cur += 4; sid->cck_valid_no_hf = *cur++; - if (sid->cck_valid_no_hf) - sid->cck_id = bits_to_uint(cur, 16); - else - sid->hyperframe_number = bits_to_uint(cur, 16); + if (sid->cck_valid_no_hf) { + sid->cck_id = bits_to_uint(cur, 16); cur += 16; + } else { + sid->hyperframe_number = bits_to_uint(cur, 16); cur += 16; + } sid->option_field = bits_to_uint(cur, 2); cur += 2; switch (sid->option_field) { -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ic35f5106c096a7a3dd0d2302ad53fa00c69ab76d Gerrit-Change-Number: 41680 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag@midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de>