Skip to content

O
OpenXG-RAN
Commit a4090b86 authored by Giulio Carota's avatar Giulio Carota
Browse files
Options

fix(rrc) MIB/SIB may be null in the F1SetupReq

parent 97d12e52
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
openair2/RRC/NR/rrc_gNB_du.c
View file @ a4090b86
...@@ -169,10 +169,12 @@ void rrc_gNB_process_f1_setup_req(f1ap_setup_req_t *req, sctp_assoc_t assoc_id) ...@@ -169,10 +169,12 @@ void rrc_gNB_process_f1_setup_req(f1ap_setup_req_t *req, sctp_assoc_t assoc_id)
du->setup_req = calloc(1,sizeof(*du->setup_req)); du->setup_req = calloc(1,sizeof(*du->setup_req));
AssertFatal(du->setup_req != NULL, "out of memory\n"); AssertFatal(du->setup_req != NULL, "out of memory\n");
*du->setup_req = *req; *du->setup_req = *req;
DevAssert(mib != NULL); // MIB can be null and configured later via DU Configuration Update
du->mib = mib->message.choice.mib; if (mib != NULL){
mib->message.choice.mib = NULL; du->mib = mib->message.choice.mib;
ASN_STRUCT_FREE(asn_DEF_NR_BCCH_BCH_MessageType, mib); mib->message.choice.mib = NULL;
ASN_STRUCT_FREE(asn_DEF_NR_BCCH_BCH_MessageType, mib);
}
du->sib1 = sib1; du->sib1 = sib1;
RB_INSERT(rrc_du_tree, &rrc->dus, du); RB_INSERT(rrc_du_tree, &rrc->dus, du);
rrc->num_dus++; rrc->num_dus++;
...@@ -182,7 +184,7 @@ void rrc_gNB_process_f1_setup_req(f1ap_setup_req_t *req, sctp_assoc_t assoc_id) ...@@ -182,7 +184,7 @@ void rrc_gNB_process_f1_setup_req(f1ap_setup_req_t *req, sctp_assoc_t assoc_id)
.nr_cellid = cell_info->nr_cellid, .nr_cellid = cell_info->nr_cellid,
.nrpci = cell_info->nr_pci, .nrpci = cell_info->nr_pci,
.num_SI = 0, .num_SI = 0,
}; };
f1ap_setup_resp_t resp = {.transaction_id = req->transaction_id, f1ap_setup_resp_t resp = {.transaction_id = req->transaction_id,
.num_cells_to_activate = 1, .num_cells_to_activate = 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment