Support for subscription action type Policy
[ric-plt/submgr.git] / e2ap / libe2ap_wrapper / E2AP_if.c
index 69f1dcb..32aeeba 100644 (file)
@@ -24,8 +24,6 @@
 #include "ProtocolIE-Field.h"
 #include "RICsubsequentAction.h"
 #include "E2SM-gNB-X2-eventTriggerDefinition.h"
-#include "E2SM-gNB-X2-indicationHeader.h"
-#include "E2SM-gNB-X2-indicationMessage.h"
 #include "asn_constant.h"
 #include "E2AP_if.h"
 
@@ -63,7 +61,6 @@ const uint64_t cE2UnsuccessfulOutcome = 3;
 // Initiating message
 const uint64_t cRICSubscriptionRequest = 1;
 const uint64_t cRICSubscriptionDeleteRequest = 2;
-const uint64_t cRICIndication = 11;
 
 // Successful outcome
 const uint64_t cRICSubscriptionResponse = 1;
@@ -196,17 +193,18 @@ uint64_t packRICSubscriptionRequest(size_t* pdataBufferSize, byte* pDataBuffer,
                   // This is not used in RIC
 
                 // RICsubsequentAction, OPTIONAL
-                RICsubsequentAction_t* pRICsubsequentAction = calloc(1, sizeof(RICsubsequentAction_t));
-                if (pRICsubsequentAction) {
-                    pRICsubsequentAction->ricSubsequentActionType =
-                      pRICSubscriptionRequest->ricSubscription.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentAction.ricSubsequentActionType;
-                    pRICsubsequentAction->ricTimeToWait =
-                      pRICSubscriptionRequest->ricSubscription.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentAction.ricTimeToWait;
-                    pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction = pRICsubsequentAction;
+                if (pRICSubscriptionRequest->ricSubscription.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentActionPresent) {
+                    RICsubsequentAction_t* pRICsubsequentAction = calloc(1, sizeof(RICsubsequentAction_t));
+                    if (pRICsubsequentAction) {
+                        pRICsubsequentAction->ricSubsequentActionType =
+                        pRICSubscriptionRequest->ricSubscription.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentAction.ricSubsequentActionType;
+                        pRICsubsequentAction->ricTimeToWait =
+                        pRICSubscriptionRequest->ricSubscription.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentAction.ricTimeToWait;
+                        pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction = pRICsubsequentAction;
+                    }
+                    else
+                        return e2err_RICSubscriptionRequestAllocRICsubsequentActionFail;
                 }
-                else
-                    return e2err_RICSubscriptionRequestAllocRICsubsequentActionFail;
-
                 ASN_SEQUENCE_ADD(&pRICsubscriptionRequest_IEs->value.choice.RICsubscription.ricAction_ToBeSetup_List.list, pRICaction_ToBeSetup_ItemIEs);
                 index++;
             }
@@ -457,7 +455,7 @@ uint64_t packRICSubscriptionResponse(size_t* pDataBufferSize, byte* pDataBuffer,
 
         ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list, pRICsubscriptionResponse_IEs);
 
-        // RICaction-NotAdmitted list
+        // RICaction-NotAdmitted list, OPTIONAL
         if (pRICSubscriptionResponse->ricActionNotAdmittedListPresent) {
             pRICsubscriptionResponse_IEs = calloc(1, sizeof(RICsubscriptionResponse_IEs_t));
             if (pRICsubscriptionResponse_IEs) {
@@ -514,8 +512,6 @@ uint64_t packRICSubscriptionResponse(size_t* pDataBufferSize, byte* pDataBuffer,
             }
             ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list, pRICsubscriptionResponse_IEs);
         }
-        else
-            return e2err_RICSubscriptionResponseAllocRICActionNotAdmittedListFail;
 
         if (E2encode(pE2AP_PDU, pDataBufferSize, pDataBuffer, pLogBuffer))
             return e2err_OK;
@@ -630,342 +626,6 @@ uint64_t packRICSubscriptionFailure(size_t* pDataBufferSize, byte* pDataBuffer,
         return e2err_RICSubscriptionFailureAllocE2AP_PDUFail;
 }
 
-//////////////////////////////////////////////////////////////////////
-uint64_t packRICIndication(size_t* pDataBufferSize, byte* pDataBuffer, char* pLogBuffer, RICIndication_t* pRICIndication) {
-
-    E2AP_PDU_t* pE2AP_PDU = calloc(1, sizeof(E2AP_PDU_t));
-    if(pE2AP_PDU)
-       {
-        pE2AP_PDU->present = E2AP_PDU_PR_initiatingMessage;
-        pE2AP_PDU->choice.initiatingMessage.procedureCode = ProcedureCode_id_ricIndication;
-        pE2AP_PDU->choice.initiatingMessage.criticality = Criticality_ignore;
-        pE2AP_PDU->choice.initiatingMessage.value.present = RICInitiatingMessage__value_PR_RICindication;
-
-        // RICrequestID
-        RICindication_IEs_t* pRICindication_IEs = calloc(1, sizeof(RICindication_IEs_t));
-        if (pRICindication_IEs) {
-            pRICindication_IEs->id = ProtocolIE_ID_id_RICrequestID;
-            pRICindication_IEs->criticality = Criticality_reject;
-            pRICindication_IEs->value.present = RICindication_IEs__value_PR_RICrequestID;
-            pRICindication_IEs->value.choice.RICrequestID.ricRequestorID = pRICIndication->ricRequestID.ricRequestorID;
-            pRICindication_IEs->value.choice.RICrequestID.ricRequestSequenceNumber = pRICIndication->ricRequestID.ricRequestSequenceNumber;
-            ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list, pRICindication_IEs);
-        }
-        else
-            return e2err_RICIndicationRICrequestIDFail;
-
-        // RANfunctionID
-        pRICindication_IEs = calloc(1, sizeof(RICindication_IEs_t));
-        if (pRICindication_IEs) {
-            pRICindication_IEs->id = ProtocolIE_ID_id_RANfunctionID;
-            pRICindication_IEs->criticality = Criticality_reject;
-            pRICindication_IEs->value.present = RICindication_IEs__value_PR_RANfunctionID;
-            pRICindication_IEs->value.choice.RANfunctionID = pRICIndication->ranFunctionID;
-            ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list, pRICindication_IEs);
-        }
-        else
-            return e2err_RICIndicationAllocRANfunctionIDFail;
-
-        // RICactionID
-        pRICindication_IEs = calloc(1, sizeof(RICindication_IEs_t));
-        if (pRICindication_IEs) {
-            pRICindication_IEs->id = ProtocolIE_ID_id_RICactionID;
-            pRICindication_IEs->criticality = Criticality_reject;
-            pRICindication_IEs->value.present = RICindication_IEs__value_PR_RICactionID;
-            pRICindication_IEs->value.choice.RICactionID = pRICIndication->ricActionID;
-            ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list, pRICindication_IEs);
-        }
-        else
-            return e2err_RICIndicationAllocRICactionIDFail;
-
-        // RICindicationSN
-        pRICindication_IEs = calloc(1, sizeof(RICindication_IEs_t));
-        if (pRICindication_IEs) {
-            pRICindication_IEs->id = ProtocolIE_ID_id_RICindicationSN;
-            pRICindication_IEs->criticality = Criticality_reject;
-            pRICindication_IEs->value.present = RICindication_IEs__value_PR_RICindicationSN;
-            pRICindication_IEs->value.choice.RICindicationSN = pRICIndication->ricIndicationSN;
-            ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list, pRICindication_IEs);
-        }
-        else
-            return e2err_RICIndicationAllocRICindicationSNFail;
-
-        // RICindicationType
-        pRICindication_IEs = calloc(1, sizeof(RICindication_IEs_t));
-        if (pRICindication_IEs) {
-            pRICindication_IEs->id = ProtocolIE_ID_id_RICindicationType;
-            pRICindication_IEs->criticality = Criticality_reject;
-            pRICindication_IEs->value.present = RICindication_IEs__value_PR_RICindicationType;
-            pRICindication_IEs->value.choice.RICindicationType = pRICIndication->ricIndicationType;
-            ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list, pRICindication_IEs);
-        }
-        else
-            return e2err_RICIndicationAllocRICindicationTypeFail;
-
-        // RICindicationHeader
-        uint64_t returnCode;
-        uint64_t logBufferSize = 512;
-        char logBuffer[logBufferSize];
-        if ((returnCode = packRICIndicationHeader(logBuffer, &pRICIndication->ricIndicationHeader)) != e2err_OK) {
-            return returnCode;
-        }
-
-        pRICindication_IEs = calloc(1, sizeof(RICindication_IEs_t));
-        if (pRICindication_IEs) {
-            pRICindication_IEs->id = ProtocolIE_ID_id_RICindicationHeader;
-            pRICindication_IEs->criticality = Criticality_reject;
-            pRICindication_IEs->value.present = RICindication_IEs__value_PR_RICindicationHeader;
-            pRICindication_IEs->value.choice.RICindicationHeader.buf = calloc(1,pRICIndication->ricIndicationHeader.octetString.contentLength);
-            if (pRICindication_IEs->value.choice.RICindicationHeader.buf) {
-                pRICindication_IEs->value.choice.RICindicationHeader.size = pRICIndication->ricIndicationHeader.octetString.contentLength;
-                memcpy(pRICindication_IEs->value.choice.RICindicationHeader.buf,pRICIndication->ricIndicationHeader.octetString.data,
-                    pRICIndication->ricIndicationHeader.octetString.contentLength);
-                ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list, pRICindication_IEs);
-            }
-            else
-                return e2err_RICIndicationAllocRRICindicationHeaderBufFail;
-        }
-        else
-            return e2err_RICIndicationAllocRICindicationHeaderFail;
-
-        // RICindicationMessage
-        if ((returnCode = packRICIndicationMessage(logBuffer, &pRICIndication->ricIndicationMessage)) != e2err_OK) {
-            return returnCode;
-        }
-
-        pRICindication_IEs = calloc(1, sizeof(RICindication_IEs_t));
-        if (pRICindication_IEs) {
-            pRICindication_IEs->id = ProtocolIE_ID_id_RICindicationMessage;
-            pRICindication_IEs->criticality = Criticality_reject;
-            pRICindication_IEs->value.present = RICindication_IEs__value_PR_RICindicationMessage;
-            pRICindication_IEs->value.choice.RICindicationMessage.buf = calloc(1,pRICIndication->ricIndicationMessage.octetString.contentLength);
-            if (pRICindication_IEs->value.choice.RICindicationMessage.buf) {
-                pRICindication_IEs->value.choice.RICindicationMessage.size = pRICIndication->ricIndicationMessage.octetString.contentLength;
-                memcpy(pRICindication_IEs->value.choice.RICindicationHeader.buf,pRICIndication->ricIndicationMessage.octetString.data,
-                       pRICIndication->ricIndicationMessage.octetString.contentLength);
-                ASN_SEQUENCE_ADD(&pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list, pRICindication_IEs);
-            }
-            else
-                return e2err_RICIndicationAllocRICindicationMessageBufFail;
-        }
-        else
-            return e2err_RICIndicationAllocRICindicationMessageFail;
-
-        // RICcallProcessID, OPTIONAL. Not used in RIC.
-
-        if (E2encode(pE2AP_PDU, pDataBufferSize, pDataBuffer, pLogBuffer))
-            return e2err_OK;
-        else
-            return e2err_RICIndicationEncodeFail;
-    }
-    else
-        return e2err_RICIndicationAllocE2AP_PDUFail;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t packRICIndicationHeader(char* pLogBuffer, RICIndicationHeader_t* pRICIndicationHeader) {
-
-    E2SM_gNB_X2_indicationHeader_t* pE2SM_gNB_X2_indicationHeader = calloc(1, sizeof(E2SM_gNB_X2_indicationHeader_t));
-    if(pE2SM_gNB_X2_indicationHeader)
-       {
-        // InterfaceID
-        if ((pRICIndicationHeader->interfaceID.globalENBIDPresent == true && pRICIndicationHeader->interfaceID.globalGNBIDPresent == true) ||
-            (pRICIndicationHeader->interfaceID.globalENBIDPresent == false && pRICIndicationHeader->interfaceID.globalGNBIDPresent == false))
-            return e2err_RICindicationHeaderIEValueFail_1;
-
-        // GlobalENB-ID or GlobalGNB-ID
-        if (pRICIndicationHeader->interfaceID.globalENBIDPresent)
-        {
-            pE2SM_gNB_X2_indicationHeader->interface_ID.present = Interface_ID_PR_global_eNB_ID;
-
-            // GlobalENB-ID
-            // PLMN-Identity
-            pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.size =
-            pRICIndicationHeader->interfaceID.globalENBID.pLMNIdentity.contentLength;
-            pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf = calloc(1,3);
-            if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf) {
-                memcpy(pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
-                       pRICIndicationHeader->interfaceID.globalENBID.pLMNIdentity.pLMNIdentityVal,
-                       pRICIndicationHeader->interfaceID.globalENBID.pLMNIdentity.contentLength);
-            }
-            else
-                return e2err_RICIndicationAllocRICIndicationHeaderglobal_eNB_IDpLMN_IdentityBufFail;
-
-            // Add ENB-ID
-            if (pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits == cMacroENBIDP_20Bits){
-                // BIT STRING (SIZE (20)
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_macro_eNB_ID;
-
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf = calloc(1,3);
-                if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf) {
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.size = 3; // bytes
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.bits_unused = 4; // trailing unused bits
-                    memcpy(pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf,
-                           (void*)&pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID,3);
-                }
-                else
-                    return e2err_RICIndicationAllocRICIndicationHeaderglobal_eNB_IDeNB_IDmacro_eNB_IDBufFail;
-            }
-            else if (pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits == cHomeENBID_28Bits) {
-                // BIT STRING (SIZE (28)
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_home_eNB_ID;
-
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf = calloc(1,4);
-                if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf) {
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.size = 4; // bytes
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.bits_unused = 4; // trailing unused bits
-                    memcpy(pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf,
-                           (void*)&pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID,4);
-                }
-                else
-                    return e2err_RICIndicationAllocRICIndicationHeaderglobal_eNB_IDeNB_IDhome_eNB_IDBufFail;
-            }
-            else if (pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits == cShortMacroENBID_18Bits) {
-                // BIT STRING (SIZE(18)
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_short_Macro_eNB_ID;
-
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf = calloc(1,3);
-                if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf) {
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.size = 3;
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.bits_unused = 6; // trailing unused bits
-                     memcpy(pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf,
-                            (void*)&pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID,3);
-                }
-                else
-                    return e2err_RICIndicationAllocRICIndicationHeaderglobal_eNB_IDeNB_IDshort_Macro_eNB_IDBufFail;
-            }
-            else if (pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits == clongMacroENBIDP_21Bits) {
-                // BIT STRING (SIZE(21)
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_long_Macro_eNB_ID;
-
-                pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf = calloc(1,3);
-                if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf) {
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.size = 3; // bytes
-                    pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.bits_unused = 3; // trailing unused bits
-                    memcpy(pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf,
-                           (void*)&pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID,3);
-                }
-                else
-                    return e2err_RICIndicationAllocRICIndicationHeaderglobal_eNB_IDeNB_IDlong_Macro_eNB_IDBufFail;
-            }
-            else
-                return e2err_RICindicationHeaderIEValueFail_2;
-
-        }
-        else if (pRICIndicationHeader->interfaceID.globalGNBIDPresent) {
-            // GlobalGNB-ID
-            pE2SM_gNB_X2_indicationHeader->interface_ID.present = Interface_ID_PR_global_gNB_ID;
-
-            // PLMN-Identity
-            pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.pLMN_Identity.size =
-              pRICIndicationHeader->interfaceID.globalGNBID.pLMNIdentity.contentLength;
-            pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf =
-              calloc(1,pRICIndicationHeader->interfaceID.globalGNBID.pLMNIdentity.contentLength);
-            if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf) {
-                memcpy(pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf,
-                       (void*)&pRICIndicationHeader->interfaceID.globalGNBID.pLMNIdentity.pLMNIdentityVal,
-                       pRICIndicationHeader->interfaceID.globalGNBID.pLMNIdentity.contentLength);
-            }
-            else
-                return e2err_RICIndicationAllocRICIndicationHeaderglobal_gNB_IDpLMN_IdentityBufFail;
-
-            // GNB-ID, BIT STRING (SIZE (22..32)
-            pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.size = 4;  //32bits
-            pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf = calloc(1,4);
-            if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf) {
-                memcpy(pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf,
-                       (void*)&pRICIndicationHeader->interfaceID.globalGNBID,4); //32bits
-                }
-                else
-                    return e2err_RICIndicationAllocRICIndicationHeaderglobal_gNB_IDgNB_IDgNB_IDBufFail;
-        }
-        else
-            return e2err_RICindicationHeaderIEValueFail_3;
-
-        // InterfaceDirection
-        pE2SM_gNB_X2_indicationHeader->interfaceDirection = pRICIndicationHeader->interfaceDirection;
-
-        // TimeStamp OPTIONAL. Not used in RIC.
-
-        // Debug print
-        if (debug)
-            asn_fprint(stdout, &asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader);
-
-        // Encode
-        size_t bufferSize = sizeof(pRICIndicationHeader->octetString.data);
-        asn_enc_rval_t rval;
-        rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader,
-                                    pRICIndicationHeader->octetString.data, bufferSize);
-        if(rval.encoded == -1)
-        {
-            sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2SM_gNB_X2_indicationHeader.name);
-            return e2err_RICindicationHeaderPackFail_1;
-        }
-        else if(rval.encoded > bufferSize)
-        {
-            sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2SM_gNB_X2_indicationHeader.name, rval.encoded);
-            return e2err_RICindicationHeaderPackFail_2;
-        }
-        else
-            if (debug)
-                sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2SM_gNB_X2_indicationHeader.name, bufferSize, rval.encoded);
-
-        ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader);
-
-        pRICIndicationHeader->octetString.contentLength = rval.encoded;
-        return e2err_OK;
-    }
-    else
-        return e2err_RICIndicationHeaderAllocE2AP_PDUFail;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t packRICIndicationMessage(char* pLogBuffer, RICIndicationMessage_t* pRICIndicationMessage) {
-
-    E2SM_gNB_X2_indicationMessage_t* pE2SM_gNB_X2_indicationMessage = calloc(1, sizeof(E2SM_gNB_X2_indicationMessage_t));
-    if(pE2SM_gNB_X2_indicationMessage)
-    {
-        pE2SM_gNB_X2_indicationMessage->interfaceMessage.buf = calloc(1, pRICIndicationMessage->interfaceMessage.contentLength);
-        if(pE2SM_gNB_X2_indicationMessage->interfaceMessage.buf)
-        {
-            pE2SM_gNB_X2_indicationMessage->interfaceMessage.size = pRICIndicationMessage->interfaceMessage.contentLength;
-            memcpy(pE2SM_gNB_X2_indicationMessage->interfaceMessage.buf,pRICIndicationMessage->interfaceMessage.data,pRICIndicationMessage->interfaceMessage.contentLength);
-        }
-        else
-            return e2err_RICIndicationMessageAllocinterfaceMessageFail;
-
-        // Debug print
-        if (debug)
-            asn_fprint(stdout, &asn_DEF_E2SM_gNB_X2_indicationMessage, pE2SM_gNB_X2_indicationMessage);
-
-        // Encode
-        size_t bufferSize = sizeof(pRICIndicationMessage->octetString.data);
-        asn_enc_rval_t rval;
-        rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_gNB_X2_indicationMessage, pE2SM_gNB_X2_indicationMessage,
-                                    pRICIndicationMessage->octetString.data, bufferSize);
-        if(rval.encoded == -1)
-        {
-            sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2SM_gNB_X2_indicationMessage.name);
-            return e2err_RICindicationMessagePackFail_1;
-        }
-        else if(rval.encoded > bufferSize)
-        {
-            sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2SM_gNB_X2_indicationMessage.name, rval.encoded);
-            return e2err_RICindicationMessagePackFail_2;
-        }
-        else
-            if (debug)
-                sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2SM_gNB_X2_indicationMessage.name, bufferSize, rval.encoded);
-
-        ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationMessage, pE2SM_gNB_X2_indicationMessage);
-
-        pRICIndicationMessage->octetString.contentLength = rval.encoded;
-        return e2err_OK;
-    }
-    else
-        return e2err_E2SM_gNB_X2_indicationMessageAllocE2AP_PDUFail;
-}
-
 //////////////////////////////////////////////////////////////////////
 uint64_t packRICSubscriptionDeleteRequest(size_t* pDataBufferSize, byte* pDataBuffer, char* pLogBuffer, RICSubscriptionDeleteRequest_t* pRICSubscriptionDeleteRequest) {
 
@@ -1164,17 +824,6 @@ e2ap_pdu_ptr_t* unpackE2AP_pdu(const size_t dataBufferSize, const byte* dataBuff
                     return 0;
                 }
             }
-            else if (pE2AP_PDU->choice.initiatingMessage.procedureCode == ProcedureCode_id_ricIndication) {
-                if (pE2AP_PDU->choice.initiatingMessage.value.present == RICInitiatingMessage__value_PR_RICindication) {
-                    pMessageInfo->messageType = cE2InitiatingMessage;
-                    pMessageInfo->messageId = cRICIndication;
-                    return (e2ap_pdu_ptr_t*)pE2AP_PDU;
-                }
-                else {
-                    sprintf(pLogBuffer,"Error. Not supported initiatingMessage MessageId = %u",pE2AP_PDU->choice.initiatingMessage.value.present);
-                    return 0;
-                }
-            }
             else if (pE2AP_PDU->choice.initiatingMessage.procedureCode == ProcedureCode_id_ricSubscriptionDelete) {
                 if (pE2AP_PDU->choice.initiatingMessage.value.present == RICInitiatingMessage__value_PR_RICsubscriptionDeleteRequest) {
                     pMessageInfo->messageType = cE2InitiatingMessage;
@@ -1262,10 +911,14 @@ e2ap_pdu_ptr_t* unpackE2AP_pdu(const size_t dataBufferSize, const byte* dataBuff
 uint64_t getRICSubscriptionRequestData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSubscriptionRequest_t* pRICSubscriptionRequest) {
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
+
+    RICsubscriptionRequest_t *asnRicSubscriptionRequest = &pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionRequest;
     RICsubscriptionRequest_IEs_t* pRICsubscriptionRequest_IEs;
+
     // RICrequestID
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionRequest.protocolIEs.list.count > 0) {
-        pRICsubscriptionRequest_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionRequest.protocolIEs.list.array[0];
+    if (asnRicSubscriptionRequest->protocolIEs.list.count > 0 &&
+        asnRicSubscriptionRequest->protocolIEs.list.array[0]->id == ProtocolIE_ID_id_RICrequestID) {
+        pRICsubscriptionRequest_IEs = asnRicSubscriptionRequest->protocolIEs.list.array[0];
         pRICSubscriptionRequest->ricRequestID.ricRequestorID = pRICsubscriptionRequest_IEs->value.choice.RICrequestID.ricRequestorID;
         pRICSubscriptionRequest->ricRequestID.ricRequestSequenceNumber = pRICsubscriptionRequest_IEs->value.choice.RICrequestID.ricRequestSequenceNumber;
     }
@@ -1275,8 +928,9 @@ uint64_t getRICSubscriptionRequestData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSub
     }
 
     // RANfunctionID
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionRequest.protocolIEs.list.count > 1) {
-        pRICsubscriptionRequest_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionRequest.protocolIEs.list.array[1];
+    if (asnRicSubscriptionRequest->protocolIEs.list.count > 1 &&
+        asnRicSubscriptionRequest->protocolIEs.list.array[1]->id == ProtocolIE_ID_id_RANfunctionID) {
+        pRICsubscriptionRequest_IEs = asnRicSubscriptionRequest->protocolIEs.list.array[1];
         pRICSubscriptionRequest->ranFunctionID = pRICsubscriptionRequest_IEs->value.choice.RANfunctionID;
     }
     else {
@@ -1285,8 +939,9 @@ uint64_t getRICSubscriptionRequestData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSub
     }
 
     // RICsubscription
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionRequest.protocolIEs.list.count > 2) {
-        pRICsubscriptionRequest_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionRequest.protocolIEs.list.array[2];
+    if (asnRicSubscriptionRequest->protocolIEs.list.count > 2 &&
+        asnRicSubscriptionRequest->protocolIEs.list.array[2]->id == ProtocolIE_ID_id_RICsubscription) {
+        pRICsubscriptionRequest_IEs = asnRicSubscriptionRequest->protocolIEs.list.array[2];
 
         // Unpack EventTriggerDefinition
         RICeventTriggerDefinition_t* pRICeventTriggerDefinition =
@@ -1491,10 +1146,13 @@ uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSu
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
 
-    // RICrequestID
+    RICsubscriptionResponse_t *asnRicSubscriptionResponse = &pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse;
     RICsubscriptionResponse_IEs_t* pRICsubscriptionResponse_IEs;
-    if (pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.count > 0) {
-        pRICsubscriptionResponse_IEs = pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.array[0];
+
+    // RICrequestID
+    if (asnRicSubscriptionResponse->protocolIEs.list.count > 0 &&
+        asnRicSubscriptionResponse->protocolIEs.list.array[0]->id == ProtocolIE_ID_id_RICrequestID) {
+        pRICsubscriptionResponse_IEs = asnRicSubscriptionResponse->protocolIEs.list.array[0];
         pRICSubscriptionResponse->ricRequestID.ricRequestorID = pRICsubscriptionResponse_IEs->value.choice.RICrequestID.ricRequestorID;
         pRICSubscriptionResponse->ricRequestID.ricRequestSequenceNumber = pRICsubscriptionResponse_IEs->value.choice.RICrequestID.ricRequestSequenceNumber;
     }
@@ -1504,8 +1162,9 @@ uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSu
     }
 
     // RANfunctionID
-    if (pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.count > 1) {
-        pRICsubscriptionResponse_IEs = pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.array[1];
+    if (asnRicSubscriptionResponse->protocolIEs.list.count > 1 &&
+        asnRicSubscriptionResponse->protocolIEs.list.array[1]->id == ProtocolIE_ID_id_RANfunctionID) {
+        pRICsubscriptionResponse_IEs = asnRicSubscriptionResponse->protocolIEs.list.array[1];
         pRICSubscriptionResponse->ranFunctionID = pRICsubscriptionResponse_IEs->value.choice.RANfunctionID;
     }
     else {
@@ -1514,8 +1173,9 @@ uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSu
     }
 
     // RICaction-Admitted-List
-    if (pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.count > 2) {
-        pRICsubscriptionResponse_IEs = pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.array[2];
+    if (asnRicSubscriptionResponse->protocolIEs.list.count > 2  &&
+        asnRicSubscriptionResponse->protocolIEs.list.array[2]->id == ProtocolIE_ID_id_RICactions_Admitted) {
+        pRICsubscriptionResponse_IEs = asnRicSubscriptionResponse->protocolIEs.list.array[2];
         pRICSubscriptionResponse->ricActionAdmittedList.contentLength = 0;
         uint64_t index = 0;
         while ((index < maxofRICactionID) && (index < pRICsubscriptionResponse_IEs->value.choice.RICaction_Admitted_List.list.count)) {
@@ -1535,8 +1195,9 @@ uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSu
     }
 
     // RICaction-NotAdmitted-List, OPTIONAL
-    if (pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.count > 3) {
-        pRICsubscriptionResponse_IEs = pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionResponse.protocolIEs.list.array[3];
+    if (asnRicSubscriptionResponse->protocolIEs.list.count > 3 &&
+        asnRicSubscriptionResponse->protocolIEs.list.array[3]->id == ProtocolIE_ID_id_RICactions_NotAdmitted) {
+        pRICsubscriptionResponse_IEs = asnRicSubscriptionResponse->protocolIEs.list.array[3];
         if (pRICsubscriptionResponse_IEs->value.present == RICsubscriptionResponse_IEs__value_PR_RICaction_NotAdmitted_List) {
             pRICSubscriptionResponse->ricActionNotAdmittedListPresent = true;
             pRICSubscriptionResponse->ricActionNotAdmittedList.contentLength = 0;
@@ -1580,6 +1241,10 @@ uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSu
             pRICSubscriptionResponse->ricActionNotAdmittedList.contentLength = index;
         }
     }
+    else {
+        pRICSubscriptionResponse->ricActionNotAdmittedListPresent = false;
+        pRICSubscriptionResponse->ricActionNotAdmittedList.contentLength = 0;
+    }
 
     ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
     return e2err_OK;
@@ -1590,10 +1255,14 @@ uint64_t getRICSubscriptionFailureData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSub
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
 
-    // RICrequestID
+    RICsubscriptionFailure_t *asnRicSubscriptionFailure = &pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionFailure;
     RICsubscriptionFailure_IEs_t* pRICsubscriptionFailure_IEs;
-    if (pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionFailure.protocolIEs.list.count > 0) {
-        pRICsubscriptionFailure_IEs = pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionFailure.protocolIEs.list.array[0];
+
+    // RICrequestID
+    RICsubscriptionFailure_IEs_t* RICsubscriptionFailure_IEs_t;
+    if (asnRicSubscriptionFailure->protocolIEs.list.count > 0 &&
+        asnRicSubscriptionFailure->protocolIEs.list.array[0]->id == ProtocolIE_ID_id_RICrequestID) {
+        pRICsubscriptionFailure_IEs = asnRicSubscriptionFailure->protocolIEs.list.array[0];
         pRICSubscriptionFailure->ricRequestID.ricRequestorID = pRICsubscriptionFailure_IEs->value.choice.RICrequestID.ricRequestorID;
         pRICSubscriptionFailure->ricRequestID.ricRequestSequenceNumber = pRICsubscriptionFailure_IEs->value.choice.RICrequestID.ricRequestSequenceNumber;
     }
@@ -1603,8 +1272,9 @@ uint64_t getRICSubscriptionFailureData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSub
     }
 
     // RANfunctionID
-    if (pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionFailure.protocolIEs.list.count > 1) {
-        pRICsubscriptionFailure_IEs = pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionFailure.protocolIEs.list.array[1];
+    if (asnRicSubscriptionFailure->protocolIEs.list.count > 1 &&
+        asnRicSubscriptionFailure->protocolIEs.list.array[1]->id == ProtocolIE_ID_id_RANfunctionID) {
+        pRICsubscriptionFailure_IEs = asnRicSubscriptionFailure->protocolIEs.list.array[1];
         pRICSubscriptionFailure->ranFunctionID = pRICsubscriptionFailure_IEs->value.choice.RANfunctionID;
     }
     else {
@@ -1613,8 +1283,9 @@ uint64_t getRICSubscriptionFailureData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSub
     }
 
     // RICaction-NotAdmitted-List
-    if (pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionFailure.protocolIEs.list.count > 2) {
-        pRICsubscriptionFailure_IEs = pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionFailure.protocolIEs.list.array[2];
+    if (asnRicSubscriptionFailure->protocolIEs.list.count > 2 &&
+        asnRicSubscriptionFailure->protocolIEs.list.array[2]->id == ProtocolIE_ID_id_RICactions_NotAdmitted) {
+        pRICsubscriptionFailure_IEs = asnRicSubscriptionFailure->protocolIEs.list.array[2];
         uint64_t index = 0;
         while ((index < maxofRICactionID) && (index < pRICsubscriptionFailure_IEs->value.choice.RICaction_NotAdmitted_List.list.count)) {
             RICaction_NotAdmitted_ItemIEs_t* pRICaction_NotAdmitted_ItemIEs =
@@ -1666,295 +1337,18 @@ uint64_t getRICSubscriptionFailureData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSub
     return e2err_OK;
 }
 
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICIndicationData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICIndication_t* pRICIndication) {
-
-    E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
-
-    // RICrequestID
-    RICindication_IEs_t* pRICindication_IEs;
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.count > 0) {
-        pRICindication_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.array[0];
-        pRICIndication->ricRequestID.ricRequestorID = pRICindication_IEs->value.choice.RICrequestID.ricRequestorID;
-        pRICIndication->ricRequestID.ricRequestSequenceNumber = pRICindication_IEs->value.choice.RICrequestID.ricRequestSequenceNumber;
-    }
-    else {
-        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-        return e2err_RICindicationRICrequestIDMissing;
-    }
-
-    // RANfunctionID
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.count > 1) {
-        pRICindication_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.array[1];
-        pRICIndication->ranFunctionID = pRICindication_IEs->value.choice.RANfunctionID;
-    }
-    else {
-        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-        return e2err_RICindicationRANfunctionIDMissing;
-    }
-
-    // RICactionID
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.count > 2) {
-        pRICindication_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.array[2];
-        pRICIndication->ricActionID = pRICindication_IEs->value.choice.RICactionID;
-    }
-    else {
-        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-        return e2err_RICindicationRICactionIDMissing;
-    }
-
-    // RICindicationSN
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.count > 3) {
-        pRICindication_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.array[3];
-        pRICIndication->ricIndicationSN = pRICindication_IEs->value.choice.RICindicationSN;
-    }
-    else {
-        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-        return e2err_RICindicationRICindicationSNMissing;
-    }
-
-    // RICindicationType
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.count > 4) {
-        pRICindication_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.array[4];
-        pRICIndication->ricIndicationType = pRICindication_IEs->value.choice.RICindicationType;
-    }
-    else {
-        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-        return e2err_RICindicationRICindicationTypeMissing;
-    }
-
-    // RICindicationHeader
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.count > 5) {
-        pRICindication_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.array[5];
-
-        pRICIndication->ricIndicationHeader.octetString.contentLength = pRICindication_IEs->value.choice.RICindicationHeader.size;
-        if (pRICIndication->ricIndicationHeader.octetString.contentLength < cMaxSizeOfOctetString) {
-            memcpy(pRICIndication->ricIndicationHeader.octetString.data, pRICindication_IEs->value.choice.RICindicationHeader.buf,
-              pRICIndication->ricIndicationHeader.octetString.contentLength);
-
-              uint64_t returnCode;
-              if ((returnCode = getRICIndicationHeaderData(&pRICIndication->ricIndicationHeader) != e2err_OK)) {
-                ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-                return returnCode;
-              }
-        }
-        else {
-            ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-            return e2err_RICIndicationHeaderContentLengthFail;
-        }
-    }
-    else {
-        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-        return e2err_RICindicationRICindicationHeaderMissing;
-    }
-
-    // RICindicationMessage
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.count > 6) {
-        pRICindication_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICindication.protocolIEs.list.array[6];
-
-        pRICIndication->ricIndicationMessage.octetString.contentLength = pRICindication_IEs->value.choice.RICindicationMessage.size;
-        if (pRICIndication->ricIndicationMessage.octetString.contentLength < cMaxSizeOfOctetString) {
-            memcpy(pRICIndication->ricIndicationMessage.octetString.data, pRICindication_IEs->value.choice.RICindicationMessage.buf,
-              pRICIndication->ricIndicationMessage.octetString.contentLength);
-
-              uint64_t returnCode;
-              if ((returnCode = getRICIndicationMessageData(&pRICIndication->ricIndicationMessage) != e2err_OK)) {
-                ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-                return returnCode;
-              }
-        }
-        else {
-            ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-            return e2err_RICIndicationMessageContentLengthFail;
-        }
-    }
-    else {
-        ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-        return e2err_RICindicationRICindicationMessageMissing;
-    }
-
-    // RICcallProcessID, OPTIONAL. Not used in RIC.
-
-    ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-    return e2err_OK;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICIndicationHeaderData(RICIndicationHeader_t* pRICIndicationHeader) {
-
-    E2SM_gNB_X2_indicationHeader_t* pE2SM_gNB_X2_indicationHeader = 0;
-    asn_dec_rval_t rval;
-    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_gNB_X2_indicationHeader, (void **)&pE2SM_gNB_X2_indicationHeader,
-                      pRICIndicationHeader->octetString.data, pRICIndicationHeader->octetString.contentLength);
-    switch(rval.code) {
-    case RC_OK:
-        // Debug print
-        if (debug) {
-            printf("Successfully decoded E2SM_gNB_X2_indicationHeader");
-            asn_fprint(stdout, &asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader);
-        }
-
-        // InterfaceID, GlobalENB-ID or GlobalGNB-ID
-        if (pE2SM_gNB_X2_indicationHeader->interface_ID.present == Interface_ID_PR_global_eNB_ID) {
-
-            // GlobalENB-ID
-            pRICIndicationHeader->interfaceID.globalENBIDPresent = true;
-
-            // PLMN-Identity
-            pRICIndicationHeader->interfaceID.globalENBID.pLMNIdentity.contentLength =
-              pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.size;
-            memcpy(pRICIndicationHeader->interfaceID.globalENBID.pLMNIdentity.pLMNIdentityVal,
-              pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
-              pRICIndicationHeader->interfaceID.globalENBID.pLMNIdentity.contentLength);
-
-            //  ENB-ID
-            IdOctects_t eNBOctects;
-            memset(eNBOctects.octets, 0, sizeof(eNBOctects));
-            if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present == ENB_ID_PR_macro_eNB_ID) {
-                // BIT STRING (SIZE (20)
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits = cMacroENBIDP_20Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf,
-                  pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.size);
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present == ENB_ID_PR_home_eNB_ID) {
-                // BIT STRING (SIZE (28)
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits = cHomeENBID_28Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf,
-                  pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.size);
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present == ENB_ID_PR_short_Macro_eNB_ID) {
-                // BIT STRING (SIZE(18)
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits = cShortMacroENBID_18Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf,
-                  pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.size);
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.present == ENB_ID_PR_long_Macro_eNB_ID) {
-                // BIT STRING (SIZE(21)
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.bits =  clongMacroENBIDP_21Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf,
-                  pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.size);
-                pRICIndicationHeader->interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else {
-                pRICIndicationHeader->interfaceID.globalENBIDPresent = false;
-                pRICIndicationHeader->interfaceID.globalGNBIDPresent = false;
-                ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader);
-                return e2err_RICEventTriggerDefinitionIEValueFail_9;
-            }
-        }
-        else if (pE2SM_gNB_X2_indicationHeader->interface_ID.present == Interface_ID_PR_global_gNB_ID) {
-            // GlobalGNB-ID
-            pRICIndicationHeader->interfaceID.globalGNBIDPresent = true;
-
-            // PLMN-Identity
-            pRICIndicationHeader->interfaceID.globalGNBID.pLMNIdentity.contentLength =
-              pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.size;
-            memcpy(pRICIndicationHeader->interfaceID.globalGNBID.pLMNIdentity.pLMNIdentityVal,
-              pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
-              pRICIndicationHeader->interfaceID.globalGNBID.pLMNIdentity.contentLength);
-
-            // GNB-ID
-            IdOctects_t gNBOctects;
-            memset(gNBOctects.octets, 0, sizeof(gNBOctects));
-            if (pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.gNB_ID.present == GNB_ID_PR_gNB_ID) {
-                pRICIndicationHeader->interfaceID.globalGNBID.nodeID.bits = pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.size;
-                memcpy(gNBOctects.octets, pE2SM_gNB_X2_indicationHeader->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf,
-                   pRICIndicationHeader->interfaceID.globalGNBID.nodeID.bits);
-                pRICIndicationHeader->interfaceID.globalGNBID.nodeID.nodeID = gNBOctects.nodeID;
-            }
-            else {
-                pRICIndicationHeader->interfaceID.globalENBIDPresent = false;
-                pRICIndicationHeader->interfaceID.globalGNBIDPresent = false;
-                ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader);
-                return e2err_RICEventTriggerDefinitionIEValueFail_10;
-            }
-        }
-        else {
-            pRICIndicationHeader->interfaceID.globalENBIDPresent = false;
-            pRICIndicationHeader->interfaceID.globalGNBIDPresent = false;
-            ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader);
-            return e2err_RICEventTriggerDefinitionIEValueFail_11;
-        }
-
-        // InterfaceDirection
-        pRICIndicationHeader->interfaceDirection = pE2SM_gNB_X2_indicationHeader->interfaceDirection;
-
-        // TimeStamp OPTIONAL. Not used in RIC.
-
-        ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationHeader, pE2SM_gNB_X2_indicationHeader);
-        return e2err_OK;
-    case RC_WMORE:
-        if (debug)
-            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu",pRICIndicationHeader->octetString.contentLength,
-                   asn_DEF_E2SM_gNB_X2_indicationHeader.name, rval.consumed);
-        return e2err_RICIndicationHeaderDecodeWMOREFail;
-    case RC_FAIL:
-        if (debug)
-            printf("Decode failed. Buffer size %zu, %s, consumed %zu",pRICIndicationHeader->octetString.contentLength,
-                   asn_DEF_E2SM_gNB_X2_indicationHeader.name, rval.consumed);
-
-        return e2err_RICIndicationHeaderDecodeFAIL;
-    default:
-        return e2err_RICIndicationHeaderDecodeDefaultFail;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICIndicationMessageData(RICIndicationMessage_t* pRICIndicationMessage) {
-
-    E2SM_gNB_X2_indicationMessage_t* pE2SM_gNB_X2_indicationMessage = 0;
-    asn_dec_rval_t rval;
-    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2SM_gNB_X2_indicationMessage, (void **)&pE2SM_gNB_X2_indicationMessage,
-                      pRICIndicationMessage->octetString.data, pRICIndicationMessage->octetString.contentLength);
-    switch(rval.code) {
-    case RC_OK:
-        // Debug print
-        if (debug) {
-            printf("Successfully decoded E2SM_gNB_X2_indicationMessage");
-            asn_fprint(stdout, &asn_DEF_E2SM_gNB_X2_indicationMessage, pE2SM_gNB_X2_indicationMessage);
-        }
-
-        // InterfaceMessage
-        pRICIndicationMessage->interfaceMessage.contentLength = pE2SM_gNB_X2_indicationMessage->interfaceMessage.size;
-        if(pRICIndicationMessage->octetString.contentLength < cMaxSizeOfOctetString) {
-            memcpy(pRICIndicationMessage->interfaceMessage.data,pE2SM_gNB_X2_indicationMessage->interfaceMessage.buf,
-              pRICIndicationMessage->interfaceMessage.contentLength);
-            ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationMessage, pE2SM_gNB_X2_indicationMessage);
-            return e2err_OK;
-        }
-        else {
-            ASN_STRUCT_FREE(asn_DEF_E2SM_gNB_X2_indicationMessage, pE2SM_gNB_X2_indicationMessage);
-            return e2err_RICIndicationMessageIEContentLengthFail;
-        }
-    case RC_WMORE:
-        if (debug)
-            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu",pRICIndicationMessage->octetString.contentLength,
-                   asn_DEF_E2SM_gNB_X2_indicationMessage.name, rval.consumed);
-
-        return e2err_RICIndicationMessageDecodeWMOREFail;
-    case RC_FAIL:
-        if (debug)
-            printf("Decode failed. Buffer size %zu, %s, consumed %zu",pRICIndicationMessage->octetString.contentLength,
-                   asn_DEF_E2SM_gNB_X2_indicationMessage.name, rval.consumed);
-
-        return e2err_RICIndicationMessageDecodeFAIL;
-    default:
-        return e2err_RICIndicationMessageDecodeDefaultFail;
-    }
-}
-
 //////////////////////////////////////////////////////////////////////
 uint64_t getRICSubscriptionDeleteRequestData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSubscriptionDeleteRequest_t* pRICSubscriptionDeleteRequest) {
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
 
-    // RICrequestID
+    RICsubscriptionDeleteRequest_t *asnRicSubscriptionDeleteRequest = &pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionDeleteRequest;
     RICsubscriptionDeleteRequest_IEs_t* pRICsubscriptionDeleteRequest_IEs;
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionDeleteRequest.protocolIEs.list.count > 0) {
-        pRICsubscriptionDeleteRequest_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionDeleteRequest.protocolIEs.list.array[0];
+
+    // RICrequestID
+    if (asnRicSubscriptionDeleteRequest->protocolIEs.list.count > 0 &&
+        asnRicSubscriptionDeleteRequest->protocolIEs.list.array[0]->id == ProtocolIE_ID_id_RICrequestID) {
+        pRICsubscriptionDeleteRequest_IEs = asnRicSubscriptionDeleteRequest->protocolIEs.list.array[0];
         pRICSubscriptionDeleteRequest->ricRequestID.ricRequestorID = pRICsubscriptionDeleteRequest_IEs->value.choice.RICrequestID.ricRequestorID;
         pRICSubscriptionDeleteRequest->ricRequestID.ricRequestSequenceNumber = pRICsubscriptionDeleteRequest_IEs->value.choice.RICrequestID.ricRequestSequenceNumber;
     }
@@ -1964,8 +1358,9 @@ uint64_t getRICSubscriptionDeleteRequestData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer,
     }
 
     // RANfunctionID
-    if (pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionDeleteRequest.protocolIEs.list.count > 1) {
-        pRICsubscriptionDeleteRequest_IEs = pE2AP_PDU->choice.initiatingMessage.value.choice.RICsubscriptionDeleteRequest.protocolIEs.list.array[1];
+    if (asnRicSubscriptionDeleteRequest->protocolIEs.list.count > 1 &&
+        asnRicSubscriptionDeleteRequest->protocolIEs.list.array[1]->id == ProtocolIE_ID_id_RANfunctionID) {
+        pRICsubscriptionDeleteRequest_IEs = asnRicSubscriptionDeleteRequest->protocolIEs.list.array[1];
         pRICSubscriptionDeleteRequest->ranFunctionID = pRICsubscriptionDeleteRequest_IEs->value.choice.RANfunctionID;
     }
     else {
@@ -1982,10 +1377,13 @@ uint64_t getRICSubscriptionDeleteResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer,
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
 
-    // RICrequestID
+    RICsubscriptionDeleteResponse_t *asnRicSubscriptionDeleteResponse = &pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionDeleteResponse;
     RICsubscriptionDeleteResponse_IEs_t* pRICsubscriptionDeleteResponse_IEs;
-    if (pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionDeleteResponse.protocolIEs.list.count > 0) {
-        pRICsubscriptionDeleteResponse_IEs = pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionDeleteResponse.protocolIEs.list.array[0];
+
+    // RICrequestID
+    if (asnRicSubscriptionDeleteResponse->protocolIEs.list.count > 0 &&
+        asnRicSubscriptionDeleteResponse->protocolIEs.list.array[0]->id == ProtocolIE_ID_id_RICrequestID) {
+        pRICsubscriptionDeleteResponse_IEs = asnRicSubscriptionDeleteResponse->protocolIEs.list.array[0];
         pRICSubscriptionDeleteResponse->ricRequestID.ricRequestorID = pRICsubscriptionDeleteResponse_IEs->value.choice.RICrequestID.ricRequestorID;
         pRICSubscriptionDeleteResponse->ricRequestID.ricRequestSequenceNumber = pRICsubscriptionDeleteResponse_IEs->value.choice.RICrequestID.ricRequestSequenceNumber;
     }
@@ -1995,8 +1393,9 @@ uint64_t getRICSubscriptionDeleteResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer,
     }
 
     // RANfunctionID
-    if (pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionDeleteResponse.protocolIEs.list.count > 1) {
-        pRICsubscriptionDeleteResponse_IEs = pE2AP_PDU->choice.successfulOutcome.value.choice.RICsubscriptionDeleteResponse.protocolIEs.list.array[1];
+    if (asnRicSubscriptionDeleteResponse->protocolIEs.list.count > 1 &&
+        asnRicSubscriptionDeleteResponse->protocolIEs.list.array[1]->id == ProtocolIE_ID_id_RANfunctionID) {
+        pRICsubscriptionDeleteResponse_IEs = asnRicSubscriptionDeleteResponse->protocolIEs.list.array[1];
         pRICSubscriptionDeleteResponse->ranFunctionID = pRICsubscriptionDeleteResponse_IEs->value.choice.RANfunctionID;
     }
     else {
@@ -2013,10 +1412,13 @@ uint64_t getRICSubscriptionDeleteFailureData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer,
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
 
-    // RICrequestID
+    RICsubscriptionDeleteFailure_t *asnRicSubscriptionDeleteFailure = &pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionDeleteFailure;
     RICsubscriptionDeleteFailure_IEs_t* pRICsubscriptionDeleteFailure_IEs;
-    if (pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.count > 0) {
-        pRICsubscriptionDeleteFailure_IEs = pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.array[0];
+
+    // RICrequestID
+    if (asnRicSubscriptionDeleteFailure->protocolIEs.list.count > 0 &&
+        asnRicSubscriptionDeleteFailure->protocolIEs.list.array[0]->id == ProtocolIE_ID_id_RICrequestID) {
+        pRICsubscriptionDeleteFailure_IEs = asnRicSubscriptionDeleteFailure->protocolIEs.list.array[0];
         pRICSubscriptionDeleteFailure->ricRequestID.ricRequestorID = pRICsubscriptionDeleteFailure_IEs->value.choice.RICrequestID.ricRequestorID;
         pRICSubscriptionDeleteFailure->ricRequestID.ricRequestSequenceNumber = pRICsubscriptionDeleteFailure_IEs->value.choice.RICrequestID.ricRequestSequenceNumber;
     }
@@ -2026,8 +1428,9 @@ uint64_t getRICSubscriptionDeleteFailureData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer,
     }
 
     // RANfunctionID
-    if (pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.count > 1) {
-        pRICsubscriptionDeleteFailure_IEs = pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.array[1];
+    if (asnRicSubscriptionDeleteFailure->protocolIEs.list.count > 1 &&
+        asnRicSubscriptionDeleteFailure->protocolIEs.list.array[1]->id == ProtocolIE_ID_id_RANfunctionID) {
+        pRICsubscriptionDeleteFailure_IEs = asnRicSubscriptionDeleteFailure->protocolIEs.list.array[1];
         pRICSubscriptionDeleteFailure->ranFunctionID = pRICsubscriptionDeleteFailure_IEs->value.choice.RANfunctionID;
     }
     else {
@@ -2036,8 +1439,9 @@ uint64_t getRICSubscriptionDeleteFailureData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer,
     }
 
     // RICcause
-    if (pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.count > 2) {
-        pRICsubscriptionDeleteFailure_IEs = pE2AP_PDU->choice.unsuccessfulOutcome.value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.array[2];
+    if (asnRicSubscriptionDeleteFailure->protocolIEs.list.count > 2 &&
+        asnRicSubscriptionDeleteFailure->protocolIEs.list.array[2]->id == ProtocolIE_ID_id_RICcause) {
+        pRICsubscriptionDeleteFailure_IEs = asnRicSubscriptionDeleteFailure->protocolIEs.list.array[2];
         if (pRICsubscriptionDeleteFailure_IEs->value.choice.RICcause.present == RICcause_PR_radioNetwork) {
             pRICSubscriptionDeleteFailure->ricCause.content = RICcause_PR_radioNetwork;
             pRICSubscriptionDeleteFailure->ricCause.cause =