X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fric_stub%2Fric_e2ap_msg_hdl.c;h=c43c4db2b1d274fd559c37a2c1eeb9bd3113032c;hb=2a310f38af13dafd243ef7b24d5a721ed34355b3;hp=8ca54decad36cd0d087d8f704ac93c24cffbd9d1;hpb=7be3f80c289304edaa42f6f46a30015aad04747a;p=o-du%2Fl2.git diff --git a/src/ric_stub/ric_e2ap_msg_hdl.c b/src/ric_stub/ric_e2ap_msg_hdl.c index 8ca54deca..c43c4db2b 100644 --- a/src/ric_stub/ric_e2ap_msg_hdl.c +++ b/src/ric_stub/ric_e2ap_msg_hdl.c @@ -44,6 +44,8 @@ #include "E2SM-KPM-EventTriggerDefinition.h" #include "E2connectionUpdate-Item.h" + +char encBuf[ENC_BUF_MAX_LEN]; /******************************************************************* * * @brief Printing Type and Cause of failure @@ -175,6 +177,52 @@ uint8_t assignTransactionId(DuDb *duDb) return currTransId; } + /******************************************************************* + * + * @brief add RIC Subs action info + * + * @details + * + * Function : addRicSubsAction + * + * Functionality: add Ric Subs action info + * + * @parameter + * RIC action id + * List of action + * @return ROK - success + * RFAILED - failure + * + ******************************************************************/ +CmLList *addRicSubsAction(uint8_t ricActionID, CmLListCp *actionSequence) +{ + ActionInfo *actionDb = NULLP; + CmLList *actionNode=NULLP; + + RIC_ALLOC(actionDb, sizeof(ActionInfo)); + if(actionDb==NULLP) + { + DU_LOG("\nERROR --> E2AP : Memory allocation failed in %s at %d",__func__,__LINE__); + return NULLP; + } + + actionDb->actionId = ricActionID; + RIC_ALLOC(actionNode, sizeof(CmLList)); + if(actionNode) + { + actionNode->node = (PTR) actionDb; + cmLListAdd2Tail(actionSequence, actionNode); + } + else + { + DU_LOG("\nERROR --> E2AP : Memory allocation failed in %s at %d",__func__,__LINE__); + RIC_FREE(actionDb, sizeof(ActionInfo)); + return NULLP; + } + + return actionNode; +} + /******************************************************************* * * @brief Sends E2 msg over SCTP @@ -287,7 +335,8 @@ void FreeRemovalRequest(E2AP_PDU_t *e2apMsg) * ****************************************************************/ uint8_t BuildAndSendRemovalRequest(DuDb *duDb) { - uint8_t ieIdx = 0, elementCnt = 0, transId = 0; + uint8_t ieIdx = 0, elementCnt = 0; + uint16_t transId = 0; uint8_t ret = RFAILED; E2AP_PDU_t *e2apMsg = NULLP; E2RemovalRequest_t *removalReq = NULLP; @@ -479,22 +528,30 @@ RicSubscription *fetchSubsInfoFromRicReqId(RicRequestId ricReqId, RanFunction *r * * @params[in] Action ID * RIC Subscription DB + * List of action * @return Action Info DB * NULL, in case of failure * * ****************************************************************/ -ActionInfo *fetchActionInfoFromActionId(uint8_t actionId, RicSubscription *ricSubscriptionInfo) +ActionInfo *fetchActionInfoFromActionId(uint8_t actionId, RicSubscription *ricSubscriptionInfo, CmLList ** actionNode) { ActionInfo *actionInfoDb = NULLP; - if(ricSubscriptionInfo->actionSequence[actionId].actionId == actionId) + + CM_LLIST_FIRST_NODE(&ricSubscriptionInfo->actionSequence, *actionNode); + while(*actionNode) { - actionInfoDb = &ricSubscriptionInfo->actionSequence[actionId]; + actionInfoDb = (ActionInfo*)((*actionNode)->node); + if(actionInfoDb->actionId == actionId) + { + break; + } + *actionNode= (*actionNode)->next; } - else + if(actionInfoDb==NULLP) { DU_LOG("\nERROR --> E2AP : fetchActionInfoFromActionId: Action Id [%d] not found in \ - subscription info [Requestor id : %d] [Instance Id : %d]", actionId,\ - ricSubscriptionInfo->requestId.requestorId, ricSubscriptionInfo->requestId.instanceId); + subscription info [Requestor id : %d] [Instance Id : %d]", actionId,\ + ricSubscriptionInfo->requestId.requestorId, ricSubscriptionInfo->requestId.instanceId); } return actionInfoDb; @@ -775,7 +832,7 @@ void FreeE2ConfigUpdateFail(E2AP_PDU_t *e2apMsg) * * ****************************************************************/ -uint8_t BuildAndSendE2NodeConfigUpdateFailure(uint32_t duId, uint8_t transId, uint8_t causeInfo, uint8_t causeReason) +uint8_t BuildAndSendE2NodeConfigUpdateFailure(uint32_t duId, uint16_t transId, uint8_t causeInfo, uint8_t causeReason) { E2AP_PDU_t *e2apMsg = NULL; asn_enc_rval_t encRetVal; @@ -911,7 +968,8 @@ void ProcE2NodeConfigUpdate(uint32_t duId, E2nodeConfigurationUpdate_t *e2NodeCo DuDb *duDb = NULLP; E2NodeConfigList tmpE2NodeList; uint16_t arrIdx=0; - uint8_t ieIdx = 0, duIdx = 0, elementCnt=0, transId = 0; + uint8_t ieIdx = 0, duIdx = 0, elementCnt=0; + uint16_t transId = 0; E2nodeComponentConfigAddition_List_t *e2NodeAddList=NULL; E2nodeComponentConfigAddition_ItemIEs_t *e2NodeAddItemIe=NULL; E2nodeComponentConfigAddition_Item_t *e2NodeAddItem=NULL; @@ -1306,10 +1364,7 @@ uint8_t fillE2NodeConfigAck(PTR e2NodeCfg, uint8_t procedureCode, E2NodeComponen uint8_t BuildE2nodeComponentConfigAdditionAck(E2nodeComponentConfigAdditionAck_List_t *e2NodeConfigAdditionAckList, \ uint16_t addedE2NodeCount, E2NodeConfigItem *addedE2Node) { - E2NodeComponent *e2NodeComponentInfo=NULLP; - CmLList *node=NULLP; uint16_t arrIdx = 0; - E2nodeComponentConfigAdditionAck_Item_t *e2NodeAddAckItem=NULLP; E2nodeComponentConfigAdditionAck_ItemIEs_t *e2NodeAddAckItemIe=NULLP; e2NodeConfigAdditionAckList->list.count = addedE2NodeCount; @@ -1334,7 +1389,6 @@ uint16_t addedE2NodeCount, E2NodeConfigItem *addedE2Node) e2NodeAddAckItemIe->id = ProtocolIE_IDE2_id_E2nodeComponentConfigAdditionAck_Item; e2NodeAddAckItemIe->criticality = CriticalityE2_reject; e2NodeAddAckItemIe->value.present = E2nodeComponentConfigAdditionAck_ItemIEs__value_PR_E2nodeComponentConfigAdditionAck_Item; - e2NodeAddAckItem = &e2NodeAddAckItemIe->value.choice.E2nodeComponentConfigAdditionAck_Item; /* Filling the e2 node config addition ack item */ fillE2NodeConfigAck((PTR)&e2NodeAddAckItemIe->value.choice.E2nodeComponentConfigAdditionAck_Item, ProtocolIE_IDE2_id_E2nodeComponentConfigAdditionAck,\ @@ -1442,7 +1496,7 @@ uint8_t BuildRanFunctionAcceptedList(DuDb *duDb, uint8_t count, RanFunction *ran * * ****************************************************************/ -uint8_t BuildAndSendE2SetupRsp(DuDb *duDb, uint8_t transId, E2NodeConfigList e2NodeList) +uint8_t BuildAndSendE2SetupRsp(DuDb *duDb, uint16_t transId, E2NodeConfigList e2NodeList) { E2AP_PDU_t *e2apMsg = NULL; E2setupResponse_t *e2SetupRsp; @@ -1903,7 +1957,7 @@ uint8_t fillRicActionDef(RICactionDefinition_t *ricActionDef, uint8_t ricActionI uint8_t fillActionToBeSetup(RICaction_ToBeSetup_ItemIEs_t *actionItem, RicSubscription *ricSubsDb) { static uint8_t ricActionId = 0; - + CmLList *actionNode=NULLP; if(actionItem == NULLP) { DU_LOG("\nERROR --> E2AP : Failed at [%s] : line [%d]", __func__, __LINE__); @@ -1918,8 +1972,7 @@ uint8_t fillActionToBeSetup(RICaction_ToBeSetup_ItemIEs_t *actionItem, RicSubscr /* RIC Action ID */ actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionID = ricActionId; - ricSubsDb->actionSequence[ricActionId].actionId = \ - actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionID; + actionNode = addRicSubsAction(ricActionId, &ricSubsDb->actionSequence); ricActionId++; /* RIC Action Type */ @@ -1938,12 +1991,14 @@ uint8_t fillActionToBeSetup(RICaction_ToBeSetup_ItemIEs_t *actionItem, RicSubscr break; } - ricSubsDb->numOfActions++; return ROK; } - - memset(&ricSubsDb->actionSequence[ricActionId], 0, sizeof(ActionInfo)); - ricSubsDb->actionSequence[ricActionId].actionId = -1; + + if(actionNode) + { + cmLListDelFrm(&ricSubsDb->actionSequence, actionNode); + deleteActionSequence(actionNode); + } return RFAILED; } @@ -2139,7 +2194,6 @@ uint8_t BuildAndSendRicSubscriptionReq(DuDb *duDb) uint8_t ret = RFAILED; uint8_t elementCnt = 0; uint8_t idx = 0; - uint8_t actionIdx = 0; asn_enc_rval_t encRetVal; /* Encoder return value */ E2AP_PDU_t *e2apRicMsg = NULL; RICsubscriptionRequest_t *ricSubscriptionReq; @@ -2156,10 +2210,6 @@ uint8_t BuildAndSendRicSubscriptionReq(DuDb *duDb) DU_LOG("\nERROR --> E2AP : Memory allocation failed at [%s] : line [%d]", __func__, __LINE__); return RFAILED; } - for(actionIdx = 0; actionIdx < MAX_RIC_ACTION; actionIdx++) - { - ricSubsInfo->actionSequence[actionIdx].actionId = -1; - } while(true) { @@ -2319,6 +2369,7 @@ void ProcRicSubscriptionResponse(uint32_t duId, RICsubscriptionResponse_t *ricS RanFunction *ranFuncDb = NULLP; RicSubscription *ricSubs = NULLP; CmLList *ricSubsNode = NULLP; + CmLList *actionNode = NULLP; ActionInfo *action = NULLP; RICsubscriptionResponse_IEs_t *ricSubsRspIe = NULLP; RICaction_NotAdmitted_List_t *notAdmitList = NULLP; @@ -2375,6 +2426,7 @@ void ProcRicSubscriptionResponse(uint32_t duId, RICsubscriptionResponse_t *ricS notAdmitList = &ricSubsRspIe->value.choice.RICaction_NotAdmitted_List; for(notAdmitIdx = 0; notAdmitIdx < notAdmitList->list.count; notAdmitIdx++) { + actionNode=NULLP; actionId = ((RICaction_NotAdmitted_ItemIEs_t *)(notAdmitList->list.array[notAdmitIdx]))->\ value.choice.RICaction_NotAdmitted_Item.ricActionID; @@ -2382,12 +2434,11 @@ void ProcRicSubscriptionResponse(uint32_t duId, RICsubscriptionResponse_t *ricS ricSubs = fetchSubsInfoFromRicReqId(ricReqId, ranFuncDb, &ricSubsNode); if(ricSubs) { - action = fetchActionInfoFromActionId(actionId, ricSubs); + action = fetchActionInfoFromActionId(actionId, ricSubs, &actionNode); if(action) { - memset(action, 0, sizeof(ActionInfo)); - ricSubs->actionSequence[actionId].actionId = -1; - ricSubs->numOfActions--; + cmLListDelFrm(&ricSubs->actionSequence, actionNode); + deleteActionSequence(actionNode); } } } @@ -2453,7 +2504,7 @@ void FreeE2SetupFailure(E2AP_PDU_t *e2apMsg) * * ****************************************************************/ -uint8_t BuildAndSendE2SetupFailure(uint32_t duId, uint8_t transId) +uint8_t BuildAndSendE2SetupFailure(uint32_t duId, uint16_t transId) { uint8_t ret = RFAILED; E2AP_PDU_t *e2apMsg = NULL; @@ -2584,11 +2635,11 @@ uint8_t BuildAndSendE2SetupFailure(uint32_t duId, uint8_t transId) void ProcE2SetupReq(uint32_t *duId, E2setupRequest_t *e2SetupReq) { - uint8_t arrIdx = 0, duIdx = 0, transId =0; + uint8_t arrIdx = 0, duIdx = 0; + uint16_t transId =0; uint16_t ranFuncIdx=0, e2NodeAddListIdx =0; E2NodeConfigList tmpE2NodeList; DuDb *duDb = NULLP; - bool ieProcessingFailed = false; E2nodeComponentConfigAddition_List_t *e2NodeAddList=NULLP; E2nodeComponentConfigAddition_ItemIEs_t *e2NodeAddItem=NULLP; RANfunction_ItemIEs_t *ranFuncItemIe=NULLP; @@ -2747,7 +2798,7 @@ void FreeE2ResetResponse(E2AP_PDU_t *e2apMsg) * RFAILED - failure * * ****************************************************************/ -uint8_t BuildAndSendResetResponse(uint32_t duId, uint8_t transId) +uint8_t BuildAndSendResetResponse(uint32_t duId, uint16_t transId) { uint8_t ieIdx = 0, elementCnt = 0; uint8_t ret = RFAILED; @@ -3091,7 +3142,7 @@ void FreeRicServiceUpdateFailure(E2AP_PDU_t *e2apMsg) * ******************************************************************/ -uint8_t BuildAndSendRicServiceUpdateFailure(uint32_t duId, int8_t transId, CauseE2_PR causePresent, uint8_t reason) +uint8_t BuildAndSendRicServiceUpdateFailure(uint32_t duId, uint16_t transId, CauseE2_PR causePresent, uint8_t reason) { E2AP_PDU_t *e2apMsg = NULL; @@ -3344,7 +3395,7 @@ uint8_t BuildRanFunctionRejectedList(uint8_t count, RanFunction *ranFunRejectedL * ******************************************************************/ -uint8_t BuildAndSendRicServiceUpdateAcknowledge(DuDb *duDb, int8_t transId, RicTmpRanFunList ricRanFuncList) +uint8_t BuildAndSendRicServiceUpdateAcknowledge(DuDb *duDb, uint16_t transId, RicTmpRanFunList ricRanFuncList) { E2AP_PDU_t *e2apMsg = NULL; asn_enc_rval_t encRetVal; @@ -4479,6 +4530,7 @@ uint8_t ProcRicSubsModReqd(uint32_t duId, RICsubscriptionModificationRequired_t RanFunction *ranFuncDb = NULLP; RicSubscription *ricSubs = NULLP; CmLList *ricSubsNode = NULLP; + CmLList *actionNode = NULLP; ActionInfo *action = NULLP; RICsubscriptionModificationRequired_IEs_t *ricSubsModReqdIe = NULLP; RICactions_RequiredToBeModified_List_t *actionToBeModList = NULLP; @@ -4537,9 +4589,10 @@ uint8_t ProcRicSubsModReqd(uint32_t duId, RICsubscriptionModificationRequired_t actionToBeModList = &ricSubsModReqdIe->value.choice.RICactions_RequiredToBeModified_List; for(actionIdx = 0; actionIdx < actionToBeModList->list.count; actionIdx++) { + actionNode=NULLP; actionToBeMod = (RICaction_RequiredToBeModified_ItemIEs_t *)actionToBeModList->list.array[actionIdx]; actionId = actionToBeMod->value.choice.RICaction_RequiredToBeModified_Item.ricActionID; - action = fetchActionInfoFromActionId(actionId, ricSubs); + action = fetchActionInfoFromActionId(actionId, ricSubs, &actionNode); if(action) { /* No modification required as of now, hence directly adding to the list */ @@ -4562,15 +4615,15 @@ uint8_t ProcRicSubsModReqd(uint32_t duId, RICsubscriptionModificationRequired_t actionToBeRmvList = &ricSubsModReqdIe->value.choice.RICactions_RequiredToBeRemoved_List; for(actionIdx = 0; actionIdx < actionToBeRmvList->list.count; actionIdx++) { + actionNode=NULLP; actionToBeRmv = (RICaction_RequiredToBeRemoved_ItemIEs_t *)actionToBeRmvList->list.array[actionIdx]; actionId = actionToBeRmv->value.choice.RICaction_RequiredToBeRemoved_Item.ricActionID; - action = fetchActionInfoFromActionId(actionId, ricSubs); + action = fetchActionInfoFromActionId(actionId, ricSubs, &actionNode); if(action) { tmpActionList.actionRemovedList[tmpActionList.numActionRemoved++] = actionId; - memset(action, 0, sizeof(ActionInfo)); - action->actionId = -1; - ricSubs->numOfActions--; + cmLListDelFrm(&ricSubs->actionSequence, actionNode); + deleteActionSequence(actionNode); } } break; @@ -4661,7 +4714,7 @@ void FreeErrorIndication(E2AP_PDU_t *e2apMsg) * ******************************************************************/ -uint8_t BuildAndSendErrorIndication(uint32_t duId, int8_t transId, RicRequestId requestId, uint16_t ranFuncId, uint8_t reason) +uint8_t BuildAndSendErrorIndication(uint32_t duId, uint16_t transId, RicRequestId requestId, uint16_t ranFuncId, uint8_t reason) { uint8_t elementCnt =0, arrIdx=0, ret = RFAILED; E2AP_PDU_t *e2apMsg = NULLP; @@ -4854,7 +4907,8 @@ void FreeResetRequest(E2AP_PDU_t *e2apMsg) * ****************************************************************/ uint8_t BuildAndSendResetRequest(DuDb *duDb, CauseE2_PR causePresent, uint8_t reason) { - uint8_t ieIdx = 0, elementCnt = 0, transId = 0; + uint8_t ieIdx = 0, elementCnt = 0; + uint16_t transId = 0; uint8_t ret = RFAILED; E2AP_PDU_t *e2apMsg = NULLP; ResetRequestE2_t *resetReq = NULLP; @@ -4963,6 +5017,63 @@ uint8_t BuildAndSendResetRequest(DuDb *duDb, CauseE2_PR causePresent, uint8_t re return ret; } +/****************************************************************** + * + * @brief Delete Ric subscription action + * + * @details + * + * Function : deleteActionSequence + * + * Functionality: Delete Ric subscription action + * + * @params[in] Action info + * + * @return void + * + * ****************************************************************/ +void deleteActionSequence(CmLList *actionNode) +{ + ActionInfo *action = NULLP; + + if(actionNode) + { + action = (ActionInfo*)actionNode->node; + memset(action, 0, sizeof(ActionInfo)); + RIC_FREE(actionNode->node, sizeof(ActionInfo)); + RIC_FREE(actionNode, sizeof(CmLList)); + } +} + +/****************************************************************** + * + * @brief Delete Ric subscription action list + * + * @details + * + * Function : deleteActionSequenceList + * + * Functionality: Delete Ric subscription action list + * + * @params[in] Action info list + * + * @return void + * + * ****************************************************************/ +void deleteActionSequenceList(CmLListCp *actionList) +{ + CmLList *actionNode=NULLP; + + CM_LLIST_FIRST_NODE(actionList, actionNode); + while(actionNode) + { + cmLListDelFrm(actionList, actionNode); + deleteActionSequence(actionNode); + CM_LLIST_FIRST_NODE(actionList, actionNode); + } + +} + /****************************************************************** * * @brief Delete Ric subscription node @@ -4980,18 +5091,12 @@ uint8_t BuildAndSendResetRequest(DuDb *duDb, CauseE2_PR causePresent, uint8_t re * ****************************************************************/ void deleteRicSubscriptionNode(CmLList *subscriptionNode) { - uint8_t actionIdx=0; RicSubscription *ricSubscriptionInfo = NULLP; ricSubscriptionInfo = (RicSubscription*)subscriptionNode->node; - - for(actionIdx = 0; actionIdx < MAX_RIC_ACTION; actionIdx++) - { - if(ricSubscriptionInfo->actionSequence[actionIdx].actionId > -1) - { - memset(&ricSubscriptionInfo->actionSequence[actionIdx], 0, sizeof(ActionInfo)); - } - } + + deleteActionSequenceList(&ricSubscriptionInfo->actionSequence); + memset(ricSubscriptionInfo, 0, sizeof(RicSubscription)); RIC_FREE(subscriptionNode->node, sizeof(RicSubscription)); RIC_FREE(subscriptionNode, sizeof(CmLList)); @@ -5115,7 +5220,8 @@ void ProcResetResponse(uint32_t duId, ResetResponseE2_t *resetRsp) void ProcResetRequest(uint32_t duId, ResetRequestE2_t *resetReq) { - uint8_t ieIdx = 0, duIdx =0, transId=0; + uint8_t ieIdx = 0, duIdx =0; + uint16_t transId=0; DuDb *duDb = NULLP; RanFunction *ranFuncDb = NULLP; uint16_t ranFuncIdx = 0; @@ -5188,7 +5294,7 @@ void ProcResetRequest(uint32_t duId, ResetRequestE2_t *resetReq) ******************************************************************/ void FreeRicSubscriptionDeleteRequest(E2AP_PDU_t *e2apMsg) { - uint8_t ieIdx = 0, arrIdx = 0; + uint8_t ieIdx = 0; RICsubscriptionDeleteRequest_t *ricSubsDelReq = NULLP; if(e2apMsg) @@ -5777,7 +5883,7 @@ uint16_t updatedE2NodeCount, E2NodeConfigItem *updatedE2Node) * * ****************************************************************/ -uint8_t BuildAndSendE2NodeConfigUpdateAck(DuDb *duDb, uint8_t transId, E2NodeConfigList *e2NodeList) +uint8_t BuildAndSendE2NodeConfigUpdateAck(DuDb *duDb, uint16_t transId, E2NodeConfigList *e2NodeList) { uint8_t ret = RFAILED; uint8_t arrIdx = 0,elementCnt = 0; @@ -5941,7 +6047,8 @@ uint8_t BuildAndSendE2NodeConfigUpdateAck(DuDb *duDb, uint8_t transId, E2NodeCo * ****************************************************************/ void ProcE2RemovalFailure(E2RemovalFailure_t *e2RemovalFailure) { - uint8_t ieIdx = 0, transId=0; + uint8_t ieIdx = 0; + uint16_t transId=0; CauseE2_t *cause = NULLP; if(!e2RemovalFailure) @@ -5976,7 +6083,7 @@ void ProcE2RemovalFailure(E2RemovalFailure_t *e2RemovalFailure) } default: { - DU_LOG("\nERROR --> E2AP : Received Invalid Ie [%d]", e2RemovalFailure->protocolIEs.list.array[ieIdx]->id); + DU_LOG("\nERROR --> E2AP : Received Invalid Ie [%ld]", e2RemovalFailure->protocolIEs.list.array[ieIdx]->id); break; } } @@ -6349,7 +6456,7 @@ uint8_t BuildAndSendRemovalResponse(uint32_t duId, uint16_t transId) if(duDb == NULLP) { DU_LOG("\nERROR --> E2AP : duDb is not present for duId %d",duId); - return; + return RFAILED; } RIC_ALLOC(e2apMsg, sizeof(E2AP_PDU_t)); @@ -6949,7 +7056,7 @@ void ProcE2connectionUpdateFailure(E2connectionUpdateFailure_t *updateFailure) } default: { - DU_LOG("\nERROR --> E2AP : Received Invalid Ie [%d]", updateFailure->protocolIEs.list.array[ieIdx]->id); + DU_LOG("\nERROR --> E2AP : Received Invalid Ie [%ld]", updateFailure->protocolIEs.list.array[ieIdx]->id); break; } } @@ -7607,6 +7714,7 @@ uint8_t BuildRicSubsActionToBeRemoved(RICactions_ToBeRemovedForModification_List uint8_t BuildRicSubsActionToBeAdded(RICactions_ToBeAddedForModification_List_t *addedActionList, RicSubscription **ricSubsInfo, uint8_t numOfActionToBeAdded, ActionInfo *actionToBeAdded) { uint8_t arrIdx=0; + CmLList *actionNode=NULLP; RICaction_ToBeAddedForModification_ItemIEs_t *addedActionItemIe; addedActionList->list.count = numOfActionToBeAdded; @@ -7640,8 +7748,13 @@ uint8_t BuildRicSubsActionToBeAdded(RICactions_ToBeAddedForModification_List_t * DU_LOG("\nERROR --> E2AP : Failed at [%s] : line [%d]", __func__, __LINE__); break; } - (*ricSubsInfo)->actionSequence[(*ricSubsInfo)->numOfActions].actionId = (*ricSubsInfo)->numOfActions; - (*ricSubsInfo)->numOfActions++; + + actionNode = addRicSubsAction((*ricSubsInfo)->actionSequence.count, &(*ricSubsInfo)->actionSequence); + if(actionNode == NULLP) + { + DU_LOG("\nERROR --> E2AP : Failed at [%s] : line [%d]", __func__, __LINE__); + return RFAILED; + } } return ROK; } @@ -7669,12 +7782,10 @@ uint8_t BuildAndSendRicSubscriptionModReq(DuDb *duDb, RicSubscription **ricSubsI { uint8_t ret = RFAILED; uint8_t elementCnt = 0; - uint8_t idx = 0, cfgIdx=0; + uint8_t idx = 0; asn_enc_rval_t encRetVal; /* Encoder return value */ E2AP_PDU_t *e2apRicMsg = NULL; RICsubscriptionModificationRequest_t *ricSubscriptionModReq; - RanFunction *ranFuncDb = &duDb->ranFunction[0]; - CmLList *subscriptionNode = NULLP; DU_LOG("\nINFO --> E2AP : Building RIC Subscription Request\n"); @@ -7847,32 +7958,39 @@ uint8_t BuildAndSendRicSubscriptionModReq(DuDb *duDb, RicSubscription **ricSubsI void BuildRicSubsModificationReq(DuDb *duDb, RicSubscription *ricSubsInfo) { + CmLList *actionNode=NULLP; uint8_t actionToBeAdded =0; uint8_t actionIdx =0, tmpActionIdx=0; + ActionInfo *actionInfoDb = NULLP; RicSubsModReq ricSubsModReq; if(ricSubsInfo) { memset(&ricSubsModReq, 0, sizeof(RicSubsModReq)); - for(actionIdx=0; actionIdxnumOfActions; actionIdx++) + + + CM_LLIST_FIRST_NODE(&ricSubsInfo->actionSequence, actionNode); + while(actionNode) { + actionInfoDb = (ActionInfo*)(actionNode->node); /* Change the condition based on the action required to be modiified or removed */ - if(actionIdx%2 == 0) + if(((actionInfoDb->actionId+1)%2) == 0) { tmpActionIdx = ricSubsModReq.numOfActionToBeModify; - ricSubsModReq.actionToBeModify[tmpActionIdx].actionId = ricSubsInfo->actionSequence[actionIdx].actionId; + ricSubsModReq.actionToBeModify[tmpActionIdx].actionId = actionInfoDb->actionId; ricSubsModReq.numOfActionToBeModify++; } else { tmpActionIdx = ricSubsModReq.numOfActionToBeRemove; - ricSubsModReq.actionToBeRemove[tmpActionIdx].actionId = ricSubsInfo->actionSequence[actionIdx].actionId; + ricSubsModReq.actionToBeRemove[tmpActionIdx].actionId = actionInfoDb->actionId; ricSubsModReq.numOfActionToBeRemove++; } + actionNode= actionNode->next; } /* Change the value of actionToBeAdded based on the number of action required to be added */ actionToBeAdded =1; - tmpActionIdx = ricSubsInfo->numOfActions; + tmpActionIdx = ricSubsInfo->actionSequence.count; for(actionIdx=0; actionIdxlist.array) + { + for(elementIdx = 0; elementIdx < actionModifiedList->list.count; elementIdx++) + { + if(actionModifiedList->list.array[elementIdx]) + { + modifiedActionItemIe=(RICaction_ModifiedForModification_ItemIEs_t*)actionModifiedList->list.array[elementIdx]; + actionId = modifiedActionItemIe->value.choice.RICaction_ModifiedForModification_Item.ricActionID; + DU_LOG("\nInfo --> E2AP : Action id %d modified successfully", actionId); + } + + } + + } +} + +/**************************************************************** + * + * @brief Processing RIC Subscription action added list + * + * @details + * + * Function : ProcessingRicSubsActionAdded + * + * Functionality: Processing RIC Subscription action added list + * + * @params[in] RICactions_AddedForModification_List_t + * @return void + * + * ****************************************************************/ +void ProcessingRicSubsActionAdded(RICactions_AddedForModification_List_t *actionAddedList) +{ + uint8_t actionId=0; + uint8_t elementIdx = 0; + RICaction_AddedForModification_ItemIEs_t *addedActionItemIe =NULLP; + + if(actionAddedList->list.array) + { + for(elementIdx = 0; elementIdx < actionAddedList->list.count; elementIdx++) + { + if(actionAddedList->list.array[elementIdx]) + { + addedActionItemIe=(RICaction_AddedForModification_ItemIEs_t*)actionAddedList->list.array[elementIdx]; + actionId = addedActionItemIe->value.choice.RICaction_AddedForModification_Item.ricActionID; + DU_LOG("\nInfo --> E2AP : Action id %d added successfully", actionId); + } + + } + + } +} + +/**************************************************************** + * + * @brief Processing RIC Subscription action deleted list + * + * @details + * + * Function : ProcessingRicSubsActionRemoved + * + * Functionality: Processing RIC Subscription action deleted list + * + * @params[in] RICactions_RemovedForModification_List_t + * Ric Subscription info + * @return void + * + * ****************************************************************/ +void ProcessingRicSubsActionRemoved(RICactions_RemovedForModification_List_t *actionRemovedList, RicSubscription *ricSubs) +{ + uint8_t actionId=0; + uint8_t elementIdx = 0; + ActionInfo *action=NULLP; + CmLList *actionNode =NULLP; + RICaction_RemovedForModification_ItemIEs_t *removedActionItemIe =NULLP; + + if(actionRemovedList->list.array) + { + for(elementIdx = 0; elementIdx < actionRemovedList->list.count; elementIdx++) + { + if(actionRemovedList->list.array[elementIdx]) + { + removedActionItemIe=(RICaction_RemovedForModification_ItemIEs_t*)actionRemovedList->list.array[elementIdx]; + actionId = removedActionItemIe->value.choice.RICaction_RemovedForModification_Item.ricActionID; + action = fetchActionInfoFromActionId(actionId, ricSubs, &actionNode); + if(action) + { + cmLListDelFrm(&ricSubs->actionSequence, actionNode); + deleteActionSequence(actionNode); + DU_LOG("\nInfo --> E2AP : Action id %d removed successfully", actionId); + } + } + + } + + } +} + +/******************************************************************* + * + * @brief Processing RIC Subscription action failed to be + * removed list + * + * @details + * + * Function : ProcessingRicSubsActionFailedToBeRemoved + * + * Functionality: Processing the RIC Subscription action failed + * to be removed list + * + * @params[in] RICactions_FailedToBeRemovedForModification_List_t + * @return void + * + * ****************************************************************/ +void ProcessingRicSubsActionFailedToBeRemoved(RICactions_FailedToBeRemovedForModification_List_t *actionFailedToBeRemoved) +{ + uint8_t actionId=0; + uint8_t elementIdx = 0; + RICaction_FailedToBeRemovedForModification_ItemIEs_t *failedToBeRemovedActionItemIe =NULLP; + + if(actionFailedToBeRemoved->list.array) + { + for(elementIdx = 0; elementIdx < actionFailedToBeRemoved->list.count; elementIdx++) + { + if(actionFailedToBeRemoved->list.array[elementIdx]) + { + failedToBeRemovedActionItemIe=(RICaction_FailedToBeRemovedForModification_ItemIEs_t*)actionFailedToBeRemoved->list.array[elementIdx]; + actionId = failedToBeRemovedActionItemIe->value.choice.RICaction_FailedToBeRemovedForModification_Item.ricActionID; + DU_LOG("\nERROR --> E2AP : Failed to remove action id %d in %s", actionId, __func__); + printE2ErrorCause(&failedToBeRemovedActionItemIe->value.choice.RICaction_FailedToBeRemovedForModification_Item.cause); + } + + } + + } +} + +/**************************************************************** + * + * @brief Processing RIC Subscription action failed to be + * add list + * + * @details + * + * Function : ProcessingRicSubsActionFailedToBeAdded + * + * Functionality: Processing the RIC Subscription action failed + * to be add list + * + * @params[in] RICactions_FailedToBeAddedForModification_List_t + * @return void + * + * ****************************************************************/ +void ProcessingRicSubsActionFailedToBeAdded(RICactions_FailedToBeAddedForModification_List_t *actionfailedToBeAddedList, RicSubscription *ricSubs) +{ + uint8_t actionId=0; + uint8_t elementIdx = 0; + ActionInfo *action=NULLP; + CmLList *actionNode =NULLP; + RICaction_FailedToBeAddedForModification_ItemIEs_t *failedToBeAddedActionItemIe =NULLP; + + if(actionfailedToBeAddedList->list.array) + { + for(elementIdx = 0; elementIdx < actionfailedToBeAddedList->list.count; elementIdx++) + { + if(actionfailedToBeAddedList->list.array[elementIdx]) + { + failedToBeAddedActionItemIe=(RICaction_FailedToBeAddedForModification_ItemIEs_t*)actionfailedToBeAddedList->list.array[elementIdx]; + actionId = failedToBeAddedActionItemIe->value.choice.RICaction_FailedToBeAddedForModification_Item.ricActionID; + action = fetchActionInfoFromActionId(actionId, ricSubs, &actionNode); + if(action) + { + cmLListDelFrm(&ricSubs->actionSequence, actionNode); + deleteActionSequence(actionNode); + } + DU_LOG("\nERROR --> E2AP : Failed to remove action id %d in %s", actionId,__func__); + printE2ErrorCause(&failedToBeAddedActionItemIe->value.choice.RICaction_FailedToBeAddedForModification_Item.cause); + } + + } + + } +} + +/******************************************************************* + * + * @brief Processing RIC Subscription action failed to be + * modified list + * + * @details + * + * Function :ProcessingRicSubsActionFailedToBeModified + * + * Functionality: Processing the RIC Subscription action failed + * to be modified list + * + * @params[in] RICactions_FailedToBeModifiedForModification_List_t + * @return void + * + * ****************************************************************/ +void ProcessingRicSubsActionFailedToBeModified(RICactions_FailedToBeModifiedForModification_List_t *actionFailedToBeModifiedList) +{ + uint8_t actionId=0; + uint8_t elementIdx = 0; + RICaction_FailedToBeModifiedForModification_ItemIEs_t *failedToBeModifiedActionItemIe =NULLP; + + if(actionFailedToBeModifiedList->list.array) + { + for(elementIdx = 0; elementIdx < actionFailedToBeModifiedList->list.count; elementIdx++) + { + if(actionFailedToBeModifiedList->list.array[elementIdx]) + { + failedToBeModifiedActionItemIe=(RICaction_FailedToBeModifiedForModification_ItemIEs_t*)actionFailedToBeModifiedList->list.array[elementIdx]; + actionId = failedToBeModifiedActionItemIe->value.choice.RICaction_FailedToBeModifiedForModification_Item.ricActionID; + DU_LOG("\nERROR --> E2AP : Failed to remove action id %d in %s", actionId,__func__); + printE2ErrorCause(&failedToBeModifiedActionItemIe->value.choice.RICaction_FailedToBeModifiedForModification_Item.cause); + } + + } + + } +} + +/****************************************************************** + * + * @brief Processes the Ric Subs modification rsp msg + * + * @details + * + * Function : ProcRicSubsModificationRsp + * + * Functionality: Processes the Ric Subs modification rsp msg + * + * @params[in] + * Ric Subs modification rsp information + * + * @return void + * + * ****************************************************************/ +void ProcRicSubsModificationRsp(uint32_t duId, RICsubscriptionModificationResponse_t *ricSubsModificationRsp) +{ + uint8_t ieIdx = 0; + uint8_t duIdx= 0; + uint16_t ranFuncId=0; + RanFunction *ranFuncDb = NULLP; + RicRequestId ricReqId; + DuDb *duDb = NULLP; + RicSubscription *ricSubs = NULLP; + CmLList *ricSubsNode = NULLP; + + SEARCH_DU_DB(duIdx, duId, duDb); + if(duDb == NULLP) + { + DU_LOG("\nERROR --> E2AP : duDb is not present for duId %d",duId); + return; + } + + if(!ricSubsModificationRsp) + { + DU_LOG("\nERROR --> E2AP : ricSubsModificationRsp pointer is null"); + return; + } + + if(!ricSubsModificationRsp->protocolIEs.list.array) + { + DU_LOG("\nERROR --> E2AP : ricSubsModificationRsp array pointer is null"); + return; + } + + for(ieIdx=0; ieIdx < ricSubsModificationRsp->protocolIEs.list.count; ieIdx++) + { + if(ricSubsModificationRsp->protocolIEs.list.array[ieIdx]) + { + switch(ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->id) + { + case ProtocolIE_IDE2_id_RICrequestID: + { + ricReqId.requestorId = ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICrequestID.ricRequestorID; + ricReqId.instanceId = ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICrequestID.ricInstanceID; + break; + } + case ProtocolIE_IDE2_id_RANfunctionID: + { + ranFuncId = ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RANfunctionID; + ranFuncDb = fetchRanFuncFromRanFuncId(duDb, ranFuncId); + if(!ranFuncDb) + { + DU_LOG("\nERROR --> E2AP : Invalid Ran Function id %d received",ranFuncId); + return; + } + + ricSubs = fetchSubsInfoFromRicReqId(ricReqId, ranFuncDb, &ricSubsNode); + if(!ricSubs) + { + DU_LOG("\nERROR --> E2AP : Ric subscription node is not present "); + return; + } + break; + } + case ProtocolIE_IDE2_id_RICactionsRemovedForModification_List: + { + ProcessingRicSubsActionRemoved(&ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICactions_RemovedForModification_List, ricSubs); + break; + } + case ProtocolIE_IDE2_id_RICactionsFailedToBeRemovedForModification_List: + { + ProcessingRicSubsActionFailedToBeRemoved(&ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICactions_FailedToBeRemovedForModification_List); + break; + } + case ProtocolIE_IDE2_id_RICactionsModifiedForModification_List: + { + ProcessingRicSubsActionModified(&ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICactions_ModifiedForModification_List); + break; + } + case ProtocolIE_IDE2_id_RICactionsFailedToBeModifiedForModification_List: + { + ProcessingRicSubsActionFailedToBeModified(&ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICactions_FailedToBeModifiedForModification_List); + break; + } + case ProtocolIE_IDE2_id_RICactionsAddedForModification_List: + { + ProcessingRicSubsActionAdded(&ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICactions_AddedForModification_List); + break; + } + case ProtocolIE_IDE2_id_RICactionsFailedToBeAddedForModification_List: + { + ProcessingRicSubsActionFailedToBeAdded(&ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->value.choice.RICactions_FailedToBeAddedForModification_List, ricSubs); + break; + } + default: + { + DU_LOG("\nERROR --> E2AP : Received Invalid Ie [%ld]", ricSubsModificationRsp->protocolIEs.list.array[ieIdx]->id); + break; + } + } + } + } +} + /******************************************************************* * * @brief Handles received E2AP message and sends back response @@ -8056,6 +8532,11 @@ void E2APMsgHdlr(uint32_t *duId, Buffer *mBuf) ProcRicSubsDeleteRsp(*duId, &e2apMsg->choice.successfulOutcome->value.choice.RICsubscriptionDeleteResponse); break; } + case SuccessfulOutcomeE2__value_PR_RICsubscriptionModificationResponse: + { + ProcRicSubsModificationRsp(*duId, &e2apMsg->choice.successfulOutcome->value.choice.RICsubscriptionModificationResponse); + break; + } default: { DU_LOG("\nERROR --> E2AP : Invalid type of successfulOutcome message [%d]", \