From 7edf52ca5bfa3e864afa60fbce4bd390b839b4a8 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 10 Apr 2025 16:35:36 +0200 Subject: [PATCH] Use cp_f1ap_() functions to properly copy F1 messages --- openair2/RRC/NR/mac_rrc_dl_f1ap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openair2/RRC/NR/mac_rrc_dl_f1ap.c b/openair2/RRC/NR/mac_rrc_dl_f1ap.c index 8a84a7f85d..ff89f61160 100644 --- a/openair2/RRC/NR/mac_rrc_dl_f1ap.c +++ b/openair2/RRC/NR/mac_rrc_dl_f1ap.c @@ -53,10 +53,7 @@ static void f1_setup_response_f1ap(sctp_assoc_t assoc_id, const f1ap_setup_resp_ MessageDef *msg = itti_alloc_new_message(TASK_RRC_GNB, 0, F1AP_SETUP_RESP); msg->ittiMsgHeader.originInstance = assoc_id; f1ap_setup_resp_t *f1ap_msg = &F1AP_SETUP_RESP(msg); - *f1ap_msg = *resp; - if (resp->gNB_CU_name != NULL) - f1ap_msg->gNB_CU_name = strdup(resp->gNB_CU_name); - free_f1ap_setup_response(resp); + *f1ap_msg = cp_f1ap_setup_response(resp); itti_send_msg_to_task(TASK_CU_F1, 0, msg); } @@ -65,7 +62,7 @@ static void f1_setup_failure_f1ap(sctp_assoc_t assoc_id, const f1ap_setup_failur MessageDef *msg = itti_alloc_new_message(TASK_RRC_GNB, 0, F1AP_SETUP_FAILURE); msg->ittiMsgHeader.originInstance = assoc_id; f1ap_setup_failure_t *f1ap_msg = &F1AP_SETUP_FAILURE(msg); - *f1ap_msg = *fail; + *f1ap_msg = cp_f1ap_setup_failure(fail); itti_send_msg_to_task(TASK_CU_F1, 0, msg); } @@ -74,7 +71,7 @@ static void gnb_du_configuration_update_ack_f1ap(sctp_assoc_t assoc_id, const f1 MessageDef *msg = itti_alloc_new_message(TASK_RRC_GNB, 0, F1AP_GNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE); msg->ittiMsgHeader.originInstance = assoc_id; f1ap_gnb_du_configuration_update_acknowledge_t *f1ap_msg = &F1AP_GNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(msg); - *f1ap_msg = *ack; + *f1ap_msg = cp_f1ap_du_configuration_update_acknowledge(ack); itti_send_msg_to_task(TASK_CU_F1, 0, msg); }