From 77d4197364bd97a1b81d106573c0094c3a89bd9b Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Wed, 29 May 2019 21:50:56 +0200 Subject: [PATCH] mac: make sure we only pull out valid rapid from subheader --- srsue/src/stack/mac/proc_ra.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srsue/src/stack/mac/proc_ra.cc b/srsue/src/stack/mac/proc_ra.cc index d563e8ece..fc1d673bf 100644 --- a/srsue/src/stack/mac/proc_ra.cc +++ b/srsue/src/stack/mac/proc_ra.cc @@ -326,7 +326,7 @@ void ra_proc::tb_decoded_ok() { current_ta = 0; while(rar_pdu_msg.next()) { - if (rar_pdu_msg.get()->get_rapid() == sel_preamble) { + if (rar_pdu_msg.get()->has_rapid() && rar_pdu_msg.get()->get_rapid() == sel_preamble) { rar_received = true; process_timeadv_cmd(rar_pdu_msg.get()->get_ta_cmd()); @@ -377,7 +377,9 @@ void ra_proc::tb_decoded_ok() { contention_resolution_timer->run(); } } else { - rInfo("Found RAR for preamble %d\n", rar_pdu_msg.get()->get_rapid()); + if (rar_pdu_msg.get()->has_rapid()) { + rInfo("Found RAR for preamble %d\n", rar_pdu_msg.get()->get_rapid()); + } } } }