temporary fix for no ue nrppa messages

openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_direct.c

@@ -588,7 +588,7 @@ static void positioning_measurement_response(const f1ap_measurement_resp_t *resp
 
   gNB_MAC_INST *mac = RC.nrmac[resp->nrppa_msg_info.instance];
   NR_UEs_t *UE_info = &mac->UE_info;
-  UE_iterator (UE_info->list, UE) {
+  /*UE_iterator (UE_info->list, UE) {
     if (UE->rnti == resp->nrppa_msg_info.ue_rnti) { // configuration details of specific UE // TODO manage non UE associated
       LOG_I(MAC,
             "Extracting uL_RTOA info of MeasurementResponse for ue rnti= %04x \n",
@@ -610,6 +610,28 @@ static void positioning_measurement_response(const f1ap_measurement_resp_t *resp
       posMeasRes->pos_measurement_result_item->timeStamp.slotIndex.present = f1ap_time_stamp_slot_index_pr_sCS_30;
       posMeasRes->pos_measurement_result_item->timeStamp.slotIndex.choice.sCS_30 = mac->slot;
     }
+  }*/
+
+  UE_iterator (UE_info->list, UE) {
+    if (1) { // configuration details of specific UE // TODO manage non UE associated
+      LOG_I(MAC,
+            "Extracting uL_RTOA info of MeasurementResponse for ue rnti= %04x \n",
+            resp->nrppa_msg_info.ue_rnti); ////uid_t uid = &UE->uid;
+      // we assume we use UL_RTOA for now with k=1 (i.e. 8 times oversampling from 122.88e6 Msps)
+      f1ap_measured_results_value_t *MeasResVal= &posMeasRes->pos_measurement_result_item->measuredResultsValue;
+      MeasResVal->present = f1ap_measured_results_value_pr_ul_rtoa;
+      MeasResVal->choice.uL_RTOA.uL_RTOA_MeasurementItem.present = f1ap_ulrtoameas_pr_k1;
+      MeasResVal->choice.uL_RTOA.uL_RTOA_MeasurementItem.choice.k1 =0;
+          //(int32_t)(((int64_t)UE->ue_pos_info.toa_ns * (int64_t)T_inv) / T_ns_inv);
+      LOG_I(MAC,
+            "Extracting uL_RTOA info of MeasurementResponse for ue rnti= %04x, k1=%d \n",
+            resp->nrppa_msg_info.ue_rnti,0);
+      // TODO IE timeStamp.measurementTime
+      posMeasRes->pos_measurement_result_item->timeStamp.systemFrameNumber = mac->frame;
+      // TODO IE timeStamp.slotIndex
+      posMeasRes->pos_measurement_result_item->timeStamp.slotIndex.present = f1ap_time_stamp_slot_index_pr_sCS_30;
+      posMeasRes->pos_measurement_result_item->timeStamp.slotIndex.choice.sCS_30 = mac->slot;
+    }
   }
 
   itti_send_msg_to_task(TASK_RRC_GNB, 0, msg);

openair2/RRC/NR/rrc_gNB.c

@@ -2387,11 +2387,12 @@ static void rrc_CU_process_measurement_request(f1ap_measurement_req_t *req)
 {
   gNB_RRC_INST *rrc = RC.nrrrc[req->nrppa_msg_info.instance];
 
-  rrc_gNB_ue_context_t *ue_context_p =
+  /*rrc_gNB_ue_context_t *ue_context_p =
       rrc_gNB_get_ue_context(RC.nrrrc[req->nrppa_msg_info.instance], req->nrppa_msg_info.gNB_ue_ngap_id);
   gNB_RRC_UE_t *UE = &ue_context_p->ue_context;
   // f1_ue_data_t ue_data = cu_get_f1_ue_data(UE->rrc_ue_id);
-  req->nrppa_msg_info.ue_rnti = UE->rnti;
+  req->nrppa_msg_info.ue_rnti = UE->rnti;*/
+  req->nrppa_msg_info.ue_rnti =-1;
   // req->gNB_DU_ue_id = ue_data.secondary_ue;
   // req->gNB_CU_ue_id = UE->rrc_ue_id;
 

openair3/NGAP/ngap_gNB_NRPPa_transport_procedures.c

@@ -132,7 +132,7 @@ int ngap_gNB_UplinkUEAssociatedNRPPaTransport(instance_t instance, ngap_UplinkUE
 // UPLINK NON UE ASSOCIATED NRPPA TRANSPORT (9.2.9.4 of TS 38.413 Version 16.0.0.0 Release 16)
 int ngap_gNB_UplinkNonUEAssociatedNRPPaTransport(instance_t instance, ngap_UplinkNonUEAssociatedNRPPa_t *UlNRPPaMsg)
 {
-  LOG_I(NGAP, "Initiating ngap_gNB_UplinkUEAssociatedNRPPaTransport \n");
+  LOG_I(NGAP, "Initiating ngap_gNB_UplinkNonUEAssociatedNRPPaTransport \n");
   DevAssert(UlNRPPaMsg != NULL);
 
   /* Retrieve the NGAP gNB instance associated with Mod_id */

openair3/NRPPA/nrppa_gNB_itti_messaging.c

@@ -86,7 +86,7 @@ void nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa(instance_t instance,
 {
   LOG_I(NRPPA, "initiating nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa \n");
 
-/*  MessageDef *msg = itti_alloc_new_message(TASK_NRPPA, 0, NGAP_UPLINKNONUEASSOCIATEDNRPPA);
+  MessageDef *msg = itti_alloc_new_message(TASK_NRPPA, 0, NGAP_UPLINKNONUEASSOCIATEDNRPPA);
   ngap_UplinkNonUEAssociatedNRPPa_t *ULNRPPA= &NGAP_UPLINKNONUEASSOCIATEDNRPPA(msg);
 
   // Routing ID
@@ -99,10 +99,10 @@ void nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa(instance_t instance,
   memcpy(ULNRPPA->nrppa_pdu.buffer, nrppa_pdu, nrppa_pdu_length);
   ULNRPPA->nrppa_pdu.length = nrppa_pdu_length;
 
-  itti_send_msg_to_task(TASK_NGAP, instance, msg);*/
+  itti_send_msg_to_task(TASK_NGAP, instance, msg);
 
 // TODO try the below approach
-  MessageDef *msg=itti_alloc_new_message_sized(TASK_NRPPA, 0, NGAP_UPLINKNONUEASSOCIATEDNRPPA,
+/* MessageDef *msg=itti_alloc_new_message_sized(TASK_NRPPA, 0, NGAP_UPLINKNONUEASSOCIATEDNRPPA,
        sizeof(ngap_UplinkNonUEAssociatedNRPPa_t)+ routingId_buffer_length + nrppa_pdu_length);
 
   ngap_UplinkNonUEAssociatedNRPPa_t *msgData = &NGAP_UPLINKNONUEASSOCIATEDNRPPA(msg);
@@ -117,5 +117,5 @@ void nrppa_gNB_itti_send_UplinkNonUEAssociatedNRPPa(instance_t instance,
   memcpy(msgData->nrppa_pdu.buffer, nrppa_pdu, nrppa_pdu_length);
   msgData->nrppa_pdu.length = nrppa_pdu_length;
 
-  itti_send_msg_to_task(TASK_NGAP, instance, msg);
+  itti_send_msg_to_task(TASK_NGAP, instance, msg);*/
 }