maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extend the scope of free_f1ap_cell and use it in stack

Browse Source
This commit is contained in:
Guido Casati
2024-11-27 10:40:10 +01:00
parent 22f3476d88
commit a05084de95
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/F1AP/lib/f1ap_interface_management.c
+1 -1
View File
@@ -72,7 +72,7 @@ static int read_slice_info(const F1AP_ServedPLMNs_Item_t *plmn, nssai_t *nssai,
/** /**
* @brief F1AP Setup Request memory management * @brief F1AP Setup Request memory management
*/ */
static void free_f1ap_cell(const f1ap_served_cell_info_t *info, const f1ap_gnb_du_system_info_t *sys_info) void free_f1ap_cell(const f1ap_served_cell_info_t *info, const f1ap_gnb_du_system_info_t *sys_info)
{ {
if (sys_info) { if (sys_info) {
free(sys_info->mib); free(sys_info->mib);
openair2/F1AP/lib/f1ap_interface_management.h
+1
View File
@@ -33,6 +33,7 @@ f1ap_setup_req_t cp_f1ap_setup_request(const f1ap_setup_req_t *msg);
bool eq_f1ap_setup_request(const f1ap_setup_req_t *a, const f1ap_setup_req_t *b); bool eq_f1ap_setup_request(const f1ap_setup_req_t *a, const f1ap_setup_req_t *b);
void free_f1ap_setup_request(const f1ap_setup_req_t *msg); void free_f1ap_setup_request(const f1ap_setup_req_t *msg);
void copy_f1ap_served_cell_info(f1ap_served_cell_info_t *a, const f1ap_served_cell_info_t *b); void copy_f1ap_served_cell_info(f1ap_served_cell_info_t *a, const f1ap_served_cell_info_t *b);
void free_f1ap_cell(const f1ap_served_cell_info_t *info, const f1ap_gnb_du_system_info_t *sys_info);
/* F1 Setup Response */ /* F1 Setup Response */
struct F1AP_F1AP_PDU *encode_f1ap_setup_response(const f1ap_setup_resp_t *msg); struct F1AP_F1AP_PDU *encode_f1ap_setup_response(const f1ap_setup_resp_t *msg);
openair2/RRC/NR/rrc_gNB_du.c
+2
View File
@@ -446,6 +446,8 @@ static void update_cell_info(nr_rrc_du_container_t *du, const f1ap_served_cell_i
AssertFatal(du->setup_req->num_cells_available == 1, "expected 1 cell for DU, but has %d\n", du->setup_req->num_cells_available); AssertFatal(du->setup_req->num_cells_available == 1, "expected 1 cell for DU, but has %d\n", du->setup_req->num_cells_available);
f1ap_served_cell_info_t *ci = &du->setup_req->cell[0].info; f1ap_served_cell_info_t *ci = &du->setup_req->cell[0].info;
// make sure no memory is allocated
free_f1ap_cell(ci, NULL);
copy_f1ap_served_cell_info(ci, new_ci); copy_f1ap_served_cell_info(ci, new_ci);
NR_MeasurementTimingConfiguration_t *new_mtc = NR_MeasurementTimingConfiguration_t *new_mtc =