diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c
index a8e7bfb499fa40829f841c63b328775490c97bd4..5e7c892301424149e3912ae9533735dcf71fcc9c 100644
--- a/openair2/F1AP/f1ap_du_interface_management.c
+++ b/openair2/F1AP/f1ap_du_interface_management.c
@@ -533,7 +533,7 @@ int DU_handle_F1_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint3
gNB-DU Configuration Update
*/
-int DU_send_gNB_DU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, f1ap_setup_req_t *f1ap_setup_req)
+int DU_send_gNB_DU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, const f1ap_gnb_du_configuration_update_t *upd)
{
F1AP_F1AP_PDU_t pdu= {0};
uint8_t *buffer=NULL;
@@ -545,227 +545,100 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, f1ap_setup_req_t
initMsg->procedureCode = F1AP_ProcedureCode_id_gNBDUConfigurationUpdate;
initMsg->criticality = F1AP_Criticality_reject;
initMsg->value.present = F1AP_InitiatingMessage__value_PR_GNBDUConfigurationUpdate;
- F1AP_GNBDUConfigurationUpdate_t *out = &pdu.choice.initiatingMessage->value.choice.GNBDUConfigurationUpdate;
+ F1AP_GNBDUConfigurationUpdate_t *out = &initMsg->value.choice.GNBDUConfigurationUpdate;
+
/* mandatory */
/* c1. Transaction ID (integer value) */
- asn1cSequenceAdd(out, F1AP_GNBDUConfigurationUpdateIEs_t, ie1);
+ asn1cSequenceAdd(out->protocolIEs.list, F1AP_GNBDUConfigurationUpdateIEs_t, ie1);
ie1->id = F1AP_ProtocolIE_ID_id_TransactionID;
ie1->criticality = F1AP_Criticality_reject;
ie1->value.present = F1AP_GNBDUConfigurationUpdateIEs__value_PR_TransactionID;
- ie1->value.choice.TransactionID = F1AP_get_next_transaction_identifier(0, 0);
+ ie1->value.choice.TransactionID = upd->transaction_id;
+
/* mandatory */
/* c2. Served_Cells_To_Add */
- asn1cSequenceAdd(out, F1AP_GNBDUConfigurationUpdateIEs_t, ie2);
- ie2->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Add_List;
- ie2->criticality = F1AP_Criticality_reject;
- ie2->value.present = F1AP_GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Add_List;
-
- for (int j=0; j<1; j++) {
- //
- asn1cSequenceAdd(ie2->value.choice.Served_Cells_To_Add_List.list, F1AP_Served_Cells_To_Add_ItemIEs_t, served_cells_to_add_item_ies);
- served_cells_to_add_item_ies->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Add_Item;
- served_cells_to_add_item_ies->criticality = F1AP_Criticality_reject;
- served_cells_to_add_item_ies->value.present = F1AP_Served_Cells_To_Add_ItemIEs__value_PR_Served_Cells_To_Add_Item;
- F1AP_Served_Cells_To_Add_Item_t *served_cells_to_add_item= &served_cells_to_add_item_ies->value.choice.Served_Cells_To_Add_Item;
- F1AP_Served_Cell_Information_t *served_cell_information=&served_cells_to_add_item->served_Cell_Information;
- /* - nRCGI */
- addnRCGI(served_cell_information->nRCGI, &f1ap_setup_req->cell[j].info);
- /* - nRPCI */
- /* 2.1.1 serverd cell Information */
- f1ap_served_cell_info_t *cell = &f1ap_setup_req->cell[j].info;
- served_cell_information->nRPCI = cell->nr_pci; // int 0..1007
- /* - fiveGS_TAC */
- if (cell->tac != NULL) {
- uint32_t tac = htonl(*cell->tac);
- served_cell_information->fiveGS_TAC = calloc(1, sizeof(*served_cell_information->fiveGS_TAC));
- OCTET_STRING_fromBuf(served_cell_information->fiveGS_TAC, ((char *)&tac)+1, 3);
- }
-
- /* - Configured_EPS_TAC */
- if(1) {
- served_cell_information->configured_EPS_TAC = (F1AP_Configured_EPS_TAC_t *)calloc(1, sizeof(F1AP_Configured_EPS_TAC_t));
- OCTET_STRING_fromBuf(served_cell_information->configured_EPS_TAC,"2", 2);
+ if (upd->num_cells_to_add > 0) {
+ AssertFatal(false, "code for adding cells not tested\n");
+ asn1cSequenceAdd(out->protocolIEs.list, F1AP_GNBDUConfigurationUpdateIEs_t, ie2);
+ ie2->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Add_List;
+ ie2->criticality = F1AP_Criticality_reject;
+ ie2->value.present = F1AP_GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Add_List;
+
+ for (int j = 0; j < upd->num_cells_to_add; j++) {
+ const f1ap_served_cell_info_t *cell = &upd->cell_to_add[j].info;
+ const f1ap_gnb_du_system_info_t *sys_info = upd->cell_to_add[j].sys_info;
+ asn1cSequenceAdd(ie2->value.choice.Served_Cells_To_Add_List.list,
+ F1AP_Served_Cells_To_Add_ItemIEs_t,
+ served_cells_to_add_item_ies);
+ served_cells_to_add_item_ies->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Add_Item;
+ served_cells_to_add_item_ies->criticality = F1AP_Criticality_reject;
+ served_cells_to_add_item_ies->value.present = F1AP_Served_Cells_To_Add_ItemIEs__value_PR_Served_Cells_To_Add_Item;
+ F1AP_Served_Cells_To_Add_Item_t *served_cells_to_add_item =
+ &served_cells_to_add_item_ies->value.choice.Served_Cells_To_Add_Item;
+ served_cells_to_add_item->served_Cell_Information = encode_served_cell_info(cell);
+ served_cells_to_add_item->gNB_DU_System_Information = encode_system_info(sys_info);
}
-
- asn1cSequenceAdd(served_cell_information->servedPLMNs.list, F1AP_ServedPLMNs_Item_t, servedPLMN_item);
- MCC_MNC_TO_PLMNID(cell->plmn.mcc, cell->plmn.mnc, cell->plmn.mnc_digit_length, &servedPLMN_item->pLMN_Identity);
- // // /* - CHOICE NR-MODE-Info */
- F1AP_NR_Mode_Info_t *nR_Mode_Info=&served_cell_information->nR_Mode_Info;
- LOG_E(F1AP,"Here hardcoded values instead of values from configuration file\n");
-
- if (cell->mode == F1AP_MODE_FDD) {
- nR_Mode_Info->present = F1AP_NR_Mode_Info_PR_fDD;
- /* > FDD >> FDD Info */
- asn1cCalloc(nR_Mode_Info->choice.fDD, fDD_Info);
- /* >>> UL NRFreqInfo */
- fDD_Info->uL_NRFreqInfo.nRARFCN = 999L;
- asn1cSequenceAdd(fDD_Info->uL_NRFreqInfo.freqBandListNr.list, F1AP_FreqBandNrItem_t, ul_freqBandNrItem);
- ul_freqBandNrItem->freqBandIndicatorNr = 888L;
- asn1cSequenceAdd(ul_freqBandNrItem->supportedSULBandList.list, F1AP_SupportedSULFreqBandItem_t, ul_supportedSULFreqBandItem);
- ul_supportedSULFreqBandItem->freqBandIndicatorNr = 777L;
- /* >>> DL NRFreqInfo */
- fDD_Info->dL_NRFreqInfo.nRARFCN = 666L;
- asn1cSequenceAdd(fDD_Info->dL_NRFreqInfo.freqBandListNr.list, F1AP_FreqBandNrItem_t, dl_freqBandNrItem);
- dl_freqBandNrItem->freqBandIndicatorNr = 555L;
- asn1cSequenceAdd(dl_freqBandNrItem->supportedSULBandList.list, F1AP_SupportedSULFreqBandItem_t, dl_supportedSULFreqBandItem);
- dl_supportedSULFreqBandItem->freqBandIndicatorNr = 444L;
- /* >>> UL Transmission Bandwidth */
- fDD_Info->uL_Transmission_Bandwidth.nRSCS = F1AP_NRSCS_scs15;
- fDD_Info->uL_Transmission_Bandwidth.nRNRB = F1AP_NRNRB_nrb11;
- /* >>> DL Transmission Bandwidth */
- fDD_Info->dL_Transmission_Bandwidth.nRSCS = F1AP_NRSCS_scs15;
- fDD_Info->dL_Transmission_Bandwidth.nRNRB = F1AP_NRNRB_nrb11;
- } else if (cell->mode == F1AP_MODE_TDD) { // TDD
- nR_Mode_Info->present = F1AP_NR_Mode_Info_PR_tDD;
- /* > TDD >> TDD Info */
- asn1cCalloc(nR_Mode_Info->choice.tDD, tDD_Info);
- /* >>> ARFCN */
- tDD_Info->nRFreqInfo.nRARFCN = 999L; // Integer
- asn1cSequenceAdd(tDD_Info->nRFreqInfo.freqBandListNr.list, F1AP_FreqBandNrItem_t, nr_freqBandNrItem);
- nr_freqBandNrItem->freqBandIndicatorNr = 555L;
- asn1cSequenceAdd(nr_freqBandNrItem->supportedSULBandList.list, F1AP_SupportedSULFreqBandItem_t, nr_supportedSULFreqBandItem);
- nr_supportedSULFreqBandItem->freqBandIndicatorNr = 444L;
- tDD_Info->transmission_Bandwidth.nRSCS= F1AP_NRSCS_scs15;
- tDD_Info->transmission_Bandwidth.nRNRB= F1AP_NRNRB_nrb11;
- } else {
- AssertFatal(false, "illegal mode %d\n", cell->mode);
- }
-
- /* - measurementTimingConfiguration */
- char *measurementTimingConfiguration = "0"; // sept. 2018
- OCTET_STRING_fromBuf(&served_cell_information->measurementTimingConfiguration,
- measurementTimingConfiguration,
- strlen(measurementTimingConfiguration));
- /* 2.1.2 gNB-DU System Information */
- asn1cCalloc(served_cells_to_add_item->gNB_DU_System_Information, gNB_DU_System_Information);
- OCTET_STRING_fromBuf(&gNB_DU_System_Information->mIB_message, // sept. 2018
- "1",
- sizeof("1"));
- OCTET_STRING_fromBuf(&gNB_DU_System_Information->sIB1_message, // sept. 2018
- "1",
- sizeof("1"));
}
/* mandatory */
/* c3. Served_Cells_To_Modify */
- asn1cSequenceAdd(out, F1AP_GNBDUConfigurationUpdateIEs_t, ie3);
- ie3->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Modify_List;
- ie3->criticality = F1AP_Criticality_reject;
- ie3->value.present = F1AP_GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Modify_List;
-
- for (int i=0; i<1; i++) {
- //
- f1ap_served_cell_info_t *cell = &f1ap_setup_req->cell[i].info;
- asn1cSequenceAdd(ie3->value.choice.Served_Cells_To_Modify_List.list, F1AP_Served_Cells_To_Modify_ItemIEs_t, served_cells_to_modify_item_ies);
- served_cells_to_modify_item_ies->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Modify_Item;
- served_cells_to_modify_item_ies->criticality = F1AP_Criticality_reject;
- served_cells_to_modify_item_ies->value.present = F1AP_Served_Cells_To_Modify_ItemIEs__value_PR_Served_Cells_To_Modify_Item;
- F1AP_Served_Cells_To_Modify_Item_t *served_cells_to_modify_item=&served_cells_to_modify_item_ies->value.choice.Served_Cells_To_Modify_Item;
- /* 3.1 oldNRCGI */
- //addnRGCI(served_cells_to_modify_item->oldNRCGI, f1ap_setup_req->cell[i]);
- /* 3.2.1 serverd cell Information */
- F1AP_Served_Cell_Information_t *served_cell_information= &served_cells_to_modify_item->served_Cell_Information;
- /* - nRCGI */
- //addnRGCI(served_cell_information->nRCGI,f1ap_setup_req->cell[i]);
- /* - nRPCI */
- served_cell_information->nRPCI = cell->nr_pci; // int 0..1007
- /* - fiveGS_TAC */
- asn1cCalloc(served_cell_information->fiveGS_TAC, tac );
- OCTET_STRING_fromBuf(tac,
- (const char *) &cell->tac,
- 3);
-
- /* - Configured_EPS_TAC */
- if(1) {
- asn1cCalloc(served_cell_information->configured_EPS_TAC, tmp2);
- OCTET_STRING_fromBuf(tmp2,
- "2",
- 2);
+ if (upd->num_cells_to_modify > 0) {
+ asn1cSequenceAdd(out->protocolIEs.list, F1AP_GNBDUConfigurationUpdateIEs_t, ie3);
+ ie3->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Modify_List;
+ ie3->criticality = F1AP_Criticality_reject;
+ ie3->value.present = F1AP_GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Modify_List;
+ for (int i = 0; i < upd->num_cells_to_modify; i++) {
+ const f1ap_served_cell_info_t *cell = &upd->cell_to_modify[i].info;
+ const f1ap_gnb_du_system_info_t *sys_info = upd->cell_to_modify[i].sys_info;
+ asn1cSequenceAdd(ie3->value.choice.Served_Cells_To_Modify_List.list,
+ F1AP_Served_Cells_To_Modify_ItemIEs_t,
+ served_cells_to_modify_item_ies);
+ served_cells_to_modify_item_ies->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Modify_Item;
+ served_cells_to_modify_item_ies->criticality = F1AP_Criticality_reject;
+ served_cells_to_modify_item_ies->value.present = F1AP_Served_Cells_To_Modify_ItemIEs__value_PR_Served_Cells_To_Modify_Item;
+ F1AP_Served_Cells_To_Modify_Item_t *served_cells_to_modify_item =
+ &served_cells_to_modify_item_ies->value.choice.Served_Cells_To_Modify_Item;
+
+ F1AP_NRCGI_t *oldNRCGI = &served_cells_to_modify_item->oldNRCGI;
+ const f1ap_plmn_t *old_plmn = &upd->cell_to_modify[i].old_plmn;
+ MCC_MNC_TO_PLMNID(old_plmn->mcc, old_plmn->mnc, old_plmn->mnc_digit_length, &oldNRCGI->pLMN_Identity);
+ NR_CELL_ID_TO_BIT_STRING(upd->cell_to_modify[i].old_nr_cellid, &oldNRCGI->nRCellIdentity);
+
+ served_cells_to_modify_item->served_Cell_Information = encode_served_cell_info(cell);
+ served_cells_to_modify_item->gNB_DU_System_Information = encode_system_info(sys_info);
}
-
- asn1cSequenceAdd(served_cell_information->servedPLMNs.list, F1AP_ServedPLMNs_Item_t, servedPLMN_item);
- MCC_MNC_TO_PLMNID(cell->plmn.mcc, cell->plmn.mnc, cell->plmn.mnc_digit_length, &servedPLMN_item->pLMN_Identity);
- // // /* - CHOICE NR-MODE-Info */
- F1AP_NR_Mode_Info_t *nR_Mode_Info= &served_cell_information->nR_Mode_Info;
-
- if (cell->mode == F1AP_MODE_FDD) {
- nR_Mode_Info->present = F1AP_NR_Mode_Info_PR_fDD;
- /* > FDD >> FDD Info */
- asn1cCalloc(nR_Mode_Info->choice.fDD, fDD_Info);
- /* >>> UL NRFreqInfo */
- fDD_Info->uL_NRFreqInfo.nRARFCN = 999L;
- asn1cSequenceAdd(fDD_Info->uL_NRFreqInfo.freqBandListNr.list, F1AP_FreqBandNrItem_t, ul_freqBandNrItem);
- ul_freqBandNrItem->freqBandIndicatorNr = 888L;
- asn1cSequenceAdd(ul_freqBandNrItem->supportedSULBandList.list, F1AP_SupportedSULFreqBandItem_t, ul_supportedSULFreqBandItem);
- ul_supportedSULFreqBandItem->freqBandIndicatorNr = 777L;
- /* >>> DL NRFreqInfo */
- fDD_Info->dL_NRFreqInfo.nRARFCN = 666L;
- asn1cSequenceAdd(dl_freqBandNrItem->supportedSULBandList.list, F1AP_FreqBandNrItem_t, dl_freqBandNrItem);
- dl_freqBandNrItem->freqBandIndicatorNr = 555L;
- F1AP_SupportedSULFreqBandItem_t dl_supportedSULFreqBandItem;
- memset((void *)&dl_supportedSULFreqBandItem, 0, sizeof(F1AP_SupportedSULFreqBandItem_t));
- dl_supportedSULFreqBandItem.freqBandIndicatorNr = 444L;
- /* >>> UL Transmission Bandwidth */
- fDD_Info->uL_Transmission_Bandwidth.nRSCS = F1AP_NRSCS_scs15;
- fDD_Info->uL_Transmission_Bandwidth.nRNRB = F1AP_NRNRB_nrb11;
- /* >>> DL Transmission Bandwidth */
- fDD_Info->dL_Transmission_Bandwidth.nRSCS = F1AP_NRSCS_scs15;
- fDD_Info->dL_Transmission_Bandwidth.nRNRB = F1AP_NRNRB_nrb11;
- } else if (cell->mode == F1AP_MODE_TDD) { // TDD
- nR_Mode_Info->present = F1AP_NR_Mode_Info_PR_tDD;
- /* > TDD >> TDD Info */
- asn1cCalloc(nR_Mode_Info->choice.tDD, tDD_Info);
- /* >>> ARFCN */
- tDD_Info->nRFreqInfo.nRARFCN = 999L; // Integer
- asn1cSequenceAdd(tDD_Info->nRFreqInfo.freqBandListNr.list, F1AP_FreqBandNrItem_t, nr_freqBandNrItem);
- nr_freqBandNrItem->freqBandIndicatorNr = 555L;
- asn1cSequenceAdd(nr_freqBandNrItem->supportedSULBandList.list, F1AP_SupportedSULFreqBandItem_t, nr_supportedSULFreqBandItem);
- nr_supportedSULFreqBandItem->freqBandIndicatorNr = 444L;
- tDD_Info->transmission_Bandwidth.nRSCS= F1AP_NRSCS_scs15;
- tDD_Info->transmission_Bandwidth.nRNRB= F1AP_NRNRB_nrb11;
- } else {
- AssertFatal(false, "unknown mode %d\n", cell->mode);
- }
-
- /* - measurementTimingConfiguration */
- char *measurementTimingConfiguration = "0"; // sept. 2018
- OCTET_STRING_fromBuf(&served_cell_information->measurementTimingConfiguration,
- measurementTimingConfiguration,
- strlen(measurementTimingConfiguration));
- /* 3.2.2 gNB-DU System Information */
- asn1cCalloc( served_cells_to_modify_item->gNB_DU_System_Information, gNB_DU_System_Information);
- OCTET_STRING_fromBuf(&gNB_DU_System_Information->mIB_message, // sept. 2018
- "1",
- sizeof("1"));
- OCTET_STRING_fromBuf(&gNB_DU_System_Information->sIB1_message, // sept. 2018
- "1",
- sizeof("1"));
}
/* mandatory */
/* c4. Served_Cells_To_Delete */
- asn1cSequenceAdd(out, F1AP_GNBDUConfigurationUpdateIEs_t, ie4);
- ie4->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Delete_List;
- ie4->criticality = F1AP_Criticality_reject;
- ie4->value.present = F1AP_GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Delete_List;
-
- for (int i=0; i<1; i++) {
- //
- asn1cSequenceAdd(ie4->value.choice.Served_Cells_To_Delete_List.list, F1AP_Served_Cells_To_Delete_ItemIEs_t, served_cells_to_delete_item_ies);
- served_cells_to_delete_item_ies->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Delete_Item;
- served_cells_to_delete_item_ies->criticality = F1AP_Criticality_reject;
- served_cells_to_delete_item_ies->value.present = F1AP_Served_Cells_To_Delete_ItemIEs__value_PR_Served_Cells_To_Delete_Item;
- F1AP_Served_Cells_To_Delete_Item_t *served_cells_to_delete_item=&served_cells_to_delete_item_ies->value.choice.Served_Cells_To_Delete_Item;
- /* 3.1 oldNRCGI */
- addnRCGI(served_cells_to_delete_item->oldNRCGI, &f1ap_setup_req->cell[i].info);
+ if (upd->num_cells_to_delete > 0) {
+ asn1cSequenceAdd(out->protocolIEs.list, F1AP_GNBDUConfigurationUpdateIEs_t, ie4);
+ ie4->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Delete_List;
+ ie4->criticality = F1AP_Criticality_reject;
+ ie4->value.present = F1AP_GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Delete_List;
+ AssertFatal(upd->num_cells_to_delete == 0, "code for deleting cells not tested\n");
+ for (int i = 0; i < upd->num_cells_to_delete; i++) {
+ asn1cSequenceAdd(ie4->value.choice.Served_Cells_To_Delete_List.list,
+ F1AP_Served_Cells_To_Delete_ItemIEs_t,
+ served_cells_to_delete_item_ies);
+ served_cells_to_delete_item_ies->id = F1AP_ProtocolIE_ID_id_Served_Cells_To_Delete_Item;
+ served_cells_to_delete_item_ies->criticality = F1AP_Criticality_reject;
+ served_cells_to_delete_item_ies->value.present = F1AP_Served_Cells_To_Delete_ItemIEs__value_PR_Served_Cells_To_Delete_Item;
+ F1AP_Served_Cells_To_Delete_Item_t *served_cells_to_delete_item =
+ &served_cells_to_delete_item_ies->value.choice.Served_Cells_To_Delete_Item;
+ addnRCGI(served_cells_to_delete_item->oldNRCGI, &upd->cell_to_delete[i]);
+ }
}
+ AssertFatal(upd->gNB_DU_ID == 0, "encoding of gNB-DU Id not handled yet\n");
+
if (f1ap_encode_pdu(&pdu, &buffer, &len) < 0) {
LOG_E(F1AP, "Failed to encode F1 gNB-DU CONFIGURATION UPDATE\n");
return -1;
}
ASN_STRUCT_RESET(asn_DEF_F1AP_F1AP_PDU, &pdu);
+ f1ap_itti_send_sctp_data_req(assoc_id, buffer, len);
return 0;
}
diff --git a/openair2/F1AP/f1ap_du_interface_management.h b/openair2/F1AP/f1ap_du_interface_management.h
index d7e9a8294a892ceed77762712bfe450917027f43..c48754010fcd1f7fdb983ce402a7b7913c994451 100644
--- a/openair2/F1AP/f1ap_du_interface_management.h
+++ b/openair2/F1AP/f1ap_du_interface_management.h
@@ -59,8 +59,7 @@ int DU_handle_F1_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint3
/*
* gNB-DU Configuration Update
*/
-int DU_send_gNB_DU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id,
- f1ap_setup_req_t *f1ap_du_data);
+int DU_send_gNB_DU_CONFIGURATION_UPDATE(sctp_assoc_t assoc_id, const f1ap_gnb_du_configuration_update_t *upd);
int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu);
diff --git a/openair2/F1AP/f1ap_du_task.c b/openair2/F1AP/f1ap_du_task.c
index 1783e9d909fd3545c0a6566b91cc89c10e4675bc..7959f734fecc20a9ebfdb05f8194c9ce057a1d77 100644
--- a/openair2/F1AP/f1ap_du_task.c
+++ b/openair2/F1AP/f1ap_du_task.c
@@ -186,6 +186,10 @@ void *F1AP_DU_task(void *arg) {
DU_send_UE_CONTEXT_MODIFICATION_REQUIRED(assoc_id, &F1AP_UE_CONTEXT_MODIFICATION_REQUIRED(msg));
break;
+ case F1AP_GNB_DU_CONFIGURATION_UPDATE:
+ DU_send_gNB_DU_CONFIGURATION_UPDATE(assoc_id, &F1AP_GNB_DU_CONFIGURATION_UPDATE(msg));
+ break;
+
case TERMINATE_MESSAGE:
LOG_W(F1AP, " *** Exiting F1AP thread\n");
itti_exit_task();
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c
index 63189343280df107ce543a78a4a843c299dc1ab8..8cd58e696ac2168371244f4650d36ecb6c96ff6a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c
@@ -100,7 +100,35 @@ static void f1_setup_request_f1ap(const f1ap_setup_req_t *req)
static void gnb_du_configuration_update_f1ap(const f1ap_gnb_du_configuration_update_t *upd)
{
- AssertFatal(false, "%s() not implemented\n", __func__);
+ MessageDef *msg = itti_alloc_new_message(TASK_MAC_GNB, 0, F1AP_GNB_DU_CONFIGURATION_UPDATE);
+ f1ap_gnb_du_configuration_update_t *f1_upd = &F1AP_GNB_DU_CONFIGURATION_UPDATE(msg);
+ f1_upd->transaction_id = upd->transaction_id;
+ AssertFatal(upd->num_cells_to_add == 0, "gNB-DU config update: cells to add not supported\n");
+ f1_upd->num_cells_to_modify = upd->num_cells_to_modify;
+ for (int n = 0; n < upd->num_cells_to_modify; ++n) {
+ f1_upd->cell_to_modify[n].old_plmn = upd->cell_to_modify[n].old_plmn;
+ f1_upd->cell_to_modify[n].old_nr_cellid = upd->cell_to_modify[n].old_nr_cellid;
+ f1_upd->cell_to_modify[n].info = upd->cell_to_modify[n].info;
+ if (upd->cell_to_modify[n].sys_info) {
+ f1ap_gnb_du_system_info_t *orig_sys_info = upd->cell_to_modify[n].sys_info;
+ f1ap_gnb_du_system_info_t *copy_sys_info = calloc(1, sizeof(*copy_sys_info));
+ f1_upd->cell_to_modify[n].sys_info = copy_sys_info;
+
+ copy_sys_info->mib = calloc(orig_sys_info->mib_length, sizeof(uint8_t));
+ AssertFatal(copy_sys_info->mib != NULL, "out of memory\n");
+ memcpy(copy_sys_info->mib, orig_sys_info->mib, orig_sys_info->mib_length);
+ copy_sys_info->mib_length = orig_sys_info->mib_length;
+
+ if (orig_sys_info->sib1_length > 0) {
+ copy_sys_info->sib1 = calloc(orig_sys_info->sib1_length, sizeof(uint8_t));
+ AssertFatal(copy_sys_info->sib1 != NULL, "out of memory\n");
+ memcpy(copy_sys_info->sib1, orig_sys_info->sib1, orig_sys_info->sib1_length);
+ copy_sys_info->sib1_length = orig_sys_info->sib1_length;
+ }
+ }
+ }
+ AssertFatal(upd->num_cells_to_delete == 0, "gNB-DU config update: cells to add not supported\n");
+ itti_send_msg_to_task(TASK_DU_F1, 0, msg);
}
static void ue_context_setup_response_f1ap(const f1ap_ue_context_setup_t *req, const f1ap_ue_context_setup_t *resp)