X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcu_stub%2Fcu_f1ap_msg_hdl.c;h=07fdaa734dc8769212eadab00d8b8bd222c3fe1a;hb=3b78976fc78745b28523ff7dfda90d12ccbec28c;hp=2f01e167e7058607a491d2569f709c6e325f8fdc;hpb=172422f2fd260c5dd92aca0e9ac387fb60fc2a71;p=o-du%2Fl2.git diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c index 2f01e167e..07fdaa734 100644 --- a/src/cu_stub/cu_f1ap_msg_hdl.c +++ b/src/cu_stub/cu_f1ap_msg_hdl.c @@ -19,13 +19,14 @@ /* This file contains F1AP message handler functions */ #include "common_def.h" #include "OCTET_STRING.h" -#include "BIT_STRING.h" -#include "odu_common_codec.h" #include "cu_stub_sctp.h" +#include "cu_stub_egtp.h" #include "cu_f1ap_msg_hdl.h" -#include "legtp.h" -/*header files needed for Ue Context Setup */ -#include +#include "cu_stub.h" + +#include "BIT_STRING.h" +#include "odu_common_codec.h" +#include "ProtocolIE-Field.h" #include "ProtocolExtensionField.h" #include "ProtocolIE-SingleContainer.h" #include "F1AP-PDU.h" @@ -74,6 +75,10 @@ #include "SRS-ResourceSet.h" #include "SRS-Config.h" #include "PUCCH-Config.h" +#include "PUCCH-ResourceSet.h" +#include "PUCCH-Resource.h" +#include "PUCCH-format1.h" +#include "PUCCH-FormatConfig.h" #include "BWP-UplinkDedicated.h" #include "PUSCH-ServingCellConfig.h" #include "UplinkConfig.h" @@ -88,6 +93,18 @@ #include "UPTransportLayerInformation.h" #include "GTPTunnel.h" #include "QoSInformation.h" +#include "Cells-to-be-Activated-List.h" +#include "DL-CCCH-Message.h" +#include "SRB-ToAddModList.h" +#include "SRB-ToAddMod.h" +#include "RRCSetup-IEs.h" +#include "RRCSetup.h" +#include "DL-DCCH-Message.h" +#include "RRCReconfiguration-IEs.h" +#include "RRCReconfiguration.h" +#include "DRB-ToAddModList.h" +#include "DRB-ToAddMod.h" +#include "SDAP-Config.h" /* MACRO for CUtoDURRCInformation */ #define CELL_GRP_ID 1 @@ -202,7 +219,7 @@ * RFAILED - failure * * ****************************************************************/ -S16 SendF1APMsg(Region region, Pool pool) +S16 SendF1APMsg(Region region, Pool pool, uint32_t duId) { Buffer *mBuf = NULLP; @@ -212,7 +229,7 @@ S16 SendF1APMsg(Region region, Pool pool) { ODU_PRINT_MSG(mBuf, 0,0); - if(sctpSend(mBuf) != ROK) + if(sctpSend(duId, mBuf) != ROK) { DU_LOG("\nERROR --> F1AP : SCTP Send failed"); ODU_PUT_MSG_BUF(mBuf); @@ -279,7 +296,7 @@ S16 BuildNrCellId(BIT_STRING_t *nrcell) * RFAILED - failure * * ****************************************************************/ -S16 BuildAndSendF1SetupRsp(BIT_STRING_t *nrcellId) +uint8_t BuildAndSendF1SetupRsp(uint32_t duId, BIT_STRING_t *nrcellId) { uint8_t idx,ieIdx; uint8_t elementCnt,cellCnt; @@ -359,7 +376,7 @@ S16 BuildAndSendF1SetupRsp(BIT_STRING_t *nrcellId) f1SetupRsp->protocolIEs.list.array[idx]->value.present = \ F1SetupResponseIEs__value_PR_GNB_CU_Name; cuName = &f1SetupRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_Name; - cuName->size = sizeof(cuCfgParams.cuName); + cuName->size = sizeof(cuCb.cuCfgParams.cuName); CU_ALLOC(cuName->buf, sizeof(cuName->size)); if(cuName->buf == NULLP) @@ -376,7 +393,7 @@ S16 BuildAndSendF1SetupRsp(BIT_STRING_t *nrcellId) CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); return RFAILED; } - strcpy((char*)cuName->buf, (char*)cuCfgParams.cuName); + strcpy((char*)cuName->buf, (char*)cuCb.cuCfgParams.cuName); /*Cells to be activated list*/ idx++; @@ -463,7 +480,7 @@ S16 BuildAndSendF1SetupRsp(BIT_STRING_t *nrcellId) CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); return RFAILED; } - buildPlmnId(cuCfgParams.plmn , cellToActivate->list.array[0]->value.choice.\ + buildPlmnId(cuCb.cuCfgParams.plmn , cellToActivate->list.array[0]->value.choice.\ Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf); cellToActivate->list.array[0]->value.choice.Cells_to_be_Activated_List_Item.\ nRCGI.nRCellIdentity.size = 5; @@ -525,7 +542,7 @@ S16 BuildAndSendF1SetupRsp(BIT_STRING_t *nrcellId) } /* Need to check RRC Version */ - rrcVer->latest_RRC_Version.buf[0] = cuCfgParams.rrcVersion.rrcVer; + rrcVer->latest_RRC_Version.buf[0] = cuCb.cuCfgParams.rrcVersion.rrcVer; rrcVer->latest_RRC_Version.bits_unused = 5; //TODO: pick from cuCfgParam. If not present, add it CU_ALLOC(rrcVer->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P81_t)); if(rrcVer->iE_Extensions == NULLP) @@ -659,7 +676,7 @@ S16 BuildAndSendF1SetupRsp(BIT_STRING_t *nrcellId) } /* Sending msg */ - if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) + if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, duId) != ROK) { DU_LOG("\nERROR --> F1AP : Sending F1 Setup Response failed"); return RFAILED; @@ -686,7 +703,7 @@ S16 BuildAndSendF1SetupRsp(BIT_STRING_t *nrcellId) * * ****************************************************************/ -S16 BuildAndSendDUUpdateAck() +uint8_t BuildAndSendDUUpdateAck(uint32_t duId) { uint8_t idx; uint8_t elementCnt; @@ -786,7 +803,8 @@ S16 BuildAndSendDUUpdateAck() } /* Sending msg */ - if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) + /* TODO : Hardcoding DU ID to 1 for messages other than F1 Setup Response. This will be made generic in future gerrit */ + if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, duId) != ROK) { DU_LOG("\nERROR --> F1AP : Sending GNB-DU Config Update Ack failed"); return RFAILED; @@ -795,6 +813,7 @@ S16 BuildAndSendDUUpdateAck() return ROK; }/* End of BuildAndSendDUUpdateAck*/ + /******************************************************************* * * @brief deallocating the memory of F1reset msg @@ -865,15 +884,15 @@ uint8_t BuildAndSendF1ResetReq() CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t)); if(f1apMsg == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for the BuildAndSendF1ResetReq's F1AP-PDU failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for the BuildAndSendF1ResetReq's F1AP-PDU failed"); + break; } f1apMsg->present = F1AP_PDU_PR_initiatingMessage; CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t)); if(f1apMsg->choice.initiatingMessage == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for BuildAndSendF1ResetReq failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for BuildAndSendF1ResetReq failed"); + break; } f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_Reset; f1apMsg->choice.initiatingMessage->criticality = Criticality_reject; @@ -889,17 +908,17 @@ uint8_t BuildAndSendF1ResetReq() CU_ALLOC(f1ResetMsg->protocolIEs.list.array,f1ResetMsg->protocolIEs.list.size); if(f1ResetMsg->protocolIEs.list.array == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation failed for BuildAndSendF1ResetReq"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation failed for BuildAndSendF1ResetReq"); + break; } for(idx=0; idxprotocolIEs.list.array[idx],sizeof(ResetIEs_t)); - if(f1ResetMsg->protocolIEs.list.array[idx] == NULLP) - { - DU_LOG("\nERROR --> F1AP : Memory allocation failed for BuildAndSendF1ResetReq msg array"); - break; - } + CU_ALLOC(f1ResetMsg->protocolIEs.list.array[idx],sizeof(ResetIEs_t)); + if(f1ResetMsg->protocolIEs.list.array[idx] == NULLP) + { + DU_LOG("\nERROR --> F1AP : Memory allocation failed for BuildAndSendF1ResetReq msg array"); + break; + } } /*TransactionID*/ @@ -931,28 +950,29 @@ uint8_t BuildAndSendF1ResetReq() memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ - encBuf); + encBuf); /* Encode results */ if(encRetVal.encoded == ENCODE_FAIL) { - DU_LOG("\nERROR --> F1AP : Could not encode F1Reset structure (at %s)\n",\ - encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - break; + DU_LOG("\nERROR --> F1AP : Could not encode F1Reset structure (at %s)\n",\ + encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); + break; } else { - DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for F1Reset\n"); - for(idx=0; idx< encBufSize; idx++) - { - DU_LOG("%x",encBuf[idx]); - } + DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for F1Reset\n"); + for(idx=0; idx< encBufSize; idx++) + { + DU_LOG("%x",encBuf[idx]); + } } - if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) + /* TODO : Hardcoding DU ID to 1 for messages other than F1 Setup Response. This will be made generic in future gerrit */ + if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, DU_ID) != ROK) { - DU_LOG("\nERROR --> F1AP : Sending F1 Reset request failed"); - break; + DU_LOG("\nERROR --> F1AP : Sending F1 Reset request failed"); + break; } ret = ROK; @@ -1033,22 +1053,22 @@ uint8_t fillSrbCfg(uint8_t srbId, SRB_ToAddModList_t *bearerCfg) * * ****************************************************************/ -uint8_t fillMasterCellGroup(uint8_t ueId, OCTET_STRING_t *masterCellGroup) +uint8_t fillMasterCellGroup(CuUeCb *ueCb, OCTET_STRING_t *masterCellGroup) { uint8_t ret = ROK; masterCellGroup->buf = NULLP; - if(ueCb[ueId-1].f1apMsgDb.duToCuContainer.buf) + if(ueCb->f1apMsgDb.duToCuContainer.buf) { - masterCellGroup->size = ueCb[ueId-1].f1apMsgDb.duToCuContainer.size; + masterCellGroup->size = ueCb->f1apMsgDb.duToCuContainer.size; CU_ALLOC(masterCellGroup->buf, masterCellGroup->size); if(masterCellGroup->buf != NULLP) { - memcpy(masterCellGroup->buf, ueCb[ueId-1].f1apMsgDb.duToCuContainer.buf,\ - masterCellGroup->size); + memcpy(masterCellGroup->buf, ueCb->f1apMsgDb.duToCuContainer.buf, masterCellGroup->size); } else { - ret = RFAILED; + DU_LOG( "\nERROR --> F1AP : Master Cell Group buffer is NULL"); + ret = RFAILED; } } else @@ -1075,7 +1095,7 @@ uint8_t fillMasterCellGroup(uint8_t ueId, OCTET_STRING_t *masterCellGroup) * * ****************************************************************/ -uint8_t fillRRCSetupIE(uint8_t ueId, RRCSetup_IEs_t *rrcSetupIE) +uint8_t fillRRCSetupIE(CuUeCb *ueCb, RRCSetup_IEs_t *rrcSetupIE) { uint8_t ret = ROK; if(rrcSetupIE) @@ -1083,16 +1103,16 @@ uint8_t fillRRCSetupIE(uint8_t ueId, RRCSetup_IEs_t *rrcSetupIE) CU_ALLOC(rrcSetupIE->radioBearerConfig.srb_ToAddModList, sizeof(SRB_ToAddModList_t)); if(rrcSetupIE->radioBearerConfig.srb_ToAddModList != NULLP) { - ret = fillSrbCfg(SRB1, rrcSetupIE->radioBearerConfig.srb_ToAddModList); + ret = fillSrbCfg(SRB1, rrcSetupIE->radioBearerConfig.srb_ToAddModList); } if(ret == ROK) { - ret = fillMasterCellGroup(ueId, &rrcSetupIE->masterCellGroup); + ret = fillMasterCellGroup(ueCb, &rrcSetupIE->masterCellGroup); } else { - CU_FREE(rrcSetupIE->radioBearerConfig.srb_ToAddModList, sizeof(SRB_ToAddModList_t)); - ret = RFAILED; + CU_FREE(rrcSetupIE->radioBearerConfig.srb_ToAddModList, sizeof(SRB_ToAddModList_t)); + ret = RFAILED; } } return ret; @@ -1115,12 +1135,12 @@ uint8_t fillRRCSetupIE(uint8_t ueId, RRCSetup_IEs_t *rrcSetupIE) * * ****************************************************************/ -uint8_t fillDlCcchRrcMsg(uint8_t ueId, RRCContainer_t *rrcContainer) +uint8_t fillDlCcchRrcMsg(CuUeCb *ueCb, RRCContainer_t *rrcContainer) { uint8_t ret = ROK; uint16_t idx2; DL_CCCH_Message_t dl_CCCH_Msg; - asn_enc_rval_t encRetVal; + asn_enc_rval_t encRetVal; if(rrcContainer != NULLP) { @@ -1134,16 +1154,15 @@ uint8_t fillDlCcchRrcMsg(uint8_t ueId, RRCContainer_t *rrcContainer) if(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup != NULLP) { dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->rrc_TransactionIdentifier = 0; - dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->criticalExtensions.\ - present = RRCSetup__criticalExtensions_PR_rrcSetup; + dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->criticalExtensions.present = \ + RRCSetup__criticalExtensions_PR_rrcSetup; + /* Fill RRC Setup IE */ - CU_ALLOC(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\ - criticalExtensions.choice.rrcSetup, sizeof(RRCSetup_IEs_t)); - if(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\ - criticalExtensions.choice.rrcSetup != NULLP) + CU_ALLOC(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->criticalExtensions.choice.rrcSetup, \ + sizeof(RRCSetup_IEs_t)); + if(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->criticalExtensions.choice.rrcSetup != NULLP) { - ret = fillRRCSetupIE(ueId, dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\ - criticalExtensions.choice.rrcSetup); + ret = fillRRCSetupIE(ueCb, dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->criticalExtensions.choice.rrcSetup); if(ret == ROK) { @@ -1541,16 +1560,16 @@ uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer) * * ****************************************************************/ -uint8_t BuildDLRRCContainer(uint8_t ueId, uint8_t rrcMsgType, RRCContainer_t *rrcContainer) +uint8_t BuildDLRRCContainer(CuUeCb *ueCb, uint8_t rrcMsgType, RRCContainer_t *rrcContainer) { uint8_t ret, bufLen; ret =ROK; if(rrcMsgType == RRC_SETUP) { - ret = fillDlCcchRrcMsg(ueId, rrcContainer); + ret = fillDlCcchRrcMsg(ueCb, rrcContainer); if(ret == RFAILED) - DU_LOG("\nERROR --> F1AP: Failed to fill DL-CCCH Msg at RRC SETUP"); + DU_LOG("\nERROR --> F1AP: Failed to fill DL-CCCH Msg at RRC SETUP"); } else if(rrcMsgType == REGISTRATION_ACCEPT) { @@ -1561,40 +1580,89 @@ uint8_t BuildDLRRCContainer(uint8_t ueId, uint8_t rrcMsgType, RRCContainer_t *rr CU_ALLOC(rrcContainer->buf, rrcContainer->size); if(rrcContainer->buf != NULLP) { - memset(rrcContainer->buf, 0, bufLen); - memcpy(rrcContainer->buf, buf, bufLen); + memset(rrcContainer->buf, 0, bufLen); + memcpy(rrcContainer->buf, buf, bufLen); + } + else + { + DU_LOG("\nERROR --> F1AP : Memory allocation failure for RRC Container buffer"); + ret = RFAILED; } } else if(rrcMsgType == RRC_RECONFIG) { /*Hardcoded RRC Container from reference logs*/ char buf[196]= { - 0x00, 0x04, 0x00, 0xaa, 0x80, 0x40, 0x9a, 0x05, 0x20, 0x00, 0x05, 0xeb, 0xc0, 0x51, 0x50, 0x00, - 0x03, 0x00, 0x03, 0xf7, 0x56, 0xec, 0x7f, 0x08, 0x42, 0x10, 0x80, 0x00, 0x10, 0x21, 0x47, 0x84, - 0xd1, 0x00, 0x00, 0x00, 0x02, 0x81, 0x5d, 0x10, 0x0a, 0xc2, 0x44, 0x40, 0x2b, 0xb2, 0x07, 0x41, - 0x87, 0xa8, 0x02, 0xc7, 0x00, 0x88, 0x05, 0x76, 0x40, 0xe8, 0x30, 0xf5, 0x40, 0x4c, 0x00, 0x10, - 0x02, 0x00, 0xa5, 0x83, 0xe0, 0x60, 0x02, 0x10, 0x72, 0x01, 0x0c, 0xa0, 0xa0, 0xd8, 0x00, 0x00, - 0x00, 0x01, 0x0f, 0x02, 0x3c, 0x01, 0x80, 0x10, 0x82, 0xb0, 0x40, 0x00, 0x00, 0x02, 0x1e, 0x04, - 0x78, 0x07, 0x00, 0x21, 0x05, 0x61, 0x00, 0x00, 0x00, 0x04, 0x3c, 0x08, 0xf0, 0x16, 0x00, 0x42, - 0x0a, 0xc3, 0x00, 0x00, 0x00, 0x08, 0x78, 0x11, 0xe0, 0x3c, 0x00, 0x84, 0x14, 0x00, 0x07, 0xe5, - 0xc0, 0xa0, 0xd8, 0x42, 0x20, 0x02, 0x80, 0xa0, 0x02, 0x24, 0x47, 0xa0, 0x20, 0x27, 0xa1, 0x22, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x24, 0x41, 0x20, 0xc0, 0x80, 0x00, 0x20, 0x80, - 0x00, 0x25, 0x20, 0xa0, 0x38, 0x00, 0x00, 0x00, 0x44, 0xa2, 0x82, 0x69, 0xee, 0x0c, 0xad, 0xca, - 0x4c, 0x2c, 0x8d, 0x2e, 0x6f, 0x2e, 0x69, 0x2d, 0xce, 0x8c, 0xae, 0x4d, 0xcc, 0xae, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00}; + 0x00, 0x04, 0x00, 0xaa, 0x80, 0x40, 0x9a, 0x05, 0x20, 0x00, 0x05, 0xeb, 0xc0, 0x51, 0x50, 0x00, + 0x03, 0x00, 0x03, 0xf7, 0x56, 0xec, 0x7f, 0x08, 0x42, 0x10, 0x80, 0x00, 0x10, 0x21, 0x47, 0x84, + 0xd1, 0x00, 0x00, 0x00, 0x02, 0x81, 0x5d, 0x10, 0x0a, 0xc2, 0x44, 0x40, 0x2b, 0xb2, 0x07, 0x41, + 0x87, 0xa8, 0x02, 0xc7, 0x00, 0x88, 0x05, 0x76, 0x40, 0xe8, 0x30, 0xf5, 0x40, 0x4c, 0x00, 0x10, + 0x02, 0x00, 0xa5, 0x83, 0xe0, 0x60, 0x02, 0x10, 0x72, 0x01, 0x0c, 0xa0, 0xa0, 0xd8, 0x00, 0x00, + 0x00, 0x01, 0x0f, 0x02, 0x3c, 0x01, 0x80, 0x10, 0x82, 0xb0, 0x40, 0x00, 0x00, 0x02, 0x1e, 0x04, + 0x78, 0x07, 0x00, 0x21, 0x05, 0x61, 0x00, 0x00, 0x00, 0x04, 0x3c, 0x08, 0xf0, 0x16, 0x00, 0x42, + 0x0a, 0xc3, 0x00, 0x00, 0x00, 0x08, 0x78, 0x11, 0xe0, 0x3c, 0x00, 0x84, 0x14, 0x00, 0x07, 0xe5, + 0xc0, 0xa0, 0xd8, 0x42, 0x20, 0x02, 0x80, 0xa0, 0x02, 0x24, 0x47, 0xa0, 0x20, 0x27, 0xa1, 0x22, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x24, 0x41, 0x20, 0xc0, 0x80, 0x00, 0x20, 0x80, + 0x00, 0x25, 0x20, 0xa0, 0x38, 0x00, 0x00, 0x00, 0x44, 0xa2, 0x82, 0x69, 0xee, 0x0c, 0xad, 0xca, + 0x4c, 0x2c, 0x8d, 0x2e, 0x6f, 0x2e, 0x69, 0x2d, 0xce, 0x8c, 0xae, 0x4d, 0xcc, 0xae, 0x80, 0x00, + 0x00, 0x00, 0x00, 0x00}; bufLen =196; rrcContainer->size = bufLen; CU_ALLOC(rrcContainer->buf, rrcContainer->size); if(rrcContainer->buf != NULLP) { - memset(rrcContainer->buf, 0, bufLen); - memcpy(rrcContainer->buf, buf, bufLen); + memset(rrcContainer->buf, 0, bufLen); + memcpy(rrcContainer->buf, buf, bufLen); + } + else + { + DU_LOG("\nERROR --> F1AP : Memory allocation failure for RRC Container buffer"); + ret = RFAILED; } } return ret; } +/******************************************************************* + * + * @brief Frees the DLRRCMessageTransfer + * + * @details + * + * Function : freeDlRrcMessageTransfer + * + * Functionality: Frees the DLRRCMessageTransfer + * + * @params[in] + * + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +void freeDlRrcMessageTransfer(F1AP_PDU_t *f1apMsg) +{ + uint8_t idx=0; + DLRRCMessageTransfer_t *dlRRCMsg = NULLP; + + if(f1apMsg) + { + dlRRCMsg = &f1apMsg->choice.initiatingMessage->value.choice.DLRRCMessageTransfer; + if(dlRRCMsg->protocolIEs.list.array) + { + idx = 3; + CU_FREE(dlRRCMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, \ + dlRRCMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size); + for(idx=0; idxprotocolIEs.list.count; idx++) + { + CU_FREE(dlRRCMsg->protocolIEs.list.array[idx], sizeof(DLRRCMessageTransferIEs_t)); + } + CU_FREE(dlRRCMsg->protocolIEs.list.array, dlRRCMsg->protocolIEs.list.size); + } + CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); + } +} + /******************************************************************* * * @brief Builds and sends the DLRRCMessageTransfer @@ -1612,7 +1680,7 @@ uint8_t BuildDLRRCContainer(uint8_t ueId, uint8_t rrcMsgType, RRCContainer_t *rr * RFAILED - failure * * ****************************************************************/ -uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t ueId, uint8_t srbId, uint8_t rrcMsgType) +uint8_t BuildAndSendDLRRCMessageTransfer(uint32_t duId, CuUeCb *ueCb, uint8_t srbId, uint8_t rrcMsgType) { uint8_t elementCnt = 0; uint8_t ieId; @@ -1631,8 +1699,7 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t ueId, uint8_t srbId, uint8_t rr } f1apMsg->present = F1AP_PDU_PR_initiatingMessage; - CU_ALLOC(f1apMsg->choice.initiatingMessage, - sizeof(InitiatingMessage_t)); + CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t)); if(f1apMsg->choice.initiatingMessage == NULLP) { DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); @@ -1664,52 +1731,44 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t ueId, uint8_t srbId, uint8_t rr CU_ALLOC(dlRRCMsg->protocolIEs.list.array[idx], sizeof(DLRRCMessageTransferIEs_t)); if(dlRRCMsg->protocolIEs.list.array[idx] == NULLP) { - for(ieId=0; ieIdprotocolIEs.list.array[ieId],\ - sizeof(DLRRCMessageTransferIEs_t)); - } - CU_FREE(dlRRCMsg->protocolIEs.list.array,\ - dlRRCMsg->protocolIEs.list.size); - CU_FREE(f1apMsg->choice.initiatingMessage,\ - sizeof(InitiatingMessage_t)); - CU_FREE(f1apMsg,sizeof(F1AP_PDU_t)); - return RFAILED; + for(ieId=0; ieIdprotocolIEs.list.array[ieId], sizeof(DLRRCMessageTransferIEs_t)); + } + CU_FREE(dlRRCMsg->protocolIEs.list.array, dlRRCMsg->protocolIEs.list.size); + CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t)); + CU_FREE(f1apMsg,sizeof(F1AP_PDU_t)); + return RFAILED; } } /* GNB CU UE F1AP ID */ idx = 0; dlRRCMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID; - dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; - dlRRCMsg->protocolIEs.list.array[idx]->value.present = \ - DLRRCMessageTransferIEs__value_PR_GNB_CU_UE_F1AP_ID; - dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = ueId; + dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; + dlRRCMsg->protocolIEs.list.array[idx]->value.present = DLRRCMessageTransferIEs__value_PR_GNB_CU_UE_F1AP_ID; + dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId; /* GNB DU UE F1AP ID */ idx++; - dlRRCMsg->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID; - dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; - dlRRCMsg->protocolIEs.list.array[idx]->value.present = \ - DLRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID; - dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueId; + dlRRCMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID; + dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; + dlRRCMsg->protocolIEs.list.array[idx]->value.present = DLRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID; + dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;; /* SRBID */ idx++; dlRRCMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_SRBID; - dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; - dlRRCMsg->protocolIEs.list.array[idx]->value.present = \ - DLRRCMessageTransferIEs__value_PR_SRBID; + dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; + dlRRCMsg->protocolIEs.list.array[idx]->value.present = DLRRCMessageTransferIEs__value_PR_SRBID; dlRRCMsg->protocolIEs.list.array[idx]->value.choice.SRBID = srbId; /* RRCContainer */ idx++; dlRRCMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCContainer; - dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; - dlRRCMsg->protocolIEs.list.array[idx]->value.present = \ - DLRRCMessageTransferIEs__value_PR_RRCContainer; - BuildDLRRCContainer(ueId, rrcMsgType, &dlRRCMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer); + dlRRCMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject; + dlRRCMsg->protocolIEs.list.array[idx]->value.present = DLRRCMessageTransferIEs__value_PR_RRCContainer; + BuildDLRRCContainer(ueCb, rrcMsgType, &dlRRCMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer); xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg); @@ -1717,12 +1776,12 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t ueId, uint8_t srbId, uint8_t rr memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ - encBuf); + encBuf); /* Encode results */ if(encRetVal.encoded == ENCODE_FAIL) { DU_LOG( "\nERROR --> F1AP : Could not encode DL RRC Message Transfer structure (at %s)\n",\ - encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); + encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); return RFAILED; } else @@ -1730,17 +1789,17 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t ueId, uint8_t srbId, uint8_t rr DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for DL RRC Message transfer\n"); for(int i=0; i< encBufSize; i++) { - DU_LOG("%x",encBuf[i]); + DU_LOG("%x",encBuf[i]); } } /* Sending msg */ - if(SendF1APMsg(CU_APP_MEM_REG,CU_POOL) != ROK) + if(SendF1APMsg(CU_APP_MEM_REG,CU_POOL, duId) != ROK) { DU_LOG("\nERROR --> F1AP : Sending DL RRC Message Transfer Failed"); return RFAILED; } - + freeDlRrcMessageTransfer(f1apMsg); return ROK; }/* End of BuildAndSendDLRRCMessageTransfer */ @@ -1762,10 +1821,10 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t ueId, uint8_t srbId, uint8_t rr * * ****************************************************************/ -uint8_t setDlRRCMsgType(uint8_t ueId) +uint8_t setDlRRCMsgType(CuUeCb *ueCb) { uint8_t rrcMsgType = 0; - switch(ueCb[ueId -1].f1apMsgDb.dlRrcMsgCount) + switch(ueCb->f1apMsgDb.dlRrcMsgCount) { case RRC_SETUP: rrcMsgType = RRC_SETUP; @@ -1808,13 +1867,19 @@ uint8_t setDlRRCMsgType(uint8_t ueId) * * ****************************************************************/ -uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg) +uint8_t procInitULRRCMsg(uint32_t duId, F1AP_PDU_t *f1apMsg) { uint8_t idx, rrcMsgType, gnbDuUeF1apId; uint8_t ret =ROK; + uint32_t nrCellId, crnti; + DuDb *duDb; + CuCellCb *cellCb; + CuUeCb *ueCb; InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP; + DU_LOG("\nINFO --> F1AP : filling the required values in DB in procInitULRRCMsg"); + duDb = getDuDb(duId); initULRRCMsg = &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer; for(idx=0; idx < initULRRCMsg->protocolIEs.list.count; idx++) @@ -1824,29 +1889,48 @@ uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg) case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID: gnbDuUeF1apId = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID; break; + case ProtocolIE_ID_id_NRCGI: + nrCellId = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.NRCGI.nRCellIdentity.buf[4] >> + initULRRCMsg->protocolIEs.list.array[idx]->value.choice.NRCGI.nRCellIdentity.bits_unused; + cellCb = getCellCb(duDb, nrCellId); + if(cellCb == NULLP) + return RFAILED; break; + case ProtocolIE_ID_id_C_RNTI: + crnti = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.C_RNTI; + if(duDb->ueCb[gnbDuUeF1apId-1].gnbDuUeF1apId == 0) + { + ueCb = &duDb->ueCb[gnbDuUeF1apId-1]; + memset(ueCb, 0, sizeof(CuUeCb)); + ueCb->cellCb = cellCb; + ueCb->crnti = crnti; + ueCb->gnbDuUeF1apId = gnbDuUeF1apId; + ueCb->gnbCuUeF1apId = ++cuCb.gnbCuUeF1apIdGenerator; + (duDb->numUe)++; + + cellCb->ueCb[cellCb->numUe] = ueCb; + cellCb->numUe++; + } break; + case ProtocolIE_ID_id_RRCContainer: break; + case ProtocolIE_ID_id_DUtoCURRCContainer: { - if((initULRRCMsg->protocolIEs.list.array[idx]->value.choice\ - .DUtoCURRCContainer.size > 0) && (initULRRCMsg->protocolIEs\ - .list.array[idx]->value.choice.DUtoCURRCContainer.buf != NULLP)) + if((initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.size > 0) && \ + (initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.buf != NULLP)) { DU_LOG("\nINFO --> Received Du to Cu RRC Container "); - ueCb[gnbDuUeF1apId-1].ueId = gnbDuUeF1apId; - ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.size = initULRRCMsg->protocolIEs\ - .list.array[idx]->value.choice.DUtoCURRCContainer.size; - CU_ALLOC(ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.buf, \ - ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.size); - if(ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.buf != NULLP) + ueCb->f1apMsgDb.duToCuContainer.size = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.size; + CU_ALLOC(ueCb->f1apMsgDb.duToCuContainer.buf, ueCb->f1apMsgDb.duToCuContainer.size); + if(ueCb->f1apMsgDb.duToCuContainer.buf != NULLP) { - memcpy(ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.buf, initULRRCMsg->protocolIEs\ - .list.array[idx]->value.choice.DUtoCURRCContainer.buf, ueCb[gnbDuUeF1apId-1].f1apMsgDb\ - .duToCuContainer.size); + memcpy(ueCb->f1apMsgDb.duToCuContainer.buf, \ + initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.buf, \ + ueCb->f1apMsgDb.duToCuContainer.size); } } else @@ -1856,16 +1940,18 @@ uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg) } break; } + default: DU_LOG("\nERROR --> Invalid Event %ld", initULRRCMsg->protocolIEs.list.array[idx]->id); break; } } + if(ret == ROK) { - ueCb[gnbDuUeF1apId-1].f1apMsgDb.dlRrcMsgCount++; - rrcMsgType = setDlRRCMsgType(gnbDuUeF1apId); - ret = BuildAndSendDLRRCMessageTransfer(gnbDuUeF1apId, SRB0, rrcMsgType); + ueCb->f1apMsgDb.dlRrcMsgCount++; + rrcMsgType = setDlRRCMsgType(ueCb); + ret = BuildAndSendDLRRCMessageTransfer(duId, ueCb, SRB0, rrcMsgType); } return ret; } @@ -1885,12 +1971,13 @@ uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildNrcgi(NRCGI_t *nrcgi) +uint8_t BuildNrcgi(NRCGI_t *nrcgi, uint32_t nrCellId) { uint8_t ret; uint8_t unused_bits = 4; uint8_t byteSize = 5; - uint8_t val = 1; + uint8_t val = nrCellId << unused_bits; + /* Allocate Buffer Memory */ nrcgi->pLMN_Identity.size = 3 * sizeof(uint8_t); CU_ALLOC(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size); @@ -1898,7 +1985,7 @@ uint8_t BuildNrcgi(NRCGI_t *nrcgi) { return RFAILED; } - ret = buildPlmnId(cuCfgParams.plmn , nrcgi->pLMN_Identity.buf); + ret = buildPlmnId(cuCb.cuCfgParams.plmn , nrcgi->pLMN_Identity.buf); if(ret != ROK) { @@ -1910,16 +1997,7 @@ uint8_t BuildNrcgi(NRCGI_t *nrcgi) { return RFAILED; } -#if 0 - ret = fillBitString(&nrcgi->nRCellIdentity, unused, byteSize, val); - if(ret != ROK) - { - return RFAILED; - } -#endif - memset(nrcgi->nRCellIdentity.buf, 0, nrcgi->nRCellIdentity.size); - nrcgi->nRCellIdentity.buf[0] |= val; - nrcgi->nRCellIdentity.bits_unused = unused_bits; + fillBitString(&nrcgi->nRCellIdentity, unused_bits, byteSize, val); return ROK; } @@ -1939,7 +2017,7 @@ uint8_t BuildNrcgi(NRCGI_t *nrcgi) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildSplCellList(SCell_ToBeSetup_List_t *spCellLst) +uint8_t BuildSplCellList(CuUeCb *ueCb, SCell_ToBeSetup_List_t *spCellLst) { uint8_t cellCnt; uint8_t idx; @@ -1963,10 +2041,10 @@ uint8_t BuildSplCellList(SCell_ToBeSetup_List_t *spCellLst) idx = 0; spCellLst->list.array[idx]->id = ProtocolIE_ID_id_SCell_ToBeSetup_Item; spCellLst->list.array[idx]->criticality = Criticality_ignore; - spCellLst->list.array[idx]->value.present =\ - SCell_ToBeSetup_ItemIEs__value_PR_SCell_ToBeSetup_Item; + spCellLst->list.array[idx]->value.present = SCell_ToBeSetup_ItemIEs__value_PR_SCell_ToBeSetup_Item; + /* Special Cell ID -NRCGI */ - ret = BuildNrcgi(&spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCell_ID); + ret = BuildNrcgi(&spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCell_ID, ueCb->cellCb->nrCellId); if(ret != ROK) { return RFAILED; @@ -1996,6 +2074,7 @@ uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet) { uint8_t idx; uint8_t srbCnt; + srbCnt = 1; srbSet->list.count = srbCnt; srbSet->list.size = srbCnt*sizeof(SRBs_ToBeSetup_ItemIEs_t *); @@ -2004,6 +2083,7 @@ uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet) { return RFAILED; } + for(idx=0; idxlist.array[idx],sizeof(SRBs_ToBeSetup_ItemIEs_t)); @@ -2012,11 +2092,11 @@ uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet) return RFAILED; } } + idx = 0; srbSet->list.array[idx]->id = ProtocolIE_ID_id_SRBs_ToBeSetup_Item; srbSet->list.array[idx]->criticality = Criticality_ignore; - srbSet->list.array[idx]->value.present = \ - SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item; + srbSet->list.array[idx]->value.present = SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item; srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = 2; return ROK; }/* End of BuildSRBSetup*/ @@ -2316,7 +2396,7 @@ uint8_t BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo) ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\ gTP_TEID.buf[2] = 0; ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\ - gTP_TEID.buf[3] = cuCfgParams.egtpParams.currTunnelId++; + gTP_TEID.buf[3] = cuCb.cuCfgParams.egtpParams.currTunnelId++; return ROK; }/*End of BuildULTnlInfo*/ @@ -2392,7 +2472,7 @@ uint8_t BuildDRBSetup(DRBs_ToBeSetup_List_t *drbSet) } /*SNSSAI*/ BuildSNSSAIret = BuildSNSSAI(&drbSetItem->qoSInformation.choice.\ - choice_extension->value.choice.DRB_Information.sNSSAI, cuCfgParams.snssaiList[0]); + choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0]); if(BuildSNSSAIret != ROK) { DU_LOG("\nERROR --> F1AP : Failed to build SNSSAI Info in BuildDRBSetup"); @@ -3825,7 +3905,63 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg) uint8_t BuildBWPUlDedPucchCfg(PUCCH_Config_t *pucchCfg) { uint8_t arrIdx, elementCnt; + uint8_t rsrcIdx, rsrcSetIdx; + PUCCH_ResourceSet_t *rsrcSet = NULLP; + PUCCH_Resource_t *rsrc = NULLP; + + //RESOURCE SET + elementCnt = 1; + CU_ALLOC(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList)); + pucchCfg->resourceSetToAddModList->list.count = elementCnt; + pucchCfg->resourceSetToAddModList->list.size = elementCnt * sizeof(PUCCH_ResourceSet_t *); + CU_ALLOC(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size); + for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++) + { + CU_ALLOC(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t)); + } + rsrcSetIdx = 0; + rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx]; + rsrcSet->pucch_ResourceSetId = 1; + elementCnt = 1; + rsrcSet->resourceList.list.count = elementCnt; + rsrcSet->resourceList.list.size = elementCnt * sizeof(PUCCH_ResourceId_t *); + CU_ALLOC(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size); + for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++) + { + CU_ALLOC(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t)); + } + rsrcIdx = 0; + *(rsrcSet->resourceList.list.array[rsrcIdx]) = 1; + //RESOURCE + elementCnt = 1; + CU_ALLOC(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList)); + pucchCfg->resourceToAddModList->list.count = elementCnt; + pucchCfg->resourceToAddModList->list.size = elementCnt * sizeof(PUCCH_Resource_t *); + CU_ALLOC(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size); + for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++) + { + CU_ALLOC(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t)); + } + rsrcIdx = 0; + rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx]; + rsrc->pucch_ResourceId = 1; + rsrc->startingPRB = 0; + rsrc->format.present = PUCCH_Resource__format_PR_format1; + CU_ALLOC(rsrc->format.choice.format1, sizeof(PUCCH_format1_t)); + rsrc->format.choice.format1->initialCyclicShift = 0; + rsrc->format.choice.format1->nrofSymbols = 4; + rsrc->format.choice.format1->startingSymbolIndex = 0; + rsrc->format.choice.format1->timeDomainOCC = 0; + + //PUCCH Format 1 + CU_ALLOC(pucchCfg->format1, sizeof(struct PUCCH_Config__format1)); + pucchCfg->format1->present = PUCCH_Config__format1_PR_setup; + CU_ALLOC(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t)); + CU_ALLOC(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long)); + *(pucchCfg->format1->choice.setup->nrofSlots) = PUCCH_FormatConfig__nrofSlots_n4; + + //DL DATA TO UL ACK CU_ALLOC(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK)); if(pucchCfg->dl_DataToUL_ACK == NULLP) { @@ -4643,8 +4779,8 @@ uint8_t BuildTagConfig(struct TAG_Config *tagConfig) CU_ALLOC(tagList->list.array[idx], sizeof(struct TAG)); if(!tagList->list.array[idx]) { - DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildTagConfig"); - return RFAILED; + DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildTagConfig"); + return RFAILED; } } @@ -4768,8 +4904,8 @@ uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingReque CU_ALLOC(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod)); if(!schReqList->list.array[idx]) { - DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSchedulingReqConfig"); - return RFAILED; + DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSchedulingReqConfig"); + return RFAILED; } } @@ -5017,6 +5153,105 @@ void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg) } } + +/******************************************************************* + * + * @brief Frees memory allocated for Dedicated PUCCH config + * + * @details + * + * Function : FreeBWPUlDedPucchCfg + * + * Functionality: Deallocating memory of Dedicated PUCCH cfg + * + * @params[in] BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg + * + * @return void + * + * ****************************************************************/ +void FreeBWPUlDedPucchCfg(struct BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg) +{ + uint8_t arrIdx, rsrcIdx, rsrcSetIdx; + PUCCH_Config_t *pucchCfg = NULLP; + PUCCH_ResourceSet_t *rsrcSet = NULLP; + PUCCH_Resource_t *rsrc = NULLP; + + if(ulBwpPucchCfg) + { + if(ulBwpPucchCfg->choice.setup) + { + pucchCfg = ulBwpPucchCfg->choice.setup; + + //Free resource set list + if(pucchCfg->resourceSetToAddModList) + { + if(pucchCfg->resourceSetToAddModList->list.array) + { + for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++) + { + rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx]; + if(rsrcSet->resourceList.list.array) + { + for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++) + { + CU_FREE(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t)); + } + CU_FREE(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size); + } + CU_FREE(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t)); + } + CU_FREE(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size); + } + CU_FREE(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList)); + } + + //Free resource list + if(pucchCfg->resourceToAddModList) + { + if(pucchCfg->resourceToAddModList->list.array) + { + for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++) + { + rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx]; + CU_FREE(rsrc->format.choice.format1, sizeof(PUCCH_format1_t)); + CU_FREE(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t)); + } + CU_FREE(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size); + } + CU_FREE(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList)); + } + + //PUCCH Format 1 + if(pucchCfg->format1) + { + if(pucchCfg->format1->choice.setup) + { + CU_FREE(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long)); + CU_FREE(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t)); + } + CU_FREE(pucchCfg->format1, sizeof(struct PUCCH_Config__format1)); + } + + //DL DATA TO UL ACK + if(pucchCfg->dl_DataToUL_ACK) + { + if(pucchCfg->dl_DataToUL_ACK->list.array) + { + for(arrIdx = 0; arrIdx < pucchCfg->dl_DataToUL_ACK->list.count; arrIdx++) + { + CU_FREE(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx], sizeof(long)); + } + CU_FREE(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size); + } + CU_FREE(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK)); + } + + CU_FREE(ulBwpPucchCfg->choice.setup, sizeof(PUCCH_Config_t)); + } + CU_FREE(ulBwpPucchCfg, sizeof(struct BWP_UplinkDedicated__pucch_Config)); + } +} + /******************************************************************* * * @brief Frees memory allocated for InitialUlBWP @@ -5042,114 +5277,116 @@ void FreeInitialUlBWP(BWP_UplinkDedicated_t *ulBwp) struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP; struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP; + FreeBWPUlDedPucchCfg(ulBwp->pucch_Config); + if(ulBwp->pusch_Config) { if(ulBwp->pusch_Config->choice.setup) { - puschCfg=ulBwp->pusch_Config->choice.setup; - if(puschCfg->dataScramblingIdentityPUSCH) - { - if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) - { - FreePuschTimeDomAllocList(puschCfg); - dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA; - if(dmrsUlCfg->choice.setup) - { - if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) - { - if(dmrsUlCfg->choice.setup->transformPrecodingDisabled) - { - CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\ - sizeof(long)); - CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled, - sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled)); - } - CU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition, - sizeof(long)); - } - CU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t)); - } - CU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \ - sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA)); - } - CU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long)); - } - CU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t)); + puschCfg=ulBwp->pusch_Config->choice.setup; + if(puschCfg->dataScramblingIdentityPUSCH) + { + if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) + { + FreePuschTimeDomAllocList(puschCfg); + dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA; + if(dmrsUlCfg->choice.setup) + { + if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) + { + if(dmrsUlCfg->choice.setup->transformPrecodingDisabled) + { + CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\ + sizeof(long)); + CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled, + sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled)); + } + CU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition, + sizeof(long)); + } + CU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t)); + } + CU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \ + sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA)); + } + CU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long)); + } + CU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t)); } CU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config)); /* Free SRS-Config */ if(ulBwp->srs_Config) { - if(ulBwp->srs_Config->choice.setup) - { - srsCfg = ulBwp->srs_Config->choice.setup; + if(ulBwp->srs_Config->choice.setup) + { + srsCfg = ulBwp->srs_Config->choice.setup; - /* Free Resource Set to add/mod list */ - if(srsCfg->srs_ResourceSetToAddModList) - { - rsrcSetList = srsCfg->srs_ResourceSetToAddModList; - if(rsrcSetList->list.array) - { - rSetIdx = 0; + /* Free Resource Set to add/mod list */ + if(srsCfg->srs_ResourceSetToAddModList) + { + rsrcSetList = srsCfg->srs_ResourceSetToAddModList; + if(rsrcSetList->list.array) + { + rSetIdx = 0; - /* Free SRS resource Id list in this SRS resource set */ - if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList) - { - rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList; + /* Free SRS resource Id list in this SRS resource set */ + if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList) + { + rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList; - if(rsrcIdList->list.array) - { - for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++) - { - CU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t)); - } - CU_FREE(rsrcIdList->list.array, rsrcIdList->list.size); - } - CU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\ - sizeof(struct SRS_ResourceSet__srs_ResourceIdList)); - } + if(rsrcIdList->list.array) + { + for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++) + { + CU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t)); + } + CU_FREE(rsrcIdList->list.array, rsrcIdList->list.size); + } + CU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\ + sizeof(struct SRS_ResourceSet__srs_ResourceIdList)); + } - /* Free resource type info for this SRS resource set */ - CU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \ - sizeof(struct SRS_ResourceSet__resourceType__aperiodic)); + /* Free resource type info for this SRS resource set */ + CU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \ + sizeof(struct SRS_ResourceSet__resourceType__aperiodic)); - /* Free memory for each resource set */ - for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++) - { - CU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t)); - } - CU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); - } - CU_FREE(srsCfg->srs_ResourceSetToAddModList, \ - sizeof(struct SRS_Config__srs_ResourceSetToAddModList)); - } + /* Free memory for each resource set */ + for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++) + { + CU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t)); + } + CU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); + } + CU_FREE(srsCfg->srs_ResourceSetToAddModList, \ + sizeof(struct SRS_Config__srs_ResourceSetToAddModList)); + } - /* Free resource to add/modd list */ - if(srsCfg->srs_ResourceToAddModList) - { - resourceList = srsCfg->srs_ResourceToAddModList; - if(resourceList->list.array) - { - rsrcIdx = 0; - CU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\ - sizeof(struct SRS_Resource__transmissionComb__n2)); - CU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\ - sizeof(struct SRS_Resource__resourceType__aperiodic)); + /* Free resource to add/modd list */ + if(srsCfg->srs_ResourceToAddModList) + { + resourceList = srsCfg->srs_ResourceToAddModList; + if(resourceList->list.array) + { + rsrcIdx = 0; + CU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\ + sizeof(struct SRS_Resource__transmissionComb__n2)); + CU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\ + sizeof(struct SRS_Resource__resourceType__aperiodic)); - for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++) - { - CU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t)); - } - CU_FREE(resourceList->list.array, resourceList->list.size); - } - CU_FREE(srsCfg->srs_ResourceToAddModList, \ - sizeof(struct SRS_Config__srs_ResourceToAddModList)); - } + for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++) + { + CU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t)); + } + CU_FREE(resourceList->list.array, resourceList->list.size); + } + CU_FREE(srsCfg->srs_ResourceToAddModList, \ + sizeof(struct SRS_Config__srs_ResourceToAddModList)); + } - CU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t)); - } - CU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config)); + CU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t)); + } + CU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config)); } } } @@ -5756,13 +5993,13 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp) CU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList)); if(!cellGrpCfg.rlc_BearerToAddModList) { - DU_LOG("\nERROR --> F1AP : Memory allocation failure in CellGrpConfig"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation failure in CellGrpConfig"); + break; } if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK) { - DU_LOG("\nERROR --> F1AP : fillCellGrpCfg failed"); - break; + DU_LOG("\nERROR --> F1AP : fillCellGrpCfg failed"); + break; } cellGrpCfg.rlc_BearerToReleaseList = NULLP; @@ -5770,40 +6007,39 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp) CU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t)); if(!cellGrpCfg.mac_CellGroupConfig) { - DU_LOG("\nERROR --> F1AP : Memory allocation failure in fillCellGrpCfg"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation failure in fillCellGrpCfg"); + break; } if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK) { - DU_LOG("\nERROR --> F1AP : BuildMacCellGrpCfg failed"); - break; + DU_LOG("\nERROR --> F1AP : BuildMacCellGrpCfg failed"); + break; } - cellGrpCfg.physicalCellGroupConfig = NULLP; CU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t)); if(!cellGrpCfg.physicalCellGroupConfig) { - DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer"); + break; } if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK) { - DU_LOG("\nERROR --> F1AP : BuildPhyCellGrpCfg failed"); - break; + DU_LOG("\nERROR --> F1AP : BuildPhyCellGrpCfg failed"); + break; } cellGrpCfg.spCellConfig = NULLP; CU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t)); if(!cellGrpCfg.spCellConfig) { - DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer"); + break; } if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK) { - DU_LOG("\nERROR --> F1AP : BuildSpCellCfg failed"); - break; + DU_LOG("\nERROR --> F1AP : BuildSpCellCfg failed"); + break; } cellGrpCfg.sCellToAddModList = NULLP; @@ -5818,32 +6054,32 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp) /* Encode results */ if(encRetVal.encoded == ENCODE_FAIL) { - DU_LOG( "\nERROR --> F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\ - encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - break; + DU_LOG( "\nERROR --> F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\ + encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); + break; } else { - DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for DuToCuRrcContainer\n"); - for(int i=0; i< encBufSize; i++) - { - DU_LOG("%x",encBuf[i]); - } + DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for DuToCuRrcContainer\n"); + for(int i=0; i< encBufSize; i++) + { + DU_LOG("%x",encBuf[i]); + } } cellGrp->size = encBufSize; CU_ALLOC(cellGrp->buf, cellGrp->size); if(!cellGrp->buf) { - DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDuToCuRrcContainer"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDuToCuRrcContainer"); + break; } memcpy(cellGrp->buf, encBuf, cellGrp->size); ret = ROK; break; } FreeMemCellGrpCfg(&cellGrpCfg); - return ROK; + return ret; } /******************************************************************* @@ -6236,8 +6472,8 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu if(!ueCapablityList.list.array) { DU_LOG("\nERROR --> Memory allocation failed in fillUeCapRatContList"); - ret = RFAILED; - break; + ret = RFAILED; + break; } for(idx=0; idx Memory allocation failed in fillUeCapRatContList"); + DU_LOG("\nERROR --> Memory allocation failed in fillUeCapRatContList"); ret = RFAILED; - break; + break; } } idx = 0; @@ -6259,13 +6495,13 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; encRetVal = aper_encode(&asn_DEF_UE_CapabilityRAT_ContainerListRRC, 0, \ - &ueCapablityList, PrepFinalEncBuf, encBuf); + &ueCapablityList, PrepFinalEncBuf, encBuf); /* Encode results */ if(encRetVal.encoded == ENCODE_FAIL) { DU_LOG( "\nERROR --> F1AP : Could not encode UE Capability RAT Container (at %s)\n",\ - encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); + encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); break; } else @@ -6276,7 +6512,7 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu DU_LOG("%x",encBuf[i]); } } - + ueCapablityListBuf->size = encBufSize; CU_ALLOC(ueCapablityListBuf->buf, ueCapablityListBuf->size); if(!ueCapablityListBuf->buf) @@ -6335,24 +6571,25 @@ uint8_t fillCuToDuContainer(CUtoDURRCInformation_t *rrcMsg) if(rrcMsg->iE_Extensions->list.array == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed"); - ret = RFAILED; + DU_LOG("\nERROR --> F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed"); + ret = RFAILED; } for(idx=0; idxiE_Extensions->list.array[idx], sizeof(CUtoDURRCInformation_ExtIEs_t)); - if(rrcMsg->iE_Extensions->list.array[idx] == NULLP) - { - ret = RFAILED; - } + CU_ALLOC(rrcMsg->iE_Extensions->list.array[idx], sizeof(CUtoDURRCInformation_ExtIEs_t)); + if(rrcMsg->iE_Extensions->list.array[idx] == NULLP) + { + DU_LOG("\nERROR --> F1AP : Memory allocation for array elements failed"); + ret = RFAILED; + } } idx = 0; /* Filling CellGroupConfig_t IE */ rrcMsg->iE_Extensions->list.array[idx]->id = ProtocolIE_ID_id_CellGroupConfig; rrcMsg->iE_Extensions->list.array[idx]->criticality = Criticality_ignore; rrcMsg->iE_Extensions->list.array[idx]->extensionValue.present =\ - CUtoDURRCInformation_ExtIEs__extensionValue_PR_CellGroupConfig; + CUtoDURRCInformation_ExtIEs__extensionValue_PR_CellGroupConfig; ret = fillCellGrpCfg(&rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig); } return ret; @@ -6439,8 +6676,7 @@ void FreeCuToDuInfo(CUtoDURRCInformation_t *rrcMsg) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \ - uint16_t rrcContLen, uint8_t *rrcContainer) +uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcContLen, uint8_t *rrcContainer) { uint8_t Nrcgiret; uint8_t SplCellListret; @@ -6461,194 +6697,169 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \ CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t)); if(f1apMsg == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); + break; } f1apMsg->present = F1AP_PDU_PR_initiatingMessage; CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t)); if(f1apMsg->choice.initiatingMessage == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); + break; } - f1apMsg->choice.initiatingMessage->procedureCode = \ - ProcedureCode_id_UEContextSetup; + f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_UEContextSetup; f1apMsg->choice.initiatingMessage->criticality = Criticality_reject; - f1apMsg->choice.initiatingMessage->value.present = \ - InitiatingMessage__value_PR_UEContextSetupRequest; - ueSetReq = - &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest; + f1apMsg->choice.initiatingMessage->value.present = InitiatingMessage__value_PR_UEContextSetupRequest; + + ueSetReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest; elementCnt = 12; ueSetReq->protocolIEs.list.count = elementCnt; - ueSetReq->protocolIEs.list.size = \ - elementCnt * sizeof(UEContextSetupRequestIEs_t *); + ueSetReq->protocolIEs.list.size = elementCnt * sizeof(UEContextSetupRequestIEs_t *); /* Initialize the UESetup members */ CU_ALLOC(ueSetReq->protocolIEs.list.array,ueSetReq->protocolIEs.list.size); if(ueSetReq->protocolIEs.list.array == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for UE Context SetupRequest failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for UE Context SetupRequest failed"); + break; } for(idx1=0; idx1protocolIEs.list.array[idx1],sizeof(UEContextSetupRequestIEs_t)); - if(ueSetReq->protocolIEs.list.array[idx1] == NULLP) - { - break; - } + CU_ALLOC(ueSetReq->protocolIEs.list.array[idx1],sizeof(UEContextSetupRequestIEs_t)); + if(ueSetReq->protocolIEs.list.array[idx1] == NULLP) + { + break; + } } idx = 0; /*GNB CU UE F1AP ID*/ - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_GNB_CU_UE_F1AP_ID; - ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = cuUeF1apId; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_CU_UE_F1AP_ID; + ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId; /*GNB DU UE F1AP ID*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_GNB_DU_UE_F1AP_ID; - ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = duUeF1apId; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_DU_UE_F1AP_ID; + ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId; /*Special Cell ID*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_SpCell_ID; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_SpCell_ID; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_NRCGI; - Nrcgiret = BuildNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI); + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_NRCGI; + Nrcgiret = BuildNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI, ueCb->cellCb->nrCellId); if(Nrcgiret != ROK) { - break; + break; } /*Served Cell Index*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_ServCellIndex; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_ServCellIndex; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_ServCellIndex; - ueSetReq->protocolIEs.list.array[idx]->value.choice.ServCellIndex = \ - CELL_INDEX; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_ServCellIndex; + ueSetReq->protocolIEs.list.array[idx]->value.choice.ServCellIndex = CELL_INDEX; /*CellULConfigured*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_SpCellULConfigured; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_SpCellULConfigured; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_CellULConfigured; - ueSetReq->protocolIEs.list.array[idx]->value.choice.CellULConfigured = \ - CellULConfigured_none; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CellULConfigured; + ueSetReq->protocolIEs.list.array[idx]->value.choice.CellULConfigured = CellULConfigured_none; /*CUtoDURRCContainer*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_CUtoDURRCInformation; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_CUtoDURRCInformation; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_CUtoDURRCInformation; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CUtoDURRCInformation; if(fillCuToDuContainer(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation)) { - break; + break; } /*Special Cells to be SetupList*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_SCell_ToBeSetup_List; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_SCell_ToBeSetup_List; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List; - SplCellListret = BuildSplCellList(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List); + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List; + SplCellListret = BuildSplCellList(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List); if(SplCellListret != ROK) { - break; + break; } + /*SRBs To Be Setup List*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_SRBs_ToBeSetup_List; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_SRBs_ToBeSetup_List; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_SRBs_ToBeSetup_List; - SrbSetupret = BuildSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List); + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SRBs_ToBeSetup_List; + SrbSetupret = BuildSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List); if(SrbSetupret != ROK) { - break; + break; } + /*DRBs to Be Setup List*/ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_DRBs_ToBeSetup_List; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_DRBs_ToBeSetup_List; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_DRBs_ToBeSetup_List; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_DRBs_ToBeSetup_List; ret1 = BuildDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List); if(ret1 != ROK) { - break; + break; } /* RRC Container for security mode */ idx++; ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCContainer; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_RRCContainer; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_RRCContainer; + char secModeBuf[9]={0x00, 0x02, 0x22, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}; bufLen =9; ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size = bufLen; CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, - ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size); + ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size); if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf) { - DU_LOG("\nERROR --> F1AP : Memory allocation for BuildAndSendUeContextSetupReq failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for BuildAndSendUeContextSetupReq failed"); + break; } memset(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, 0, bufLen); memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, secModeBuf, bufLen); /* RRC delivery status request */ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_RRCDeliveryStatusRequest; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCDeliveryStatusRequest; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest; - ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = \ - RRCDeliveryStatusRequest_true; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest; + ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = RRCDeliveryStatusRequest_true; /* Bit Rate hardcoded as in reference logs */ idx++; - ueSetReq->protocolIEs.list.array[idx]->id = \ - ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL; + ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL; ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore; - ueSetReq->protocolIEs.list.array[idx]->value.present = \ - UEContextSetupRequestIEs__value_PR_BitRate; + ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_BitRate; + char bitRateBuf[4]= {0x3B, 0x37, 0xF4, 0xCD}; bufLen = 4; ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size = bufLen; CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf,\ - ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size); + ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size); if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf) { - DU_LOG("\nERROR --> F1AP : Failed to allocate memory for Bit Rate in BuildAndSendUeContextSetupReq()"); - break; + DU_LOG("\nERROR --> F1AP : Failed to allocate memory for Bit Rate in BuildAndSendUeContextSetupReq()"); + break; } memset(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf, 0, bufLen); memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf, bitRateBuf, bufLen); @@ -6658,29 +6869,29 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \ /* Encode the F1SetupRequest type as APER */ memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; - encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ - encBuf); + encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); + /* Encode results */ if(encRetVal.encoded == ENCODE_FAIL) { - DU_LOG( "\nERROR --> F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\ - encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - break; + DU_LOG( "\nERROR --> F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\ + encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); + break; } else { - DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for UE Context Setup Request\n"); - for(int i=0; i< encBufSize; i++) - { - DU_LOG("%x",encBuf[i]); - } + DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for UE Context Setup Request\n"); + for(int i=0; i< encBufSize; i++) + { + DU_LOG("%x",encBuf[i]); + } } /* Sending msg */ - if(SendF1APMsg(CU_APP_MEM_REG,CU_POOL) != ROK) + if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, duId) != ROK) { - DU_LOG("\nERROR --> F1AP : Sending UE Context Setup Request Failed"); - break; + DU_LOG("\nERROR --> F1AP : Sending UE Context Setup Request Failed"); + break; } ret = ROK; break; @@ -6827,10 +7038,14 @@ uint8_t procDrbSetupList(DRBs_Setup_List_t *drbSetupList) * RFAILED - failure * * ****************************************************************/ -uint8_t procUeContextSetupResponse(F1AP_PDU_t *f1apMsg) +uint8_t procUeContextSetupResponse(uint32_t duId, F1AP_PDU_t *f1apMsg) { uint8_t idx, duUeF1apId; + DuDb *duDb; + CuUeCb *ueCb; UEContextSetupResponse_t *ueCtxtSetupRsp = NULLP; + + duDb = getDuDb(duId); ueCtxtSetupRsp = &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse; for(idx=0; idx < ueCtxtSetupRsp->protocolIEs.list.count; idx++) @@ -6840,6 +7055,7 @@ uint8_t procUeContextSetupResponse(F1AP_PDU_t *f1apMsg) case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID: { duUeF1apId = ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID; + ueCb = &duDb->ueCb[duUeF1apId-1]; break; } case ProtocolIE_ID_id_DRBs_Setup_List: @@ -6851,7 +7067,7 @@ uint8_t procUeContextSetupResponse(F1AP_PDU_t *f1apMsg) } } } - ueCb[duUeF1apId-1].f1apMsgDb.dlRrcMsgCount++; /* keeping DL RRC Msg Count */ + ueCb->f1apMsgDb.dlRrcMsgCount++; /* keeping DL RRC Msg Count */ return ROK; } @@ -6871,83 +7087,87 @@ uint8_t procUeContextSetupResponse(F1AP_PDU_t *f1apMsg) * * ****************************************************************/ -uint8_t procUlRrcMsg(F1AP_PDU_t *f1apMsg) +uint8_t procUlRrcMsg(uint32_t duId, F1AP_PDU_t *f1apMsg) { uint8_t idx, ret, srbId, rrcMsgType; uint8_t cuUeF1apId, duUeF1apId; uint8_t *rrcContainer = NULLP; uint16_t rrcContLen; + DuDb *duDb; + CuUeCb *ueCb; ULRRCMessageTransfer_t *ulRrcMsg = NULLP; ret = ROK; + duDb = getDuDb(duId); ulRrcMsg = &f1apMsg->choice.initiatingMessage->value.choice.ULRRCMessageTransfer; for(idx=0; idx < ulRrcMsg->protocolIEs.list.count; idx++) { switch(ulRrcMsg->protocolIEs.list.array[idx]->id) { - case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID: - { - cuUeF1apId = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID; - break; - } - case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID: - { - duUeF1apId = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID; - break; - } - case ProtocolIE_ID_id_SRBID: - srbId = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.SRBID; - break; - case ProtocolIE_ID_id_RRCContainer: - { - rrcContLen = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size; - CU_ALLOC(rrcContainer, rrcContLen) - if(!rrcContainer) - { - DU_LOG("\nERROR --> F1AP : Failed to allocated memory in procUlRrcMsg"); - return RFAILED; - } - memcpy(rrcContainer, ulRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf,\ - rrcContLen); - break; - } + case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID: + { + cuUeF1apId = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID; + break; + } + case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID: + { + duUeF1apId = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID; + break; + } + case ProtocolIE_ID_id_SRBID: + srbId = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.SRBID; + break; - default: - DU_LOG("\nERROR --> F1AP : Invalid Event %ld", ulRrcMsg->protocolIEs.list.array[idx]->id); - break; + case ProtocolIE_ID_id_RRCContainer: + { + rrcContLen = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size; + CU_ALLOC(rrcContainer, rrcContLen); + if(!rrcContainer) + { + DU_LOG("\nERROR --> F1AP : Failed to allocated memory in procUlRrcMsg"); + return RFAILED; + } + memcpy(rrcContainer, ulRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, rrcContLen); + break; + } + + default: + DU_LOG("\nERROR --> F1AP : Invalid Event %ld", ulRrcMsg->protocolIEs.list.array[idx]->id); + break; } } + if(srbId == 1) { - ueCb[duUeF1apId-1].f1apMsgDb.dlRrcMsgCount++; - rrcMsgType = setDlRRCMsgType(duUeF1apId); + ueCb = &duDb->ueCb[duUeF1apId-1]; + ueCb->f1apMsgDb.dlRrcMsgCount++; + rrcMsgType = setDlRRCMsgType(ueCb); if(rrcMsgType == REGISTRATION_ACCEPT) { DU_LOG("\nINFO --> F1AP: Sending DL RRC MSG for RRC Registration Accept"); - ret = BuildAndSendDLRRCMessageTransfer(duUeF1apId, srbId, rrcMsgType); + ret = BuildAndSendDLRRCMessageTransfer(duId, ueCb, srbId, rrcMsgType); } if(rrcMsgType == UE_CONTEXT_SETUP_REQ) { - DU_LOG("\nINFO --> F1AP: Sending Ue Context Setup Req"); - ret = BuildAndSendUeContextSetupReq(cuUeF1apId, duUeF1apId,\ - rrcContLen, rrcContainer); + DU_LOG("\nINFO --> F1AP: Sending Ue Context Setup Req"); + ret = BuildAndSendUeContextSetupReq(duId, ueCb, rrcContLen, rrcContainer); } if(rrcMsgType == SECURITY_MODE_COMPLETE) { /* To trigger the DL RRC Msg for RRC Reconfig */ - ueCb[duUeF1apId-1].f1apMsgDb.dlRrcMsgCount++; - rrcMsgType = setDlRRCMsgType(duUeF1apId); + ueCb->f1apMsgDb.dlRrcMsgCount++; + rrcMsgType = setDlRRCMsgType(ueCb); if(rrcMsgType == RRC_RECONFIG) { DU_LOG("\nINFO --> F1AP: Sending DL RRC MSG for RRC Reconfig"); - BuildAndSendDLRRCMessageTransfer(duUeF1apId, srbId, rrcMsgType); + BuildAndSendDLRRCMessageTransfer(duId, ueCb, srbId, rrcMsgType); } } if(rrcMsgType == UE_CONTEXT_MOD_REQ) { DU_LOG("\nINFO --> F1AP: Sending UE Context Modification Request"); - BuildAndSendUeContextModificationReq(duUeF1apId); + BuildAndSendUeContextModificationReq(duId, ueCb); } } return ret; @@ -7027,8 +7247,8 @@ uint8_t BuildAndSendF1ResetAck() CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t)); if(f1apMsg == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); + break; } f1apMsg->present = F1AP_PDU_PR_successfulOutcome; @@ -7036,8 +7256,8 @@ uint8_t BuildAndSendF1ResetAck() CU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t)); if(f1apMsg->choice.successfulOutcome == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed"); + break; } f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_Reset; @@ -7053,17 +7273,17 @@ uint8_t BuildAndSendF1ResetAck() CU_ALLOC(f1ResetAck->protocolIEs.list.array, f1ResetAck->protocolIEs.list.size ); if(f1ResetAck->protocolIEs.list.array == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for F1ResetAckIEs failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for F1ResetAckIEs failed"); + break; } for(idx=0; idxprotocolIEs.list.array[idx], sizeof(ResetAcknowledgeIEs_t)); - if(f1ResetAck->protocolIEs.list.array[idx] == NULLP) - { - break; - } + CU_ALLOC(f1ResetAck->protocolIEs.list.array[idx], sizeof(ResetAcknowledgeIEs_t)); + if(f1ResetAck->protocolIEs.list.array[idx] == NULLP) + { + break; + } } /*TransactionID*/ idx = 0; @@ -7082,23 +7302,25 @@ uint8_t BuildAndSendF1ResetAck() /* Check encode results */ if(encRetVal.encoded == ENCODE_FAIL) { - DU_LOG("\nERROR --> F1AP : Could not encode F1ResetAck structure (at %s)\n",\ - encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - break; + DU_LOG("\nERROR --> F1AP : Could not encode F1ResetAck structure (at %s)\n",\ + encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); + break; } else { - DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for F1ResetAck \n"); - for(int i=0; i< encBufSize; i++) - { - DU_LOG("%x",encBuf[i]); - } + DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for F1ResetAck \n"); + for(int i=0; i< encBufSize; i++) + { + DU_LOG("%x",encBuf[i]); + } } + /* Sending msg */ - if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) + /* TODO : Hardcoding DU ID to 1 for messages other than F1 Setup Response. This will be made generic in future gerrit */ + if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, DU_ID) != ROK) { - DU_LOG("\nERROR --> F1AP : Sending F1 Reset Response failed"); - break; + DU_LOG("\nERROR --> F1AP : Sending F1 Reset Response failed"); + break; } ret = ROK; @@ -7108,6 +7330,7 @@ uint8_t BuildAndSendF1ResetAck() FreeF1ResetAck(f1apMsg); return ret; } + void FreeUlTnlInfoforDrb2(ULUPTNLInformation_ToBeSetup_List_t *ulInfo) { uint8_t arrIdx =0; @@ -7196,7 +7419,7 @@ uint8_t deleteEgtpTunnel(uint8_t *buf) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, uint8_t actionType) +uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, uint8_t actionType) { uint8_t arrIdx; uint8_t ulCnt; @@ -7277,27 +7500,15 @@ uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, ULUPTNLInformation_ToBeSetup_Lis { /*TODO: DRB context to be stored in CU STUB so that tunnel Id can be easily * fetched based on the Drb Id */ - if(ueId == 1) - { - /* Tunnel Id for DRB 2 of UE 1 is 2. Hence passing the same TeId */ - ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3] = 2; - } - else if(ueId == 2) - { - /* Tunnel Id for DRB 2 of UE 2 is 5. Hence passing the same TeId */ - ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3] = 5; - } - else if(ueId == 3) - { - /* Tunnel Id for DRB 2 of UE 3 is 8. Hence passing the same TeId */ - ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3] = 8; - } + /*For For UE Id=1, DRB=2 is modified. For UE Id = 2, DRB=5 is modified and so on.*/ + ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3]=\ + (MAX_NUM_DRB_ADDED_PER_UE *(ueId - 1)) + drbId; } else { ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\ - gTP_TEID.buf[3] = cuCfgParams.egtpParams.currTunnelId++; + gTP_TEID.buf[3] = cuCb.cuCfgParams.egtpParams.currTunnelId++; } return ROK; }/*End of BuildULTnlInfo*/ @@ -7408,7 +7619,7 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It uint8_t ret = ROK; /*Drb Id */ - drbItem->dRBID = arrIdx + DRB3; + drbItem->dRBID = arrIdx + DRB_ID_TO_ADD_MOD; /*qoSInformation*/ drbItem->qoSInformation.present = QoSInformation_PR_choice_extension; @@ -7462,7 +7673,7 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It /*SNSSAI*/ ret = BuildSNSSAI(&drbItem->qoSInformation.choice.\ - choice_extension->value.choice.DRB_Information.sNSSAI, cuCfgParams.snssaiList[1]); + choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[1]); if(ret != ROK) { DU_LOG("\nERROR --> F1AP : BuildSNSSAI failed"); @@ -7482,7 +7693,7 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It } /*ULUPTNLInformation To Be Setup List*/ - ret = BuildUlTnlInfoforSetupMod(ueId, &drbItem->uLUPTNLInformation_ToBeSetup_List, \ + ret = BuildUlTnlInfoforSetupMod(ueId, drbItem->dRBID, &drbItem->uLUPTNLInformation_ToBeSetup_List, \ ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item); if(ret != ROK) { @@ -7604,15 +7815,14 @@ uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet) if(drbSet->list.array[arrIdx] == NULLP) { DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDrbToBeSetupList for array idx [%d]", arrIdx); - return RFAILED; + return RFAILED; } - } - arrIdx = 0; - ret = FillDrbItemList(ueId, arrIdx, (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx]); - if(ret != ROK) - { - DU_LOG("\nERROR --> F1AP : FillDrbItemList failed"); + ret = FillDrbItemList(ueId, arrIdx, (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx]); + if(ret != ROK) + { + DU_LOG("\nERROR --> F1AP : FillDrbItemList failed"); + } } return ret; @@ -7635,12 +7845,12 @@ uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet) * * ****************************************************************/ -uint8_t FillDrbToBeModItem(uint8_t ueId, DRBs_ToBeModified_Item_t *drbItem) +uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_t *drbItem) { uint8_t ret = ROK; /*Drb Id */ - drbItem->dRBID = DRB2; + drbItem->dRBID = DRB2 + arrIdx; /*qoSInformation*/ drbItem->qoSInformation = NULLP; @@ -7698,7 +7908,7 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, DRBs_ToBeModified_Item_t *drbItem) /*SNSSAI*/ ret = BuildSNSSAI(&drbItem->qoSInformation->choice.\ - choice_extension->value.choice.DRB_Information.sNSSAI,cuCfgParams.snssaiList[0]); + choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0]); if(ret != ROK) { DU_LOG("\nERROR --> F1AP : BuildSNSSAI failed"); @@ -7719,7 +7929,7 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, DRBs_ToBeModified_Item_t *drbItem) }/* End of QoS */ /*ULUPTNLInformation To Be Setup List*/ - ret = BuildUlTnlInfoforSetupMod(ueId, &drbItem->uLUPTNLInformation_ToBeSetup_List,\ + ret = BuildUlTnlInfoforSetupMod(ueId, drbItem->dRBID, &drbItem->uLUPTNLInformation_ToBeSetup_List,\ ProtocolIE_ID_id_DRBs_ToBeModified_Item); if(ret != ROK) { @@ -7746,12 +7956,12 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, DRBs_ToBeModified_Item_t *drbItem) * * ****************************************************************/ -uint8_t FillDrbToBeModItemList(uint8_t ueId, struct DRBs_ToBeModified_ItemIEs *drbItemIe) +uint8_t FillDrbToBeModItemList(uint8_t ueId, uint8_t arrIdx, struct DRBs_ToBeModified_ItemIEs *drbItemIe) { drbItemIe->id = ProtocolIE_ID_id_DRBs_ToBeModified_Item; drbItemIe->criticality = Criticality_reject; drbItemIe->value.present = DRBs_ToBeModified_ItemIEs__value_PR_DRBs_ToBeModified_Item; - if(FillDrbToBeModItem(ueId, &(drbItemIe->value.choice.DRBs_ToBeModified_Item)) != ROK) + if(FillDrbToBeModItem(ueId, arrIdx, &(drbItemIe->value.choice.DRBs_ToBeModified_Item)) != ROK) { DU_LOG("\nERROR --> F1AP : FillDrbToBeModItem failed"); return RFAILED; @@ -7783,7 +7993,7 @@ uint8_t BuildDrbToBeModifiedList(uint8_t ueId, DRBs_ToBeModified_List_t *drbSet) uint8_t arrIdx =0; uint8_t drbCnt =0; - drbCnt = 1; + drbCnt = MAX_DRB_MODIFIED_UE_MOD_REQ; drbSet->list.count = drbCnt; drbSet->list.size = drbCnt * sizeof(DRBs_ToBeModified_ItemIEs_t *); CU_ALLOC(drbSet->list.array, drbSet->list.size); @@ -7798,15 +8008,14 @@ uint8_t BuildDrbToBeModifiedList(uint8_t ueId, DRBs_ToBeModified_List_t *drbSet) if(drbSet->list.array[arrIdx] == NULLP) { DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDrbToBeSetupList"); - return RFAILED; + return RFAILED; } - } - arrIdx=0; - ret = FillDrbToBeModItemList(ueId, (DRBs_ToBeModified_ItemIEs_t *)drbSet->list.array[arrIdx]); - if(ret != ROK) - { - DU_LOG("\nERROR --> F1AP : FillDrbToBeModItemList failed"); + ret = FillDrbToBeModItemList(ueId, arrIdx, (DRBs_ToBeModified_ItemIEs_t *)drbSet->list.array[arrIdx]); + if(ret != ROK) + { + DU_LOG("\nERROR --> F1AP : FillDrbToBeModItemList failed"); + } } return ret; @@ -7996,6 +8205,7 @@ void FreeUeContextModicationRequest(F1AP_PDU_t *f1apMsg) CU_FREE(f1apMsg, sizeof(F1AP_PDU_t)); } } + /******************************************************************* * * @brief Builds the Ue Context Modification Req @@ -8012,11 +8222,12 @@ void FreeUeContextModicationRequest(F1AP_PDU_t *f1apMsg) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId) +uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb) { uint8_t ieIdx = 0; uint8_t elementCnt = 0; uint8_t ret = RFAILED; + CuUeCb *ueCb = (CuUeCb *)cuUeCb; F1AP_PDU_t *f1apMsg = NULLP; UEContextModificationRequest_t *ueContextModifyReq = NULLP; @@ -8028,8 +8239,8 @@ uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId) CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t)); if(f1apMsg == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed Ue context modification"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed Ue context modification"); + break; } f1apMsg->present = F1AP_PDU_PR_initiatingMessage; @@ -8037,8 +8248,8 @@ uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId) CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t)); if(f1apMsg->choice.initiatingMessage == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed Ue context modification"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for F1AP-PDU failed Ue context modification"); + break; } f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_UEContextModification; f1apMsg->choice.initiatingMessage->criticality = Criticality_reject; @@ -8054,18 +8265,18 @@ uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId) CU_ALLOC(ueContextModifyReq->protocolIEs.list.array, ueContextModifyReq->protocolIEs.list.size); if(ueContextModifyReq->protocolIEs.list.array == NULLP) { - DU_LOG("\nERROR --> F1AP : Memory allocation for UE context modifcation Request failed"); - break; + DU_LOG("\nERROR --> F1AP : Memory allocation for UE context modifcation Request failed"); + break; } for(ieIdx=0 ; ieIdxprotocolIEs.list.array[ieIdx], sizeof(UEContextModificationRequest_t)); - if(ueContextModifyReq->protocolIEs.list.array[ieIdx] == NULLP) - { - DU_LOG("\nERROR --> F1AP : Memory allocation for UE context modifcation Request failed"); - break; - } + CU_ALLOC(ueContextModifyReq->protocolIEs.list.array[ieIdx], sizeof(UEContextModificationRequest_t)); + if(ueContextModifyReq->protocolIEs.list.array[ieIdx] == NULLP) + { + DU_LOG("\nERROR --> F1AP : Memory allocation for UE context modifcation Request failed"); + break; + } } @@ -8074,35 +8285,35 @@ uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId) ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject; ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = \ UEContextModificationRequestIEs__value_PR_GNB_CU_UE_F1AP_ID; - ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID = ueId; + ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId; ieIdx++; ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID; ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject; ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present=\ UEContextModificationRequestIEs__value_PR_GNB_DU_UE_F1AP_ID; - ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = ueId; + ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId; /* DRB to be setup list */ ieIdx++; ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_ToBeSetupMod_List; ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject; ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present =\ - UEContextModificationRequestIEs__value_PR_DRBs_ToBeSetupMod_List; - ret = BuildDrbToBeSetupList(ueId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\ - value.choice.DRBs_ToBeSetupMod_List)); + UEContextModificationRequestIEs__value_PR_DRBs_ToBeSetupMod_List; + ret = BuildDrbToBeSetupList(ueCb->gnbCuUeF1apId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\ + value.choice.DRBs_ToBeSetupMod_List)); /* DRB to be modified list */ ieIdx++; ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_ToBeModified_List; ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject; ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present =\ - UEContextModificationRequestIEs__value_PR_DRBs_ToBeModified_List; - ret = BuildDrbToBeModifiedList(ueId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\ - value.choice.DRBs_ToBeModified_List)); + UEContextModificationRequestIEs__value_PR_DRBs_ToBeModified_List; + ret = BuildDrbToBeModifiedList(ueCb->gnbCuUeF1apId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\ + value.choice.DRBs_ToBeModified_List)); /* TODO: DRB to be release list */ - + if(ret != ROK) { break; @@ -8112,29 +8323,29 @@ uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId) /* Encode the F1SetupRequest type as APER */ memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; - encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\ - encBuf); + encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf); /* Encode results */ if(encRetVal.encoded == ENCODE_FAIL) { - DU_LOG("\nERROR --> F1AP : Could not encode ueContextModifyReq structure (at %s)\n",\ - encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); - break; + DU_LOG("\nERROR --> F1AP : Could not encode ueContextModifyReq structure (at %s)\n",\ + encRetVal.failed_type ? encRetVal.failed_type->name : "unknown"); + break; } else { - DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for ueContextModifyReq\n"); - for(ieIdx=0; ieIdx< encBufSize; ieIdx++) - { - DU_LOG("%x",encBuf[ieIdx]); - } + DU_LOG("\nDEBUG --> F1AP : Created APER encodedbuffer for ueContextModifyReq\n"); + for(ieIdx=0; ieIdx< encBufSize; ieIdx++) + { + DU_LOG("%x",encBuf[ieIdx]); + } } - if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) + /* TODO : Hardcoding DU ID to 1 for messages other than F1 Setup Response. This will be made generic in future gerrit */ + if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, duId) != ROK) { - DU_LOG("\nERROR --> F1AP : Sending Ue context modification request failed"); - break; + DU_LOG("\nERROR --> F1AP : Sending Ue context modification request failed"); + break; } ret = ROK; @@ -8144,8 +8355,9 @@ uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId) FreeUeContextModicationRequest(f1apMsg); return ret; } + /*****************************************************************i -* + * * @brief Free memory allocated for UE Context Release Command * * @details @@ -8198,7 +8410,7 @@ void FreeUeContextReleaseCommand(F1AP_PDU_t *f1apMsg) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildAndSendUeContextReleaseCommand(uint8_t cuUeF1apId, uint8_t duUeF1apId) +uint8_t BuildAndSendUeContextReleaseCommand(uint32_t duId, uint8_t cuUeF1apId, uint8_t duUeF1apId) { bool memAllocFailed = false; uint8_t ieIdx = 0,elementCnt = 0, ret = RFAILED, bufLen=0; @@ -8324,7 +8536,8 @@ uint8_t BuildAndSendUeContextReleaseCommand(uint8_t cuUeF1apId, uint8_t duUeF1ap } } - if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK) + /* TODO : Hardcoding DU ID to 1 for messages other than F1 Setup Response. This will be made generic in future gerrit */ + if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, duId) != ROK) { DU_LOG("\nERROR --> F1AP : Sending Ue context Release Command failed"); break; @@ -8353,7 +8566,7 @@ uint8_t BuildAndSendUeContextReleaseCommand(uint8_t cuUeF1apId, uint8_t duUeF1ap * RFAILED - failure * * ****************************************************************/ -uint8_t procUeContextReleaseReq(F1AP_PDU_t *f1apMsg) +uint8_t procUeContextReleaseReq(uint32_t duId, F1AP_PDU_t *f1apMsg) { uint8_t ieIdx=0, duUeF1apId=0,cuUeF1apId=0; @@ -8378,7 +8591,8 @@ uint8_t procUeContextReleaseReq(F1AP_PDU_t *f1apMsg) break; } } - if(BuildAndSendUeContextReleaseCommand(cuUeF1apId, duUeF1apId) != ROK) + + if(BuildAndSendUeContextReleaseCommand(duId, cuUeF1apId, duUeF1apId) != ROK) { DU_LOG("\nERROR --> F1AP : procUeContextReleaseReq(): Failed to build Ue Context Release Command "); return RFAILED; @@ -8401,10 +8615,13 @@ uint8_t procUeContextReleaseReq(F1AP_PDU_t *f1apMsg) * RFAILED - failure * * ****************************************************************/ -uint8_t procGnbDuUpdate(F1AP_PDU_t *f1apMsg) +uint8_t procGnbDuUpdate(uint32_t duId, F1AP_PDU_t *f1apMsg) { bool cellToBeDelete = false; uint8_t ieIdx = 0, ueIdx = 0; + uint16_t cellId; + DuDb *duDb; + CuCellCb *cellCb; GNBDUConfigurationUpdate_t *duCfgUpdate = NULLP; duCfgUpdate = &f1apMsg->choice.initiatingMessage->value.choice.GNBDUConfigurationUpdate; @@ -8418,6 +8635,11 @@ uint8_t procGnbDuUpdate(F1AP_PDU_t *f1apMsg) break; case ProtocolIE_ID_id_Served_Cells_To_Delete_List: { + struct Served_Cells_To_Delete_ItemIEs *deleteItemIe = \ + (struct Served_Cells_To_Delete_ItemIEs *)duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.\ + Served_Cells_To_Delete_List.list.array[0]; + cellId = deleteItemIe->value.choice.Served_Cells_To_Delete_Item.oldNRCGI.nRCellIdentity.buf[4] >>\ + deleteItemIe->value.choice.Served_Cells_To_Delete_Item.oldNRCGI.nRCellIdentity.bits_unused; cellToBeDelete = true; break; } @@ -8425,11 +8647,14 @@ uint8_t procGnbDuUpdate(F1AP_PDU_t *f1apMsg) break; } } - if(BuildAndSendDUUpdateAck() != ROK) + if(BuildAndSendDUUpdateAck(duId) != ROK) { DU_LOG("ERROR --> F1AP : Failed to build and send DUUpdateAck"); return RFAILED; } +#if 0 + /* We don't require F1 Reset message in Cell Up and Broadcast Procedure flow, So that's why + * commented this trigger for now */ if(cellToBeDelete == false) { @@ -8440,12 +8665,15 @@ uint8_t procGnbDuUpdate(F1AP_PDU_t *f1apMsg) return RFAILED; } } - else +#endif + if(cellToBeDelete == true) { - for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++) + duDb = getDuDb(duId); + cellCb = getCellCb(duDb, cellId); + for(ueIdx = 0; ueIdx < cellCb->numUe; ueIdx++) { - CU_FREE(ueCb[ueIdx].f1apMsgDb.duToCuContainer.buf, ueCb[ueIdx].f1apMsgDb.duToCuContainer.size); - memset(&ueCb[ueIdx], 0, sizeof(UeCb)); + CU_FREE(cellCb->ueCb[ueIdx]->f1apMsgDb.duToCuContainer.buf, cellCb->ueCb[ueIdx]->f1apMsgDb.duToCuContainer.size); + memset(cellCb->ueCb[ueIdx], 0, sizeof(CuUeCb)); } } @@ -8476,25 +8704,25 @@ uint8_t buildSliceList(SliceSupportList_t *sliceSupportList) { if(sliceSupportList->list.array) { - cuCfgParams.numSnssaiSupported = sliceSupportList->list.count; + cuCb.numSnssaiSupported = sliceSupportList->list.count; for(sliceListIdx=0; sliceListIdxlist.count; sliceListIdx++) { if(sliceSupportList->list.array[sliceListIdx]) { - CU_ALLOC(cuCfgParams.snssaiList[sliceListIdx], sizeof(Snssai)); - if(cuCfgParams.snssaiList[sliceListIdx] == NULLP) + CU_ALLOC(cuCb.snssaiList[sliceListIdx], sizeof(Snssai)); + if(cuCb.snssaiList[sliceListIdx] == NULLP) { DU_LOG("\nERROR --> CU_STUB: buildSliceList(): Memory allocation failed"); return RFAILED; } if(sliceSupportList->list.array[sliceListIdx]->sNSSAI.sST.buf) { - memcpy(&cuCfgParams.snssaiList[sliceListIdx]->sst, sliceSupportList->list.array[sliceListIdx]->\ + memcpy(&cuCb.snssaiList[sliceListIdx]->sst, sliceSupportList->list.array[sliceListIdx]->\ sNSSAI.sST.buf, sliceSupportList->list.array[sliceListIdx]->sNSSAI.sST.size); } if(sliceSupportList->list.array[sliceListIdx]->sNSSAI.sD->size) { - memcpy(&cuCfgParams.snssaiList[sliceListIdx]->sd,\ + memcpy(&cuCb.snssaiList[sliceListIdx]->sd,\ sliceSupportList->list.array[sliceListIdx]->sNSSAI.sD->buf,\ sliceSupportList->list.array[sliceListIdx]->sNSSAI.sD->size); } @@ -8667,9 +8895,12 @@ uint8_t procUeContextModificationResponse(F1AP_PDU_t *f1apMsg) * RFAILED - failure * * ****************************************************************/ -void procF1SetupReq(F1AP_PDU_t *f1apMsg) +void procF1SetupReq(uint32_t *destDuId, F1AP_PDU_t *f1apMsg) { - uint8_t ieIdx = 0, plmnidx=0, ret=ROK; + uint8_t ieIdx = 0, plmnidx=0, duIdx = 0, ret=ROK, cellIdx = 0; + uint32_t duId, cellId; + DuDb *duDb = NULLP; + CuCellCb *cellCb = NULLP; BIT_STRING_t nrcellIdentity; F1SetupRequest_t *f1SetupReq = NULLP; GNB_DU_Served_Cells_Item_t *srvCellItem = NULLP; @@ -8680,6 +8911,27 @@ void procF1SetupReq(F1AP_PDU_t *f1apMsg) { switch(f1SetupReq->protocolIEs.list.array[ieIdx]->id) { + case ProtocolIE_ID_id_gNB_DU_ID: + { + duId = f1SetupReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.buf[0]; + duDb = getDuDb(duId); + if(duDb == NULLP) + { + duDb = &cuCb.duInfo[cuCb.numDu]; + memset(duDb, 0, sizeof(DuDb)); + duDb->duId = duId; + cuCb.numDu++; + *destDuId = duId; + } + else + return; + break; + } + case ProtocolIE_ID_id_gNB_DU_Name: + { + strcpy((char *)duDb->duName, (char*)f1SetupReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_Name.buf); + break; + } case ProtocolIE_ID_id_gNB_DU_Served_Cells_List: { duServedCell = &f1SetupReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_Served_Cells_List; @@ -8696,6 +8948,16 @@ void procF1SetupReq(F1AP_PDU_t *f1apMsg) srvCellItem = &duServedCell->list.array[plmnidx]->value.choice.GNB_DU_Served_Cells_Item; ret = procServedCellPlmnList(&srvCellItem->served_Cell_Information.servedPLMNs); memcpy(&nrcellIdentity, &srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity, sizeof(BIT_STRING_t)); + + cellId = nrcellIdentity.buf[4] >> nrcellIdentity.bits_unused; + cellCb = getCellCb(duDb, cellId); + if(cellCb == NULLP) + { + cellCb = &duDb->cellCb[duDb->numCells]; + memset(cellCb, 0, sizeof(CuCellCb)); + cellCb->nrCellId = cellId; + duDb->numCells++; + } } } } @@ -8706,7 +8968,7 @@ void procF1SetupReq(F1AP_PDU_t *f1apMsg) } if(ret == ROK) { - BuildAndSendF1SetupRsp(&nrcellIdentity); + BuildAndSendF1SetupRsp(duId, &nrcellIdentity); } else { @@ -8731,7 +8993,7 @@ void procF1SetupReq(F1AP_PDU_t *f1apMsg) * RFAILED - failure * * ****************************************************************/ -void F1APMsgHdlr(Buffer *mBuf) +void F1APMsgHdlr(uint32_t *duId, Buffer *mBuf) { int i; char *recvBuf; @@ -8796,26 +9058,26 @@ void F1APMsgHdlr(Buffer *mBuf) case InitiatingMessage__value_PR_F1SetupRequest: { DU_LOG("\nINFO --> F1AP : F1 setup request received"); - procF1SetupReq(f1apMsg); + procF1SetupReq(duId, f1apMsg); break; } case InitiatingMessage__value_PR_GNBDUConfigurationUpdate: { DU_LOG("\nINFO --> F1AP : GNB-DU config update received"); - procGnbDuUpdate(f1apMsg); + procGnbDuUpdate(*duId, f1apMsg); break; } case InitiatingMessage__value_PR_InitialULRRCMessageTransfer: { DU_LOG("\nINFO --> F1AP : Received InitialULRRCMessageTransfer"); - procInitULRRCMsg(f1apMsg); + procInitULRRCMsg(*duId, f1apMsg); break; } case InitiatingMessage__value_PR_ULRRCMessageTransfer: { DU_LOG("\nINFO --> F1AP : Received ULRRCMessageTransfer"); - procUlRrcMsg(f1apMsg); + procUlRrcMsg(*duId, f1apMsg); break; } @@ -8827,7 +9089,7 @@ void F1APMsgHdlr(Buffer *mBuf) case InitiatingMessage__value_PR_UEContextReleaseRequest: { DU_LOG("\nINFO --> F1AP : Received UE Context Release Request"); - procUeContextReleaseReq(f1apMsg); + procUeContextReleaseReq(*duId, f1apMsg); break; } default: @@ -8852,7 +9114,7 @@ void F1APMsgHdlr(Buffer *mBuf) case SuccessfulOutcome__value_PR_UEContextSetupResponse: { DU_LOG("\nINFO --> F1AP : UE ContextSetupResponse received"); - procUeContextSetupResponse(f1apMsg); + procUeContextSetupResponse(*duId, f1apMsg); break; } case SuccessfulOutcome__value_PR_UEContextModificationResponse: