avoid MSG3 assertion at MAC UE

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -306,16 +306,6 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot);
 void nr_schedule_csi_for_im(NR_UE_MAC_INST_t *mac, int frame, int slot);
 void schedule_ta_command(fapi_nr_dl_config_request_t *dl_config, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);
 
-/* \brief This function schedules the Msg3 transmission
-@param
-@param
-@param
-@returns void
-*/
-void nr_ue_msg3_scheduler(NR_UE_MAC_INST_t *mac,
-                          frame_t current_frame,
-                          sub_frame_t current_slot,
-                          uint8_t Msg3_tda_id);
 
 /* \brief Function called by PHY to process the received RAR and check that the preamble matches what was sent by the gNB. It provides the timing advance and t-CRNTI.
 @param Mod_id Index of UE instance
@@ -384,7 +374,7 @@ void set_ra_rnti(NR_UE_MAC_INST_t *mac, fapi_nr_ul_config_prach_pdu *prach_pdu);
 void nr_Msg1_transmitted(module_id_t mod_id);
 
 void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, slot_t slotP, uint8_t gNB_id);
-void nr_get_msg3_payload(module_id_t mod_id);
+bool nr_get_msg3_payload(module_id_t mod_id);
 void send_msg3_rrc_request(module_id_t mod_id, int rnti);
 
 void nr_ue_msg2_scheduler(module_id_t mod_id, uint16_t rach_frame, uint16_t rach_slot, uint16_t *msg2_frame, uint16_t *msg2_slot);

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -607,7 +607,7 @@ void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, slot
   ra->ra_state = WAIT_CONTENTION_RESOLUTION;
 }
 
-void nr_get_msg3_payload(module_id_t mod_id)
+bool nr_get_msg3_payload(module_id_t mod_id)
 {
   NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
   RA_config_t *ra = &mac->ra;
@@ -627,7 +627,10 @@ void nr_get_msg3_payload(module_id_t mod_id)
                                     (char *)pdu,
                                     0,
                                     0);
-  AssertFatal(len > 0, "no data for Msg.3\n");
+  if (len <= 0) {
+    LOG_E(NR_MAC, "No data for Msg.3\n");
+    return false;
+  }
   // UE Contention Resolution Identity
   // Store the first 48 bits belonging to the uplink CCCH SDU within Msg3 to determine whether or not the
   // Random Access Procedure has been successful after reception of Msg4
@@ -651,6 +654,7 @@ void nr_get_msg3_payload(module_id_t mod_id)
   LOG_D(NR_MAC, "Dumping UL Msg3 MAC PDU with length %d: \n", TBS_max);
   for(int k = 0; k < TBS_max; k++)
     LOG_D(NR_MAC,"(%i): %i\n", k, pdu[k]);
+  return true;
 }
 
 /**

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1031,19 +1031,18 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
         fapi_nr_ul_config_request_pdu_t *ulcfg_pdu = &ul_config->ul_config_list[j];
 
         if (ulcfg_pdu->pdu_type == FAPI_NR_UL_CONFIG_TYPE_PUSCH) {
-          int mac_pdu_exist = 0;
+          bool mac_pdu_exist = false;
           uint16_t TBS_bytes = ulcfg_pdu->pusch_config_pdu.pusch_data.tb_size;
           LOG_D(NR_MAC,"harq_id %d, new_data_indicator %d, TBS_bytes %d (ra_state %d)\n",
                 ulcfg_pdu->pusch_config_pdu.pusch_data.harq_process_id,
                 ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator,
                 TBS_bytes,ra->ra_state);
           if (ra->ra_state == WAIT_RAR && !ra->cfra) {
-            nr_get_msg3_payload(mod_id);
+            mac_pdu_exist = nr_get_msg3_payload(mod_id);
             memcpy(ulsch_input_buffer, mac->CCCH_pdu.payload, TBS_bytes);
             for (int k = 0; k < TBS_bytes; k++) {
               LOG_D(NR_MAC,"(%i): 0x%x\n", k, ulsch_input_buffer[k]);
             }
-            mac_pdu_exist = 1;
           } else {
 
             if (ulcfg_pdu->pusch_config_pdu.pusch_data.new_data_indicator &&
@@ -1052,7 +1051,7 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
 
               // Getting IP traffic to be transmitted
               nr_ue_get_sdu(mod_id, cc_id,frame_tx, slot_tx, gNB_index, ulsch_input_buffer, TBS_bytes);
-              mac_pdu_exist = 1;
+              mac_pdu_exist = true;
             }
 
           }