[Epic-ID: ODUHIGH-404][Task-ID: ODUHIGH-413] Modification of E2setup request and...
[o-du/l2.git] / src / du_app / du_e2ap_msg_hdl.c
index 4ee88c6..edcaf15 100644 (file)
 #   limitations under the License.                                             #
 ################################################################################
 *******************************************************************************/
-#include "du_e2ap_msg_hdl.h"
+#include "common_def.h"
+#include "lrg.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "legtp.h"
+#include "du_app_mac_inf.h"
+#include "du_app_rlc_inf.h"
+#include "du_cfg.h"
+#include "du_mgr.h"
 #include "du_mgr_main.h"
+#include "du_utils.h"
 #include "GlobalE2node-gNB-ID.h"
-
-#define ENC_BUF_MAX_LEN 100
-
-/* Global variable */
-DuCfgParams duCfgParam;
-char encBuf[ENC_BUF_MAX_LEN];
-int  encBufSize;
+#include<ProtocolIE-FieldE2.h>
+#include "E2setupRequest.h"
+#include "InitiatingMessageE2.h"
+#include "SuccessfulOutcomeE2.h"
+#include "E2AP-PDU.h"
+#include "du_e2ap_msg_hdl.h"
+#include "odu_common_codec.h"
+#include "E2nodeComponentInterfaceF1.h"
+#include "E2setupRequest.h"
 
 /*******************************************************************
  *
- * @brief Writes the encoded chunks into a buffer
+ * @brief Builds Global gNodeB Params
  *
  * @details
  *
- *    Function : PrepFinalEncBuf
+ *    Function : BuildGlobalgNBId
  *
- *    Functionality:Fills the encoded buffer
+ *    Functionality: Building the Plmn and gNB id
  *
- * @params[in] void *buffer,initial encoded data
- * @params[in] size_t size,size of buffer
- * @params[in] void *encodedBuf,final buffer
+ * @params[in] GlobalE2node_gNB_ID_t *gNbId
  * @return ROK     - success
  *         RFAILED - failure
  *
- * ****************************************************************/
-static int PrepFinalEncBuf(const void *buffer, size_t size, void *encodedBuf)
+ ******************************************************************/
+
+uint8_t BuildGlobalgNBId(GlobalE2node_gNB_ID_t *gNbId)
 {
-   memcpy(encodedBuf + encBufSize, buffer, size);
-   encBufSize += size;
-   return 0;
-} /* PrepFinalEncBuf */
+   uint8_t unused = 0;
+   uint8_t byteSize = 4;
+   uint8_t val = 1;
+   uint8_t ret = ROK;
+
+   /* Allocate Buffer size */
+   gNbId->global_gNB_ID.plmn_id.size = 3 * sizeof(uint8_t);
+   gNbId->global_gNB_ID.plmn_id.buf = NULLP;
+   DU_ALLOC(gNbId->global_gNB_ID.plmn_id.buf , gNbId->global_gNB_ID.plmn_id.size);
+   if(gNbId->global_gNB_ID.plmn_id.buf == NULLP)
+   {
+      DU_LOG("\nERROR  -->  E2AP: Memory allocation failed for Plmn buffer");
+      ret = RFAILED;
+   }
+   else
+   {
+      buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn, \
+           gNbId->global_gNB_ID.plmn_id.buf);
+      /* fill gND Id */
+      gNbId->global_gNB_ID.gnb_id.present = GNB_ID_Choice_PR_gnb_ID;
+      /* Allocate Buffer size */
+      gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.size = byteSize * sizeof(uint8_t);
+      gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.buf = NULLP;
+      DU_ALLOC(gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.buf, \
+           gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.size);
+      if(gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.buf == NULLP)
+      {
+        DU_LOG("\nERROR  -->  E2AP: Memory allocation failed for gnb buffer");
+        ret = RFAILED;
+      }
+      else
+      {
+        fillBitString(&gNbId->global_gNB_ID.gnb_id.choice.gnb_ID, unused, byteSize, val);
+      }
+   }
+   return ret;
+}
 
 /*******************************************************************
  *
- * @brief Builds PLMN ID 
+ * @brief Builds E2 node config addition list 
  *
  * @details
  *
- *    Function : BuildPlmnId
+ *    Function : BuildE2NodeConfigAddList
  *
- *    Functionality: Building the PLMN ID
+ *    Functionality: Building E2 node config addition list
  *
- * @params[in] PLMNID plmn
- *             OCTET_STRING_t *plmnid
+ * @params[in] E2nodeComponentConfigAddition_List_t *e2NodeAddList 
  * @return ROK     - success
  *         RFAILED - failure
  *
- * ****************************************************************/
+ ******************************************************************/
 
-S16 BuildPlmnId(PlmnId plmn, OCTET_STRING_t *plmnid)
+uint8_t BuildE2NodeConfigAddList(E2nodeComponentConfigAddition_List_t *e2NodeAddList)
 {
-   U8 mncCnt;
-   plmnid->size = 3;
-   DU_ALLOC(plmnid->buf,  plmnid->size * sizeof(U8));
-   if(plmnid->buf == NULLP)
+   uint8_t arrIdx = 0;
+   E2nodeComponentConfigAddition_ItemIEs_t *e2NodeAddItemIe;
+   E2nodeComponentConfigAddition_Item_t *e2NodeAddItem;
+
+   e2NodeAddList->list.count = 1;
+   e2NodeAddList->list.size = e2NodeAddList->list.count * sizeof(E2nodeComponentConfigAddition_ItemIEs_t *);
+   DU_ALLOC(e2NodeAddList->list.array, e2NodeAddList->list.size);
+   if(e2NodeAddList->list.array == NULLP)
    {
-      RETVALUE(RFAILED);
+       DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+       return RFAILED;
    }
-   mncCnt = 2;
-   plmnid->buf[0] = ((plmn.mcc[1] << 4) | (plmn.mcc[0]));
-   if(mncCnt == 2)
+
+   for(arrIdx = 0; arrIdx< e2NodeAddList->list.count; arrIdx++)
    {
-      plmnid->buf[1]  = ((0xf0) | (plmn.mcc[2]));
-      plmnid->buf[2] = ((plmn.mnc[1] << 4) | (plmn.mnc[0]));
+      DU_ALLOC(e2NodeAddList->list.array[arrIdx], sizeof(E2nodeComponentConfigAddition_ItemIEs_t));
+      if(e2NodeAddList->list.array[arrIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+         return RFAILED;
+      }
    }
-   else
+
+   arrIdx = 0;
+   e2NodeAddItemIe = (E2nodeComponentConfigAddition_ItemIEs_t *) e2NodeAddList->list.array[arrIdx];
+   e2NodeAddItemIe->id = ProtocolIE_IDE2_id_E2nodeComponentConfigAddition_Item;
+   e2NodeAddItemIe->criticality = CriticalityE2_reject;
+   e2NodeAddItemIe->value.present = E2nodeComponentConfigAddition_ItemIEs__value_PR_E2nodeComponentConfigAddition_Item;
+   e2NodeAddItem = &e2NodeAddItemIe->value.choice.E2nodeComponentConfigAddition_Item;
+   
+   /* E2nodeComponentInterfaceType */
+   e2NodeAddItem->e2nodeComponentInterfaceType = E2nodeComponentInterfaceType_f1;
+
+   /* E2 Node Component Request Part */
+   e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.size = duCb.f1SetupReqAndRspMsg.f1MsgReqBufSize;
+   DU_ALLOC(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.buf,\
+   e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.size);
+   if(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.buf == NULLP)
+   {
+      DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+      return RFAILED;
+   }
+
+   memcpy(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentRequestPart.buf,\
+   duCb.f1SetupReqAndRspMsg.f1MsgReqBuf, e2NodeAddItem->e2nodeComponentConfiguration.\
+   e2nodeComponentRequestPart.size);
+   DU_FREE(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf,duCb.f1SetupReqAndRspMsg.f1MsgReqBufSize);
+  
+   /* E2 Node Component Response Part */
+   e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.size = duCb.f1SetupReqAndRspMsg.f1MsgRspBufSize; 
+   DU_ALLOC(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.buf, \
+   e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.size);
+   if(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.buf == NULLP)
+   {
+      DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+      return RFAILED;
+   }
+   memcpy(e2NodeAddItem->e2nodeComponentConfiguration.e2nodeComponentResponsePart.buf, \
+   duCb.f1SetupReqAndRspMsg.f1MsgRspBuf, e2NodeAddItem->e2nodeComponentConfiguration.\
+   e2nodeComponentResponsePart.size);
+   DU_FREE(duCb.f1SetupReqAndRspMsg.f1MsgRspBuf, duCb.f1SetupReqAndRspMsg.f1MsgRspBufSize);
+
+   /* E2 Node Component ID */
+   e2NodeAddItem->e2nodeComponentID.present = E2nodeComponentID_PR_e2nodeComponentInterfaceTypeF1;
+   DU_ALLOC(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1,\
+   sizeof(E2nodeComponentInterfaceF1_t));
+   if(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1 == NULLP)
+   {
+       DU_LOG("\nERROR  --> E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+       return RFAILED;
+   }
+   e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size = sizeof(uint8_t);
+   DU_ALLOC(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf,\
+   e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size);
+
+   if(e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf == NULLP)
    {
-      plmnid->buf[1] = ((plmn.mnc[0] << 4) | (plmn.mcc[2]));
-      plmnid->buf[2] = ((plmn.mnc[2] << 4) | (plmn.mnc[1]));
+      DU_LOG("\nERROR  -->list.  E2AP: Memory allocation failed for BuildE2NodeConfigAddList %d",__LINE__);
+      return RFAILED;
    }
-  RETVALUE(ROK);
+   e2NodeAddItem->e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf[arrIdx]  = duCfgParam.duId;
+   return ROK;
+
 }
 
 /*******************************************************************
  *
- * @brief Builds NodeB Id
+ * @brief Fills the initiating IE for E2 Setup Request
  *
  * @details
  *
- *    Function : BuildNodeBId
- *
- *    Functionality: Building the NodeBId
+ *    Function : fillE2SetupReq
  *
- * @params[in] BIT_STRING_t *nbid,
- *             U8 unusedBits
- *             U8 byteSize
- *             U8 val
+ * Functionality:Fills the Initiating message for
+ *               E2SetupRequest
  *
+ * @params[in] E2setupRequest_t *e2SetupReq,
+ *             uint8_t *idx
  * @return ROK     - success
  *         RFAILED - failure
  *
- * ****************************************************************/
+ ******************************************************************/
 
-S16 BuildNodeBId(BIT_STRING_t *nbid, U8 unusedBits, U8 byteSize, U8 val)
+uint8_t fillE2SetupReq(E2setupRequest_t **e2SetupReq, uint8_t *idx)
 {
-   U8 tmp;
-   nbid->size = byteSize;
-   DU_ALLOC(nbid->buf, nbid->size * sizeof(U8));
-   if(nbid->buf == NULLP)
+   uint8_t elementCnt = 0;
+   uint8_t arrIdx = 0;
+   uint8_t ret = ROK;
+
+   if(*e2SetupReq != NULLP)
    {
-      RETVALUE(RFAILED);
-   }
+      elementCnt = 3;
+      (*e2SetupReq)->protocolIEs.list.count = elementCnt;
+      (*e2SetupReq)->protocolIEs.list.size = elementCnt * sizeof(E2setupRequestIEs_t*);
+
+      /* Initialize the E2Setup members */
+      DU_ALLOC((*e2SetupReq)->protocolIEs.list.array, \
+            (*e2SetupReq)->protocolIEs.list.size);
+      if((*e2SetupReq)->protocolIEs.list.array == NULLP)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation failed for array elements");
+         return RFAILED;
+      }
+      for(*idx = 0; *idx < elementCnt; (*idx)++)
+      {
+         DU_ALLOC((*e2SetupReq)->protocolIEs.list.array[*idx],\
+               sizeof(E2setupRequestIEs_t));
+         if((*e2SetupReq)->protocolIEs.list.array[*idx] == NULLP)
+         {
+            DU_LOG("\nERROR  -->  E2AP : Memory allocation failed for arrayidx [%d]", *idx);
+            return RFAILED;
+         }
+      }
+      arrIdx = 0;
+
+      /* TransactionID */
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_TransactionID;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.present = E2setupRequestIEs__value_PR_TransactionID;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.choice.TransactionID = TRANS_ID;
+
+      arrIdx++;
+      /* GlobalE2node_gNB_ID */
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_GlobalE2node_ID;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.present = E2setupRequestIEs__value_PR_GlobalE2node_ID;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.choice.GlobalE2node_ID.present = GlobalE2node_ID_PR_gNB;
+
+      DU_ALLOC((*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.choice.\
+            GlobalE2node_ID.choice.gNB, sizeof(GlobalE2node_gNB_ID_t));
+      if((*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.choice.\
+            GlobalE2node_ID.choice.gNB == NULLP)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation failed for gNbId");
+         return  RFAILED;
+      }
+      else
+      {
+         ret = BuildGlobalgNBId((*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.\
+               choice.GlobalE2node_ID.choice.gNB);
+         if(ret != ROK)
+         {
+             DU_LOG("\nERROR  -->  E2AP : Failed to build Global Gnb Id");
+             return RFAILED;
+         }
+      }
+      
+      arrIdx++;
+      /* E2 Node Component Configuration Addition List */
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->id = ProtocolIE_IDE2_id_E2nodeComponentConfigAddition;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->criticality = CriticalityE2_reject;
+      (*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.present = E2setupRequestIEs__value_PR_E2nodeComponentConfigAddition_List;
+      if(BuildE2NodeConfigAddList(&((*e2SetupReq)->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAddition_List))!=ROK)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Failed to E2 Node config addition list");
+         return RFAILED;
+      }
 
-   for (tmp = 0 ; tmp < ((nbid->size)-1); tmp++)
+   }
+   else
    {
-      nbid->buf[tmp] = 0;
+      DU_LOG("\nERROR  -->  E2AP : received e2SetupReq is NULL");
+      return RFAILED;
    }
-   nbid->buf[byteSize-1] = val; 
-   nbid->bits_unused = unusedBits;
-   RETVALUE(ROK);
+   return ROK;
 }
 
+
 /*******************************************************************
  *
- * @brief Builds Global gNodeB Params
+ * @brief De Allocate E2 Setup Request Message
  *
  * @details
  *
- *    Function : BuildGlobalgNB
+ *    Function : FreeE2SetupReq
  *
- *    Functionality: Building the Plmn and gNB id
+ *    Functionality: De-Allocating E2 Setup request Message
  *
- * @params[in] GlobalE2node_gNB_ID_t *gNbId
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] E2AP_PDU_t *e2apMsg
+ * @return void
  *
  * ****************************************************************/
 
-S16 BuildGlobalgNB(GlobalE2node_gNB_ID_t *gNbId)
+void FreeE2SetupReq(E2AP_PDU_t *e2apMsg)
 {
-   U8 unused = 0;
-   U8 byteSize = 4;
-   U8 val = 1;
-   if(gNbId != NULLP)
+   uint8_t arrIdx = 0;
+   uint8_t e2NodeAddListIdx =0;
+   E2setupRequest_t *e2SetupReq;
+   E2nodeComponentConfigAddition_List_t *e2NodeAddList;
+   E2nodeComponentConfigAddition_ItemIEs_t *e2NodeAddItem;
+
+   /* De-allocating Memory */
+   if(e2apMsg != NULLP)
    {
-      BuildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn, \
-       &gNbId->global_gNB_ID.plmn_id); 
-      /* fill gND Id */
-      gNbId->global_gNB_ID.gnb_id.present = GNB_ID_Choice_PR_gnb_ID; 
-      BuildNodeBId(&gNbId->global_gNB_ID.gnb_id.choice.gnb_ID, unused, byteSize, val);
+      if(e2apMsg->choice.initiatingMessage != NULLP)
+      {
+         e2SetupReq = &e2apMsg->choice.initiatingMessage->value.choice.E2setupRequest; 
+         if(e2SetupReq->protocolIEs.list.array != NULLP)
+         {
+            for(arrIdx = 0; arrIdx < e2SetupReq->protocolIEs.list.count; arrIdx++)
+            {
+               if(e2SetupReq->protocolIEs.list.array[arrIdx] != NULLP)
+               {
+                  switch(e2SetupReq->protocolIEs.list.array[arrIdx]->id)
+                  {
+                     case ProtocolIE_IDE2_id_TransactionID:
+                          break;
+                     case ProtocolIE_IDE2_id_GlobalE2node_ID:
+                        {
+                           if(e2SetupReq->protocolIEs.list.array[arrIdx]->\
+                                 value.choice.GlobalE2node_ID.choice.gNB != NULLP)
+                           {
+                              GlobalE2node_gNB_ID_t *gNbId = NULLP;
+                              gNbId = e2SetupReq->protocolIEs.list.array[arrIdx]->\
+                                      value.choice.GlobalE2node_ID.choice.gNB;
+                              if(gNbId->global_gNB_ID.plmn_id.buf != NULLP)
+                              {
+                                 DU_FREE(gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.buf,\
+                                          gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.size);
+                                 DU_FREE(gNbId->global_gNB_ID.plmn_id.buf,\
+                                       gNbId->global_gNB_ID.plmn_id.size);
+                              }
+                              DU_FREE(e2SetupReq->protocolIEs.list.array[arrIdx]->value.\
+                                    choice.GlobalE2node_ID.choice.gNB, sizeof(GlobalE2node_gNB_ID_t));
+                           }
+                           break;
+                        }
+                     case ProtocolIE_IDE2_id_E2nodeComponentConfigAddition:
+                     {
+                         e2NodeAddList = &e2SetupReq->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAddition_List;
+                         if(e2NodeAddList->list.array)
+                         {
+                             for(e2NodeAddListIdx = 0; e2NodeAddListIdx< e2NodeAddList->list.count; e2NodeAddListIdx++)
+                             {
+                                e2NodeAddItem = (E2nodeComponentConfigAddition_ItemIEs_t *) e2NodeAddList->list.array[e2NodeAddListIdx];
+                                
+                                /* Free E2 Node Component Request Part */
+                                DU_FREE(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentConfiguration.e2nodeComponentRequestPart.buf,\
+                                      e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentConfiguration.e2nodeComponentRequestPart.size);
+                                
+                                /* Free E2 Node Component Response Part */
+                                DU_FREE(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentConfiguration.\
+                                      e2nodeComponentResponsePart.buf, \
+                                      e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentConfiguration.e2nodeComponentResponsePart.size);
+                                 
+                                 /* Free E2 Node Component ID */
+                                if(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1)
+                                {
+                                    DU_FREE(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.\
+                                    e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf,\   
+                                    e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.\
+                                    e2nodeComponentInterfaceTypeF1->gNB_DU_ID.size);
+                                    DU_FREE(e2NodeAddItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.choice.e2nodeComponentInterfaceTypeF1,\
+                                    sizeof(E2nodeComponentInterfaceF1_t));
+                                }
+                                DU_FREE(e2NodeAddList->list.array[e2NodeAddListIdx], sizeof(E2nodeComponentConfigAddition_ItemIEs_t));
+                             }
+                             DU_FREE(e2NodeAddList->list.array, e2NodeAddList->list.size);
+                         }
+                         break;
+                     }
+                     default:
+                        DU_LOG("\nERROR  --> E2AP: Invalid event at e2SetupRequet %ld ",\
+                              (e2SetupReq->protocolIEs.list.array[arrIdx]->id));
+                        break;
+                  }
+                  DU_FREE(e2SetupReq->protocolIEs.list.array[arrIdx], sizeof(E2setupRequestIEs_t));
+               }
+            }
+            DU_FREE(e2SetupReq->protocolIEs.list.array, e2SetupReq->protocolIEs.list.size);
+         }
+         DU_FREE(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
+      }
+      DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
    }
-   RETVALUE(ROK);   
 }
 
 /*******************************************************************
@@ -177,120 +424,73 @@ S16 BuildGlobalgNB(GlobalE2node_gNB_ID_t *gNbId)
  *
  ******************************************************************/
 
-S16 BuildAndSendE2SetupReq()
+uint8_t BuildAndSendE2SetupReq()
 {
-   E2AP_PDU_t                 *e2apMsg = NULLP;
-   E2setupRequest_t           *e2SetupReq;
-   U8   elementCnt;
-   U8   idx;
-   U8   ieId;
-   S16  ret; 
-   asn_enc_rval_t             encRetVal;        /* Encoder return value */
-
-   DU_LOG("\nE2AP : Building E2 Setup Request\n");
-
-   DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
-   if(e2apMsg == NULLP)
+   uint8_t idx = 0;
+   uint8_t ret = ROK;
+   E2AP_PDU_t        *e2apMsg = NULLP;
+   E2setupRequest_t  *e2SetupReq = NULLP;
+   asn_enc_rval_t     encRetVal;       /* Encoder return value */
+
+   DU_LOG("\nINFO   -->  E2AP : Building E2 Setup Request\n");
+   do
    {
-      DU_LOG("\nE2AP : Memory allocation for E2AP-PDU failed");
-      RETVALUE(RFAILED);
-   }
+      DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
+      if(e2apMsg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
+         break;
+      }
+      e2apMsg->present = E2AP_PDU_PR_initiatingMessage;
+      DU_ALLOC(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
+      if(e2apMsg->choice.initiatingMessage == NULLP)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
+         DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
+         return RFAILED;
+      }
+      e2apMsg->choice.initiatingMessage->criticality = CriticalityE2_reject;
+      e2apMsg->choice.initiatingMessage->procedureCode = ProcedureCodeE2_id_E2setup;
+      e2apMsg->choice.initiatingMessage->value.present = InitiatingMessageE2__value_PR_E2setupRequest;
+      e2SetupReq = &e2apMsg->choice.initiatingMessage->value.choice.E2setupRequest;
 
-   e2apMsg->present = E2AP_PDU_PR_initiatingMessage;
-   DU_ALLOC(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
-   if(e2apMsg->choice.initiatingMessage == NULLP)
-   {
-      DU_LOG("\nE2AP : Memory allocation for E2AP-PDU failed");
-      DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
-      RETVALUE(RFAILED);
-   }
-   e2apMsg->choice.initiatingMessage->criticality = CriticalityE2_reject;
-   e2apMsg->choice.initiatingMessage->procedureCode = ProcedureCodeE2_id_E2setup;
-   e2apMsg->choice.initiatingMessage->value.present = InitiatingMessageE2__value_PR_E2setupRequest;
-   
-   DU_ALLOC(e2SetupReq, sizeof(E2setupRequest_t));
-   e2SetupReq = &e2apMsg->choice.initiatingMessage->value.choice.E2setupRequest;
-   
-   elementCnt = 1;
-   
-   e2SetupReq->protocolIEs.list.count = elementCnt;
-   e2SetupReq->protocolIEs.list.size = elementCnt * sizeof(E2setupRequestIEs_t);
-
-   /* Initialize the E2Setup members */
-   DU_ALLOC(e2SetupReq->protocolIEs.list.array, \
-            e2SetupReq->protocolIEs.list.size);
-   if(e2SetupReq->protocolIEs.list.array == NULLP)
-   {
-      DU_LOG("\nE2AP : Memory allocation for E2RequestIEs failed");
-      DU_FREE(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
-      DU_FREE(e2apMsg, (Size)sizeof(E2AP_PDU_t));
-      RETVALUE(RFAILED);
-   }
-   
-   for(idx=0; idx<elementCnt; idx++)
-   {
-      DU_ALLOC(e2SetupReq->protocolIEs.list.array[idx],\
-            sizeof(E2setupRequestIEs_t));
-      if(e2SetupReq->protocolIEs.list.array[idx] == NULLP)
+      ret = fillE2SetupReq(&e2SetupReq, &idx);
+      if(ret != ROK)
+      {
+         DU_LOG("\nERROR  -->  E2AP : fillE2SetupReq() failed");
+         break;
+      }
+      /* Prints the Msg formed */
+      xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
+
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\
+            encBuf);
+      if(encRetVal.encoded == ENCODE_FAIL)
       {
-         for(ieId=0; ieId<idx; ieId++)
+         DU_LOG("\nERROR  -->  E2AP : Could not encode E2SetupRequest structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG   -->  E2AP : Created APER encoded buffer for E2SetupRequest\n");
+         for(int i=0; i< encBufSize; i++)
          {
-            DU_FREE(e2SetupReq->protocolIEs.list.array[ieId],\
-                  sizeof(E2setupRequestIEs_t));
+            printf("%x",encBuf[i]);
          }
-         DU_FREE(e2SetupReq->protocolIEs.list.array,\
-                 e2SetupReq->protocolIEs.list.size);
-         DU_FREE(e2apMsg->choice.initiatingMessage, \
-               sizeof(InitiatingMessageE2_t));
-         DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
-         RETVALUE(RFAILED);
       }
-   }
-
-   idx = 0;
-   /* GlobalE2node_gNB_ID */
-   e2SetupReq->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_GlobalE2node_ID;
-   e2SetupReq->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   e2SetupReq->protocolIEs.list.array[idx]->value.present =\
-                                    E2setupRequestIEs__value_PR_GlobalE2node_ID;
-   e2SetupReq->protocolIEs.list.array[idx]->value.choice.GlobalE2node_ID.present = \
-                                                                   GlobalE2node_ID_PR_gNB;
-   
-   GlobalE2node_gNB_ID_t *gNbId;
-   DU_ALLOC(gNbId, sizeof(GlobalE2node_gNB_ID_t));
-   BuildGlobalgNB(gNbId);
-   e2SetupReq->protocolIEs.list.array[idx]->value.choice.GlobalE2node_ID.choice.gNB = gNbId;
-
-   /* Prints the Msg formed */
-   xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
-
-
-   cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
-   encBufSize = 0;
-   encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\
-               encBuf);
-   if(encRetVal.encoded == ENCODE_FAIL)
-   {
-          DU_LOG("\nE2AP : Could not encode E2SetupRequest structure (at %s)\n",\
-                          encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-          RETVALUE(RFAILED);
-   }
-   else
-   {
-           DU_LOG("\nE2AP : Created APER encoded buffer for E2SetupRequest\n");
-          for(int i=0; i< encBufSize; i++)
-          {
-                  printf("%x",encBuf[i]);
-          } 
-   }
+      if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      {
+         DU_LOG("\nERROR  -->  E2AP : Sending E2 Setup request failed");
+      }
 
-   if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
-   {
-          DU_LOG("\nE2AP : Sending E2 Setup request failed");
-          RETVALUE(RFAILED);
-   }
+      break;
+   }while(true);
 
-   RETVALUE(ROK);
+   FreeE2SetupReq(e2apMsg);
+   return ret;
 }/* End of BuildAndSendE2SetupReq */
 
 /*******************************************************************
@@ -309,14 +509,16 @@ S16 BuildAndSendE2SetupReq()
  *
  * ****************************************************************/
 
-S16 BuildRicRequestId(RICrequestID_t *ricReqId)
+uint8_t BuildRicRequestId(RICrequestID_t *ricReqId)
 {
-   if(ricReqId != NULLP)
+   if(ricReqId == NULLP)
    {
-      ricReqId->ricRequestorID = 1;
-      ricReqId->ricInstanceID  = 1;
+      return RFAILED;
    }
-   RETVALUE(ROK);
+
+   ricReqId->ricRequestorID = 1;
+   ricReqId->ricInstanceID  = 1;
+   return ROK;
 }
 
 /*******************************************************************
@@ -335,7 +537,7 @@ S16 BuildRicRequestId(RICrequestID_t *ricReqId)
  *
  * ****************************************************************/
 
-S16 fillRicAdmitList(RICaction_Admitted_ItemIEs_t *ricAdmitItems)
+uint8_t fillRicAdmitList(RICaction_Admitted_ItemIEs_t *ricAdmitItems)
 {
 
    if(ricAdmitItems != NULLP)
@@ -345,7 +547,11 @@ S16 fillRicAdmitList(RICaction_Admitted_ItemIEs_t *ricAdmitItems)
       ricAdmitItems->value.present = RICaction_Admitted_ItemIEs__value_PR_RICaction_Admitted_Item;
       ricAdmitItems->value.choice.RICaction_Admitted_Item.ricActionID = 1; 
    }
-   RETVALUE(ROK);
+   else
+   {
+      return RFAILED;
+   }
+   return ROK;
 }
 /*******************************************************************
  *
@@ -353,7 +559,7 @@ S16 fillRicAdmitList(RICaction_Admitted_ItemIEs_t *ricAdmitItems)
  *
  * @details
  *
- *    Function : fillRicAdmitList
+ *    Function : BuildRicAdmitList
  *
  *    Functionality: Builds the mandatory Ric Admitted List Params
  *
@@ -363,25 +569,207 @@ S16 fillRicAdmitList(RICaction_Admitted_ItemIEs_t *ricAdmitItems)
  *
  * ****************************************************************/
 
-S16 BuildRicAdmitList(RICaction_Admitted_List_t *admitListPtr)
+uint8_t BuildRicAdmitList(RICaction_Admitted_List_t *admitListPtr)
 {
-   U8 elementCnt; 
+   uint8_t idx ;
+   uint8_t elementCnt;  
+   uint8_t ret= ROK;
+   elementCnt = 1;
 
-   elementCnt = 1; 
-   admitListPtr->list.count = elementCnt;
-   admitListPtr->list.size  = elementCnt * sizeof(RICaction_Admitted_ItemIEs_t);
-   DU_ALLOC(admitListPtr->list.array, admitListPtr->list.size);
-   if(admitListPtr->list.array == NULLP)
+   if(admitListPtr == NULLP)
    {
-      DU_LOG("\nE2AP : Memory allocation for RIC Admit List failed");
-      RETVALUE(RFAILED);
+      DU_LOG("\nERROR  -->  E2AP : Memory allocation for RIC Admit List failed");
+      ret = RFAILED;
    }
-   DU_ALLOC(admitListPtr->list.array[0], sizeof(RICaction_Admitted_ItemIEs_t));
-   fillRicAdmitList(admitListPtr->list.array[0]);
+   else
+   {
+      admitListPtr->list.count = elementCnt;
+      admitListPtr->list.size  = elementCnt * sizeof(RICaction_Admitted_ItemIEs_t);
+      DU_ALLOC(admitListPtr->list.array, admitListPtr->list.size);
+      if(admitListPtr->list.array == NULLP)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Memory allocation for RIC Admit List failed");
+        ret = RFAILED;
+      }
+      else
+      {
+        for(idx=0 ; idx<elementCnt ; idx++ )
+        {
+           DU_ALLOC(admitListPtr->list.array[idx], sizeof(RICaction_Admitted_ItemIEs_t));
+           if(admitListPtr->list.array[idx] == NULLP)
+           {
+              ret = RFAILED;
+           }
+        }
+        if(ret != RFAILED)
+        {
+           idx=0;
+           fillRicAdmitList((RICaction_Admitted_ItemIEs_t *)admitListPtr->list.array[idx]);
+        }
+      }
+   }   
+   return ret;
+}
+/*******************************************************************
+ *
+ * @breif Deallocation of BuildAndSendRicSubscriptionRsp memory
+ *
+ * @details
+ *
+ *    Function : FreeRicSubscriptionRsp
+ *
+ * Functionality:Free the RicSubscriptionRsp
+ *
+ * @param[in] E2AP_PDU_t *e2apRicMsg
+ *
+ * @return void
+ *      
+ *
+ ******************************************************************/
+void FreeRicSubscriptionRsp(E2AP_PDU_t  *e2apRicMsg)
+{
+   RICsubscriptionResponse_t  *ricSubscriptionRsp= NULLP;
+   uint8_t idx=0;
+   uint8_t idx1=0;
+   RICaction_Admitted_List_t *admitListPtr;
 
-   RETVALUE(ROK);
+   if(e2apRicMsg != NULLP)
+   {
+      if(e2apRicMsg->choice.successfulOutcome != NULLP)
+      {
+        ricSubscriptionRsp = &e2apRicMsg->choice.successfulOutcome->value.choice.RICsubscriptionResponse;
+        if(ricSubscriptionRsp)
+        {
+           if(ricSubscriptionRsp->protocolIEs.list.array != NULLP)
+           {
+              for(idx=0; idx<ricSubscriptionRsp->protocolIEs.list.count; idx++)
+              {
+                 if(ricSubscriptionRsp->protocolIEs.list.array[idx] != NULLP)
+                 {
+                    switch(ricSubscriptionRsp->protocolIEs.list.array[idx]->id)
+                    {
+                       case ProtocolIE_IDE2_id_RICrequestID:
+                          break;
+
+                       case ProtocolIE_IDE2_id_RANfunctionID:
+                          break;
+
+                       case ProtocolIE_IDE2_id_RICactions_Admitted:
+                          {
+                             admitListPtr = &ricSubscriptionRsp->protocolIEs.list.\
+                                            array[idx]->value.choice.RICaction_Admitted_List;
+                             if(admitListPtr->list.array != NULLP)
+                             {
+                                for(idx1=0 ; idx1<admitListPtr->list.count; idx1++ )
+                                {
+                                   if(admitListPtr->list.array[idx1] != NULLP)
+                                   {
+                                      DU_FREE(admitListPtr->list.array[idx1],
+                                            sizeof(RICaction_Admitted_ItemIEs_t));
+                                   }
+                                }
+                                DU_FREE(admitListPtr->list.array, admitListPtr->list.size);     
+                             }
+                             break;
+                          }
+                       default:
+                          break;
+                    }
+                    DU_FREE(ricSubscriptionRsp->protocolIEs.list.array[idx], \
+                          sizeof(RICsubscriptionResponse_IEs_t));
+                 }
+              }
+              DU_FREE(ricSubscriptionRsp->protocolIEs.list.array, \
+                    ricSubscriptionRsp->protocolIEs.list.size);
+           }
+        }   
+        DU_FREE(e2apRicMsg->choice.successfulOutcome, sizeof(SuccessfulOutcomeE2_t));
+      }                
+      DU_FREE(e2apRicMsg, sizeof(E2AP_PDU_t));       
+   }
 }
+/*******************************************************************
+ *
+ * @brief Builds and Send the RicSubscriptionRsp
+ *
+ * @details
+ *
+ *    Function : BuildAndSendRicSubscriptionRsp
+ *
+ * functionality:Fills the RicSubscriptionRsp
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ******************************************************************/
+uint8_t  FillRicSubscriptionRsp(RICsubscriptionResponse_t  *ricSubscriptionRsp )
+{
+   uint8_t idx=0;
+   uint8_t ret = ROK;
+   uint8_t elementCnt = 0;
+   uint8_t BuildRicRequestIdret=ROK;
+   uint8_t BuildRicAdmitListret=ROK;
+
+   elementCnt=3;
+   ricSubscriptionRsp->protocolIEs.list.count = elementCnt;
+   ricSubscriptionRsp->protocolIEs.list.size  = elementCnt * sizeof(RICsubscriptionResponse_IEs_t);
+   DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array, \
+        ricSubscriptionRsp->protocolIEs.list.size);
+   if(ricSubscriptionRsp->protocolIEs.list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  E2AP : Memory allocation for FillRicSubscriptionRsp  failed");
+      ret = RFAILED;
+   }
+   else
+   {
+      for(idx=0; idx<ricSubscriptionRsp->protocolIEs.list.count; idx++)
+      {
+        DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array[idx], \
+              sizeof(RICsubscriptionResponse_IEs_t));
+        if(ricSubscriptionRsp->protocolIEs.list.array[idx] == NULLP)
+        {
+           ret = RFAILED;
+        }
+      }
+      if(ret != RFAILED)
+      {
 
+        idx=0;
+        ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICrequestID;
+        ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+        ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
+                                                                        RICsubscriptionRequest_IEs__value_PR_RICrequestID;
+        BuildRicRequestIdret =
+           BuildRicRequestId(&ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RICrequestID);
+        if(BuildRicRequestIdret != ROK)
+        {
+           ret = RFAILED;
+        }
+        else
+        {
+           idx++;
+           ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RANfunctionID;
+           ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+           ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
+                                                                           RICsubscriptionRequest_IEs__value_PR_RANfunctionID;
+           ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RANfunctionID = 1;
+
+           idx++;
+           ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICactions_Admitted;
+           ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+           ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
+                                                                           RICsubscriptionResponse_IEs__value_PR_RICaction_Admitted_List;
+           BuildRicAdmitListret =
+              BuildRicAdmitList(&ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RICaction_Admitted_List);
+           if(BuildRicAdmitListret != ROK)
+           {
+              ret = RFAILED;
+           }
+        }
+      }
+   }   
+   return ret;
+}
 /*******************************************************************
  *
  * @brief Builds and Send the RicSubscriptionRsp
@@ -397,533 +785,717 @@ S16 BuildRicAdmitList(RICaction_Admitted_List_t *admitListPtr)
  *
  ******************************************************************/
 
-S16 BuildAndSendRicSubscriptionRsp()
+uint8_t BuildAndSendRicSubscriptionRsp()
 {
 
    E2AP_PDU_t         *e2apRicMsg = NULLP;
-   RICsubscriptionResponse_t  *ricSubscriptionRsp;
+   RICsubscriptionResponse_t  *ricSubscriptionRsp=NULLP;
    asn_enc_rval_t     encRetVal; 
-   U8 idx;
-   U8 elementCnt;
-
-   DU_LOG("\nE2AP : Building RIC Subscription Response\n");
+   uint8_t ret = RFAILED;
+   uint8_t FillRicricSubscriptionRspret;
 
-   DU_ALLOC(e2apRicMsg, sizeof(E2AP_PDU_t)); 
-   if(e2apRicMsg == NULLP)
+   while(true)
    {
-      DU_LOG("\nE2AP : Memory allocation for E2AP-PDU failed");
-      RETVALUE(RFAILED);
-   }
-   e2apRicMsg->present =  E2AP_PDU_PR_successfulOutcome;
-   DU_ALLOC(e2apRicMsg->choice.successfulOutcome, sizeof(SuccessfulOutcomeE2_t));
-   if(e2apRicMsg->choice.successfulOutcome == NULLP)
-   {
-      DU_LOG("\nE2AP : Memory allocation for Ric subscription Response failed");
-      DU_FREE(e2apRicMsg, sizeof(RICsubscriptionResponse_t));
-      RETVALUE(RFAILED);  
-   }
+      DU_LOG("\nINFO   -->  E2AP : Building RIC Subscription Response\n");
 
-   e2apRicMsg->choice.successfulOutcome->procedureCode = ProcedureCodeE2_id_RICsubscription;
-   e2apRicMsg->choice.successfulOutcome->criticality = CriticalityE2_reject;
-   e2apRicMsg->choice.successfulOutcome->value.present = \
-         SuccessfulOutcomeE2__value_PR_RICsubscriptionResponse;
-   ricSubscriptionRsp = &e2apRicMsg->choice.successfulOutcome->value.choice.RICsubscriptionResponse;
+      DU_ALLOC(e2apRicMsg, sizeof(E2AP_PDU_t)); 
+      if(e2apRicMsg == NULLP)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
+        break;
+      }
+      e2apRicMsg->present =  E2AP_PDU_PR_successfulOutcome;
+      DU_ALLOC(e2apRicMsg->choice.successfulOutcome, sizeof(SuccessfulOutcomeE2_t));
+      if(e2apRicMsg->choice.successfulOutcome == NULLP)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Memory allocation for RIC subscription Response failed");
+        break;
+      }
 
-   elementCnt = 3;
-   ricSubscriptionRsp->protocolIEs.list.count = elementCnt;
-   ricSubscriptionRsp->protocolIEs.list.size  = elementCnt * sizeof(RICsubscriptionResponse_IEs_t);
+      e2apRicMsg->choice.successfulOutcome->procedureCode = ProcedureCodeE2_id_RICsubscription;
+      e2apRicMsg->choice.successfulOutcome->criticality = CriticalityE2_reject;
+      e2apRicMsg->choice.successfulOutcome->value.present = \
+                                                           SuccessfulOutcomeE2__value_PR_RICsubscriptionResponse;
+      ricSubscriptionRsp = &e2apRicMsg->choice.successfulOutcome->value.choice.RICsubscriptionResponse;
 
-   DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array, \
-              ricSubscriptionRsp->protocolIEs.list.size);
-   if(ricSubscriptionRsp->protocolIEs.list.array == NULLP)
-   {
-      DU_LOG("\nE2AP : Memory allocation for RICsubscriptionResponseIE failed");
-      DU_FREE(e2apRicMsg->choice.successfulOutcome, sizeof(SuccessfulOutcomeE2_t));
-      DU_FREE(e2apRicMsg, sizeof(E2AP_PDU_t));
-      RETVALUE(RFAILED);
-   }
+      FillRicricSubscriptionRspret = FillRicSubscriptionRsp(ricSubscriptionRsp);
+      if(FillRicricSubscriptionRspret != ROK)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Memory allocation for RICsubscriptionResponseIE failed");
+        break;
+      }
+
+      /* Prints the Msg formed */
+      xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apRicMsg);
+
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apRicMsg, PrepFinalEncBuf,\
+           encBuf);
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Could not encode RIC Subscription Response structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\nDEBUG   -->  E2AP : Created APER encoded buffer for RIC subscription response \n");
+        for(int i=0; i< encBufSize; i++)
+        {
+           printf("%x",encBuf[i]);
+        } 
+      } 
+
+      if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Sending RIC Subscription Response failed");      
+        break;
+      }
+
+      ret = ROK;
+      break;
 
-   for(idx=0; idx<elementCnt; idx++)
-   {
-      DU_ALLOC(ricSubscriptionRsp->protocolIEs.list.array[idx], \
-            sizeof(RICsubscriptionResponse_IEs_t)); 
-      if(ricSubscriptionRsp->protocolIEs.list.array[idx] == NULLP)
-      {  
-         DU_FREE(ricSubscriptionRsp->protocolIEs.list.array,\
-                   ricSubscriptionRsp->protocolIEs.list.size);
-         DU_FREE(e2apRicMsg->choice.successfulOutcome, \
-               sizeof(SuccessfulOutcomeE2_t));
-         DU_FREE(e2apRicMsg, sizeof(E2AP_PDU_t));
-         RETVALUE(RFAILED);
-      }    
-   }
-   idx = 0;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICrequestID;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
-            RICsubscriptionRequest_IEs__value_PR_RICrequestID;
-   BuildRicRequestId(&ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RICrequestID);
-   
-   idx++;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RANfunctionID;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
-                                    RICsubscriptionRequest_IEs__value_PR_RANfunctionID;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RANfunctionID = 1;
-
-   idx++;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICactions_Admitted;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricSubscriptionRsp->protocolIEs.list.array[idx]->value.present =\
-                               RICsubscriptionResponse_IEs__value_PR_RICaction_Admitted_List;
-   BuildRicAdmitList(&ricSubscriptionRsp->protocolIEs.list.array[idx]->value.choice.RICaction_Admitted_List);
-
-
-   /* Prints the Msg formed */
-   xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apRicMsg);
-
-   cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
-   encBufSize = 0;
-   encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apRicMsg, PrepFinalEncBuf,\
-               encBuf);
-   if(encRetVal.encoded == ENCODE_FAIL)
-   {
-          DU_LOG("\nE2AP : Could not encode RIC Subscription Response structure (at %s)\n",\
-                          encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-          RETVALUE(RFAILED);
-   }
-   else
-   {
-           DU_LOG("\nE2AP : Created APER encoded buffer for RIC subscription response \n");
-          for(int i=0; i< encBufSize; i++)
-          {
-                  printf("%x",encBuf[i]);
-          } 
    }
+   FreeRicSubscriptionRsp(e2apRicMsg);
+
+   return ret;
+}
 
-   if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+/******************************************************************
+ *
+ * @brief Deallocation of memory allocated bu aper decoder for e2 setup response
+ *
+ * @details
+ *
+ *    Function : freeAperDecodingOfE2SetupRsp
+ *
+ *    Functionality: Deallocation of memory allocated bu aper decoder for e2
+ *    setup response
+ *
+ * @params[in] E2setupResponse_t *e2SetRspMsg;
+ * @return void
+ *
+ * ****************************************************************/
+void freeAperDecodingOfE2SetupRsp(E2setupResponse_t *e2SetRspMsg)
+{
+   uint8_t arrIdx, e2NodeConfigAddAckListIdx;
+   E2nodeComponentConfigAdditionAck_ItemIEs_t *e2NodeAddAckItem;
+   E2nodeComponentConfigAdditionAck_List_t *e2NodeConfigAddAckList;
+
+   if(e2SetRspMsg)
    {
-      DU_LOG("\nE2AP : Sending RIC Subscription Response failed");      
-      RETVALUE(RFAILED);
+      if(e2SetRspMsg->protocolIEs.list.array)
+      {
+         for(arrIdx=0; arrIdx<e2SetRspMsg->protocolIEs.list.count; arrIdx++)
+         {
+            if(e2SetRspMsg->protocolIEs.list.array[arrIdx])
+            {
+               switch(e2SetRspMsg->protocolIEs.list.array[arrIdx]->id)
+               {
+                  case ProtocolIE_IDE2_id_TransactionID:
+                     break;
+
+                  case ProtocolIE_IDE2_id_GlobalRIC_ID:
+                     {
+                        free(e2SetRspMsg->protocolIEs.list.array[arrIdx]->value.choice.GlobalRIC_ID.pLMN_Identity.buf);
+                        free(e2SetRspMsg->protocolIEs.list.array[arrIdx]->value.choice.GlobalRIC_ID.ric_ID.buf);
+                        break;
+                     }
+
+                  case ProtocolIE_IDE2_id_E2nodeComponentConfigAdditionAck:
+                     {
+                        e2NodeConfigAddAckList = &e2SetRspMsg->protocolIEs.list.array[arrIdx]->value.choice.E2nodeComponentConfigAdditionAck_List;
+                        if(e2NodeConfigAddAckList->list.array )
+                        {
+                           for(e2NodeConfigAddAckListIdx = 0; e2NodeConfigAddAckListIdx< e2NodeConfigAddAckList->list.count; e2NodeConfigAddAckListIdx++)
+                           {
+                              if(e2NodeConfigAddAckList->list.array[e2NodeConfigAddAckListIdx])
+                              {
+                                 e2NodeAddAckItem = (E2nodeComponentConfigAdditionAck_ItemIEs_t*) e2NodeConfigAddAckList->list.array[e2NodeConfigAddAckListIdx];
+                                 free(e2NodeAddAckItem->value.choice.E2nodeComponentConfigAdditionAck_Item.e2nodeComponentID.choice.\
+                                       e2nodeComponentInterfaceTypeF1->gNB_DU_ID.buf);
+                                 free(e2NodeAddAckItem->value.choice.E2nodeComponentConfigAdditionAck_Item.e2nodeComponentID.choice.\
+                                       e2nodeComponentInterfaceTypeF1);
+                                 free(e2NodeConfigAddAckList->list.array[e2NodeConfigAddAckListIdx]);
+                              }
+                           }
+                           free(e2NodeConfigAddAckList->list.array);
+                        }
+                        break;
+                     }
+               }
+               free(e2SetRspMsg->protocolIEs.list.array[arrIdx]);  
+            }
+         }
+         free(e2SetRspMsg->protocolIEs.list.array);
+      }
    }
-   
-   RETVALUE(ROK);
 }
 /******************************************************************
-*
-* @brief Processes E2 Setup Response sent by RIC
-*
-* @details
-*
-*    Function : procE2SetupRsp
-*
-*    Functionality: Processes E2 Setup Response sent by RIC
-*
-* @params[in] E2AP_PDU_t ASN decoded E2AP message
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-S16 procE2SetupRsp(E2AP_PDU_t *e2apMsg)
+ *
+ * @brief Processes E2 Setup Response sent by RIC
+ *
+ * @details
+ *
+ *    Function : procE2SetupRsp
+ *
+ *    Functionality: Processes E2 Setup Response sent by RIC
+ *
+ * @params[in] E2AP_PDU_t ASN decoded E2AP message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t procE2SetupRsp(E2AP_PDU_t *e2apMsg)
 {
+   uint8_t arrIdx =0; 
+   uint32_t recvBufLen;             
    E2setupResponse_t *e2SetRspMsg;
-   E2apMsgDb e2SetupRspDb;
-   U8 idx; 
 
-   DU_LOG("\nE2AP : E2 Setup Response received"); 
+   DU_LOG("\nINFO   -->  E2AP : E2 Setup Response received"); 
    duCb.e2Status = TRUE; //Set E2 status as true
    e2SetRspMsg = &e2apMsg->choice.successfulOutcome->value.choice.E2setupResponse;
 
-   for(idx=0; idx<e2SetRspMsg->protocolIEs.list.count; idx++)
+   for(arrIdx=0; arrIdx<e2SetRspMsg->protocolIEs.list.count; arrIdx++)
    {
-      switch(e2SetRspMsg->protocolIEs.list.array[idx]->id)
+      switch(e2SetRspMsg->protocolIEs.list.array[arrIdx]->id)
       {
-         case ProtocolIE_IDE2_id_GlobalRIC_ID:
-         {
-            /* To store the Ric Id Params */
-            U32 recvBufLen;             
-            memset(&e2SetupRspDb.plmn, 0, sizeof(PLMN_IdentityE2_t));
-
-            recvBufLen = sizeof(e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.pLMN_Identity);
+         case ProtocolIE_IDE2_id_TransactionID:
+            break;
 
-            bitStringToInt(&e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.ric_ID, &e2SetupRspDb.ricId);
-            
-            aper_decode(0, &asn_DEF_PLMN_IdentityE2, (void **)&e2SetupRspDb.plmn, &e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.pLMN_Identity, recvBufLen, 0, 0);
-            //xer_fprint(stdout, &asn_DEF_PLMN_IdentityE2, &e2SetupRspDb.plmn);
+         case ProtocolIE_IDE2_id_GlobalRIC_ID:
+            {
+               /* To store the Ric Id Params */
+               recvBufLen = sizeof(e2SetRspMsg->protocolIEs.list.array[arrIdx]->value\
+                     .choice.GlobalRIC_ID.pLMN_Identity.size);
+               e2apMsgDb.plmn = NULLP;
+               DU_ALLOC(e2apMsgDb.plmn, recvBufLen);
+               if(e2apMsgDb.plmn)
+               {
+                  memcpy(e2apMsgDb.plmn, e2SetRspMsg->protocolIEs.list.array[arrIdx]\
+                        ->value.choice.GlobalRIC_ID.pLMN_Identity.buf, recvBufLen);
+               }
+               bitStringToInt(&e2SetRspMsg->protocolIEs.list.array[arrIdx]->value.choice.GlobalRIC_ID.ric_ID, &e2apMsgDb.ricId);
+               /*TODO : e2apMsgDb.plmn memory to be deallocated after the usage */
+               break;
+            }
 
+         case ProtocolIE_IDE2_id_E2nodeComponentConfigAdditionAck:
             break;
-         }
+
          default:
-            DU_LOG("\nE2AP : Invalid IE received in E2SetupRsp:%ld",
-                  e2SetRspMsg->protocolIEs.list.array[idx]->id);
+            DU_LOG("\nERROR  -->  E2AP : Invalid IE received in E2SetupRsp:%ld",
+                  e2SetRspMsg->protocolIEs.list.array[arrIdx]->id);
             break;
       }
    }
-   RETVALUE(ROK);
+   freeAperDecodingOfE2SetupRsp(e2SetRspMsg);
+   return ROK;
 }
 
 /******************************************************************
-*
-* @brief Processes RIC Subscription Req sent by RIC
-*
-* @details
-*
-*    Function : procRicSubsReq
-*
-*    Functionality: Processes E2 Setup Response sent by CU
-*
-* @params[in] E2AP_PDU_t ASN decoded E2AP message
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-
-S16 procRicSubsReq(E2AP_PDU_t *e2apMsg)
+ *
+ * @brief Processes RIC Subscription Req sent by RIC
+ *
+ * @details
+ *
+ *    Function : procRicSubsReq
+ *
+ *    Functionality: Processes E2 Setup Response sent by CU
+ *
+ * @params[in] E2AP_PDU_t ASN decoded E2AP message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
 {
-   S16 ret = ROK;
-   U8 idx; 
-   U8 ied; 
+   uint8_t idx; 
+   uint8_t ied; 
+   uint8_t ret = ROK;
+   uint32_t recvBufLen;             
    RICsubscriptionRequest_t *ricSubsReq;
    RICaction_ToBeSetup_ItemIEs_t *actionItem;
-   E2apMsgDb ricReqDb;
-  
-   DU_LOG("\nE2AP : Ric Subscription request received"); 
+
+   DU_LOG("\nINFO   -->  E2AP : RIC Subscription request received"); 
    ricSubsReq = &e2apMsg->choice.initiatingMessage->value.choice.RICsubscriptionRequest;
 
    for(idx=0; idx<ricSubsReq->protocolIEs.list.count; idx++)
    {
-      switch(ricSubsReq->protocolIEs.list.array[idx]->id)
+      if(ricSubsReq->protocolIEs.list.array[idx])
       {
-         case ProtocolIE_IDE2_id_RICrequestID:
-         {
-            ricReqDb.ricReqId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricRequestorID;
-            ricReqDb.ricInstanceId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricInstanceID;
-            break;
-         }
-         case ProtocolIE_IDE2_id_RANfunctionID:
-         {
-            ricReqDb.ranFuncId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RANfunctionID; 
-            break;
-         }
-         case ProtocolIE_IDE2_id_RICsubscriptionDetails:
-         {
-            U32 recvBufLen;             
-            memset(&ricReqDb.ricEventTrigger, 0, sizeof(RICeventTriggerDefinition_t));
-
-            recvBufLen = sizeof(ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricEventTriggerDefinition);
-
-            aper_decode(0, &asn_DEF_RICeventTriggerDefinition, (void **)&ricReqDb.ricEventTrigger, &(ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricEventTriggerDefinition), recvBufLen, 0, 0);
-            //xer_fprint(stdout, &asn_DEF_RICeventTriggerDefinition, &ricReqDb.ricEventTrigger);
-
-            actionItem = *ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricAction_ToBeSetup_List.list.array;
-            
-            for(ied = 0; ied < ricSubsReq->protocolIEs.list.array[idx]->value.choice.\
-                                RICsubscriptionDetails.ricAction_ToBeSetup_List.list.count; ied++)
-            {
-               switch(actionItem->id)
-               {
-                  case ProtocolIE_IDE2_id_RICaction_ToBeSetup_Item:
-                  {
-                     ricReqDb.ricActionId = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionID;
-                     ricReqDb.ricActionType = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionType;
-                     break;
-                  }
-                  default:
-                     DU_LOG("\nE2AP : Invalid IE received in RicSetupLst:%ld",actionItem->id);
-                  break;
-               }
-            }
-            break;
-         }
-
-         default:
-            DU_LOG("\nE2AP : Invalid IE received in Ric SubsReq:%ld",
-                  ricSubsReq->protocolIEs.list.array[idx]->id);
-            break;
+        switch(ricSubsReq->protocolIEs.list.array[idx]->id)
+        {
+           case ProtocolIE_IDE2_id_RICrequestID:
+              {
+                 e2apMsgDb.ricReqId = ricSubsReq->protocolIEs.list.array[idx]->\
+                                      value.choice.RICrequestID.ricRequestorID;
+                 e2apMsgDb.ricInstanceId = ricSubsReq->protocolIEs.list.array[idx]-> \
+                                           value.choice.RICrequestID.ricInstanceID;
+                 break;
+              }
+           case ProtocolIE_IDE2_id_RANfunctionID:
+              {
+                 e2apMsgDb.ranFuncId = ricSubsReq->protocolIEs.list.array[idx]-> \
+                                       value.choice.RANfunctionID; 
+                 break;
+              }
+           case ProtocolIE_IDE2_id_RICsubscriptionDetails:
+              {
+                 recvBufLen = sizeof(ricSubsReq->protocolIEs.list.array[idx]->value\
+                       .choice.RICsubscriptionDetails.ricEventTriggerDefinition.size);
+                 e2apMsgDb.ricEventTrigger = NULLP;
+                 DU_ALLOC(e2apMsgDb.ricEventTrigger, recvBufLen);
+                 /*TODO : e2apMsgDb.ricEventTrigger memory to be deallocated after the usage */
+                 if(e2apMsgDb.ricEventTrigger)
+                 {
+                    memcpy(e2apMsgDb.ricEventTrigger, ricSubsReq->protocolIEs.list.array[idx]\
+                          ->value.choice.RICsubscriptionDetails.ricEventTriggerDefinition.buf, \
+                          recvBufLen);
+                    free(ricSubsReq->protocolIEs.list.array[idx]->value.choice.\
+                          RICsubscriptionDetails.ricEventTriggerDefinition.buf);
+                 }
+                 if(ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricAction_ToBeSetup_List.\
+                       list.array)
+                 {
+                    actionItem =(RICaction_ToBeSetup_ItemIEs_t *)ricSubsReq->protocolIEs.list\
+                                .array[idx]->value.choice.RICsubscriptionDetails.ricAction_ToBeSetup_List\
+                                .list.array[0];
+
+                    for(ied = 0; ied < ricSubsReq->protocolIEs.list.array[idx]->value.choice.\
+                          RICsubscriptionDetails.ricAction_ToBeSetup_List.list.count; ied++)
+                    {
+                       switch(actionItem->id)
+                       {
+                          case ProtocolIE_IDE2_id_RICaction_ToBeSetup_Item:
+                             {
+                                e2apMsgDb.ricActionId = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionID;
+                                e2apMsgDb.ricActionType = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionType;
+                                break;
+                             }
+                          default:
+                             DU_LOG("\nERROR  -->  E2AP : Invalid IE received in RicSetupLst:%ld",actionItem->id);
+                             break;
+                       }
+                       free(actionItem);
+                    }
+                    free(ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricAction_ToBeSetup_List.\
+                    list.array);
+                 }
+                 break;
+              }
+
+           default:
+              DU_LOG("\nERROR  -->  E2AP : Invalid IE received in RIC SubsReq:%ld",
+                    ricSubsReq->protocolIEs.list.array[idx]->id);
+              break;
+        }
+        free(ricSubsReq->protocolIEs.list.array[idx]);
       }
    }
+   free(ricSubsReq->protocolIEs.list.array);
    ret = BuildAndSendRicSubscriptionRsp();
 
-   RETVALUE(ret);
+   return ret;
 }
 
-
 /*******************************************************************
  *
- * @brief Builds and Send the RicIndication Message
+ * @brief Free the RicIndication Message
  *
  * @details
  *
- *    Function : BuildAndSendRicIndication
+ *    Function : FreeRicIndication
  *
- * Functionality:Fills the RicIndication Message
+ * Functionality: Free the RicIndication Message
  *
- * @return ROK     - success
- *         RFAILED - failure
+ * @return void
+ *         
  *
  ******************************************************************/
-
-S16 BuildAndSendRicIndication()
+void FreeRicIndication(E2AP_PDU_t  *e2apMsg) 
 {
-   E2AP_PDU_t                 *e2apMsg = NULLP;
-   RICindication_t            *ricIndicationMsg;
-   E2apMsgDb                   e2apMsgDb;
-   U8   elementCnt;
-   U8   idx;
-   U8   ieId;
-   S16  ret; 
-   asn_enc_rval_t             encRetVal;        /* Encoder return value */
-
-   DU_LOG("\nE2AP : Building Ric Indication Message\n");
+   uint8_t idx=0;
+   RICindication_t *ricIndicationMsg= NULLP;
 
-   DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
-   if(e2apMsg == NULLP)
-   {
-      DU_LOG("\nE2AP : Memory allocation for E2AP-PDU failed");
-      RETVALUE(RFAILED);
-   }
 
-   e2apMsg->present = E2AP_PDU_PR_initiatingMessage;
-   DU_ALLOC(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
-   if(e2apMsg->choice.initiatingMessage == NULLP)
+   if(e2apMsg != NULLP)
    {
-      DU_LOG("\nE2AP : Memory allocation for E2AP-PDU failed");
+      if(e2apMsg->choice.initiatingMessage != NULLP)
+      {
+        ricIndicationMsg = &e2apMsg->choice.initiatingMessage->value.choice.RICindication;
+        if(ricIndicationMsg!= NULLP)
+        {
+           if(ricIndicationMsg->protocolIEs.list.array != NULLP)
+           {
+              for(idx=0; idx<ricIndicationMsg->protocolIEs.list.count; idx++)
+              {
+                 if(ricIndicationMsg->protocolIEs.list.array[idx] != NULLP)
+                 {
+                    switch(ricIndicationMsg->protocolIEs.list.array[idx]->id)
+                    {
+                       case ProtocolIE_IDE2_id_RICrequestID:
+                          break;
+
+                       case ProtocolIE_IDE2_id_RANfunctionID:
+                          break;
+
+                       case ProtocolIE_IDE2_id_RICactionID:
+                          break;
+
+                       case ProtocolIE_IDE2_id_RICindicationType:
+                          break;
+
+                       case ProtocolIE_IDE2_id_RICindicationHeader:
+                          {
+                             DU_FREE(ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader.buf,\
+                                   ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader.size);
+                             break;
+                          }
+                       case ProtocolIE_IDE2_id_RICindicationMessage:
+                          {
+                             DU_FREE(ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage.buf,\
+                                   ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage.size);
+                             break;
+                          }
+                       default:
+                          break;
+                    }
+                    DU_FREE(ricIndicationMsg->protocolIEs.list.array[idx],sizeof(RICindication_IEs_t));
+                 }
+              }
+              DU_FREE(ricIndicationMsg->protocolIEs.list.array,ricIndicationMsg->protocolIEs.list.size);
+           }
+        }
+        DU_FREE(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
+      }
       DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
-      RETVALUE(RFAILED);
    }
-   e2apMsg->choice.initiatingMessage->procedureCode = ProcedureCodeE2_id_RICindication;
-   e2apMsg->choice.initiatingMessage->criticality = CriticalityE2_reject;
-   e2apMsg->choice.initiatingMessage->value.present = InitiatingMessageE2__value_PR_RICindication;
-   
-   DU_ALLOC(ricIndicationMsg, sizeof(RICindication_t));
-   ricIndicationMsg = &e2apMsg->choice.initiatingMessage->value.choice.RICindication;
-   
+}
+/*******************************************************************
+ *
+ * brief Fill the RicIndication Message
+ *
+ * @details
+ *
+ *    Function : FillRicIndication
+ *
+ * Functionality:Fills the RicIndication Message
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ******************************************************************/
+uint8_t FillRicIndication(RICindication_t *ricIndicationMsg)
+{
+   uint8_t elementCnt=0;
+   uint8_t idx=0;
+   uint8_t ret = ROK;
    elementCnt = 6;
-   
+
    ricIndicationMsg->protocolIEs.list.count = elementCnt;
    ricIndicationMsg->protocolIEs.list.size  = elementCnt * sizeof(RICindication_t);
-
    /* Initialize the Ric Indication members */
    DU_ALLOC(ricIndicationMsg->protocolIEs.list.array, \
-            ricIndicationMsg->protocolIEs.list.size);
+        ricIndicationMsg->protocolIEs.list.size);
    if(ricIndicationMsg->protocolIEs.list.array == NULLP)
    {
-      DU_LOG("\nE2AP : Memory allocation for RICindicationIEs failed");
-      DU_FREE(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
-      DU_FREE(e2apMsg, (Size)sizeof(E2AP_PDU_t));
-      RETVALUE(RFAILED);
+      DU_LOG("\nERROR  -->  E2AP : Memory allocation for RICindicationIEs failed");
+      ret = RFAILED;
    }
-   
-   for(idx=0; idx<elementCnt; idx++)
+   else
    {
-      DU_ALLOC(ricIndicationMsg->protocolIEs.list.array[idx],\
-            sizeof(RICindication_IEs_t));
-      if(ricIndicationMsg->protocolIEs.list.array[idx] == NULLP)
+      for(idx=0; idx<elementCnt; idx++)
       {
-         for(ieId=0; ieId<idx; ieId++)
-         {
-            DU_FREE(ricIndicationMsg->protocolIEs.list.array[ieId],\
-                  sizeof(RICindication_IEs_t));
-         }
-         DU_FREE(ricIndicationMsg->protocolIEs.list.array,\
-                 ricIndicationMsg->protocolIEs.list.size);
-         DU_FREE(e2apMsg->choice.initiatingMessage, \
-               sizeof(InitiatingMessageE2_t));
-         DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
-         RETVALUE(RFAILED);
+        DU_ALLOC(ricIndicationMsg->protocolIEs.list.array[idx],\
+              sizeof(RICindication_IEs_t));
+        if(ricIndicationMsg->protocolIEs.list.array[idx] == NULLP)
+        {
+           DU_LOG("\nERROR  -->  E2AP : Memory allocation for RICindicationIEs failed");
+           ret = RFAILED;
+        }
+      }
+      if(ret != RFAILED)
+      {
+        idx = 0;
+
+        ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICrequestID;
+        ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
+                                                                       RICindication_IEs__value_PR_RICrequestID;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricRequestorID =\
+                                                                                                 e2apMsgDb.ricReqId;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricInstanceID =\
+                                                                                                e2apMsgDb.ricInstanceId;
+
+        idx++;
+        ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RANfunctionID;
+        ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
+                                                                       RICindication_IEs__value_PR_RANfunctionID;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RANfunctionID =
+           e2apMsgDb.ranFuncId;
+
+        idx++;
+        ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICactionID;
+        ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
+                                                                       RICindication_IEs__value_PR_RICactionID;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICactionID =
+           e2apMsgDb.ricActionId;
+
+        idx++;
+        ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICindicationType;
+        ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
+                                                                       RICindication_IEs__value_PR_RICindicationType;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationType =
+           e2apMsgDb.ricActionType;
+
+        idx++;
+        ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICindicationHeader;
+        ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
+                                                                       RICindication_IEs__value_PR_RICindicationHeader;
+        ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader.size = 3 *
+           sizeof(uint8_t);
+        DU_ALLOC(ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader.buf ,\
+              ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader.size);
+        if(ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader.buf == NULLP)
+        {
+           DU_LOG("\nERROR  -->  E2AP : Memory allocation for RICindicationIEs failed");
+           ret = RFAILED;
+        }
+        else
+        {
+           buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn, \
+                 ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader.buf);
+           idx++;
+           /* TO BE CHANGED: RIC INDICATION DATA */
+           /* For now filling a dummy octect data, need to tested with PRBs*/
+           ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICindicationMessage;
+           ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
+           ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
+                                                                          RICindication_IEs__value_PR_RICindicationMessage;
+           ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage.size = 3 *
+              sizeof(uint8_t);
+           DU_ALLOC(ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage.buf ,\
+                 ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage.size);
+           if(ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage.buf == NULLP)
+           {
+              DU_LOG("\nERROR  -->  E2AP : Memory allocation for RICindicationIEs failed");
+              ret = RFAILED;
+           }
+           else
+           {
+              buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn, \
+                    ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage.buf);
+           }
+        }
       }
    }
-   idx = 0;
-   ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICrequestID;
-   ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
-                                    RICindication_IEs__value_PR_RICrequestID;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricRequestorID = e2apMsgDb.ricReqId;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricInstanceID = e2apMsgDb.ricInstanceId;
-
-   idx++;
-   ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RANfunctionID;
-   ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
-                                   RICindication_IEs__value_PR_RANfunctionID;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RANfunctionID = e2apMsgDb.ranFuncId;
-
-   idx++;
-   ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICactionID;
-   ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
-                                   RICindication_IEs__value_PR_RICactionID;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICactionID = e2apMsgDb.ricActionId;
-
-
-   idx++;
-   ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICindicationType;
-   ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
-                                   RICindication_IEs__value_PR_RICindicationType;
-
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationType = e2apMsgDb.ricActionType;
-
-
-   idx++;
-   ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICindicationHeader;
-   ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
-                                   RICindication_IEs__value_PR_RICindicationHeader;
-   BuildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn, \
-                &ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationHeader);
-
-   /* TO BE CHANGED: RIC INDICATION DATA */
-   /* Foe now filling a dummy octect data, need to tested with PRBs*/ 
-   idx++;
-   ricIndicationMsg->protocolIEs.list.array[idx]->id = ProtocolIE_IDE2_id_RICindicationMessage;
-   ricIndicationMsg->protocolIEs.list.array[idx]->criticality = CriticalityE2_reject;
-   ricIndicationMsg->protocolIEs.list.array[idx]->value.present = \
-                                  RICindication_IEs__value_PR_RICindicationMessage;
-   BuildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn, \
-                &ricIndicationMsg->protocolIEs.list.array[idx]->value.choice.RICindicationMessage);
-  
-   /* Prints the Msg formed */
-   xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
+   return ret;
+}
 
-   cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
-   encBufSize = 0;
-   encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\
-               encBuf);
-   if(encRetVal.encoded == ENCODE_FAIL)
-   {
-          DU_LOG("\nE2AP : Could not encode RIC Indication Message (at %s)\n",\
-                          encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-          RETVALUE(RFAILED);
-   }
-   else
-   {
-           DU_LOG("\nE2AP : Created APER encoded buffer for RIC Indication Message \n");
-          for(int i=0; i< encBufSize; i++)
-          {
-                  printf("%x",encBuf[i]);
-          } 
-   }
+/*******************************************************************
+ *
+ * @brief Builds and Send the RicIndication Message
+ *
+ * @details
+ *
+ *    Function : BuildAndSendRicIndication
+ *
+ * Functionality:Fills the RicIndication Message
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ******************************************************************/
 
-   if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+uint8_t BuildAndSendRicIndication()
+{
+   E2AP_PDU_t                 *e2apMsg = NULLP;
+   RICindication_t            *ricIndicationMsg=NULLP;
+   asn_enc_rval_t             encRetVal;        /* Encoder return value */
+   uint8_t ret = RFAILED; 
+   uint8_t FillRicIndicationret = ROK;
+
+   while(true)
    {
-      DU_LOG("\nE2AP : Sending RIC Indication Message");      
-      RETVALUE(RFAILED);
+      DU_LOG("\nINFO   -->  E2AP : Building RIC Indication Message\n");
+
+      DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
+      if(e2apMsg == NULLP)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
+        break;
+      }
+
+      e2apMsg->present = E2AP_PDU_PR_initiatingMessage;
+      DU_ALLOC(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
+      if(e2apMsg->choice.initiatingMessage == NULLP)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Memory allocation for E2AP-PDU failed");
+        break;
+      }
+      e2apMsg->choice.initiatingMessage->procedureCode = ProcedureCodeE2_id_RICindication;
+      e2apMsg->choice.initiatingMessage->criticality = CriticalityE2_reject;
+      e2apMsg->choice.initiatingMessage->value.present = InitiatingMessageE2__value_PR_RICindication;
+
+      ricIndicationMsg = &e2apMsg->choice.initiatingMessage->value.choice.RICindication;
+
+      FillRicIndicationret = FillRicIndication(ricIndicationMsg);
+      if(FillRicIndicationret != ROK)
+      {
+        break;
+      }
+      /* Prints the Msg formed */
+      xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\
+           encBuf);
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+        DU_LOG("\nERROR  -->  E2AP : Could not encode RIC Indication Message (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\nDEBUG  -->  E2AP : Created APER encoded buffer for RIC Indication Message \n");
+        for(int i=0; i< encBufSize; i++)
+        {
+           printf("%x",encBuf[i]);
+        } 
+      }
+
+      if(SendE2APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      {
+        DU_LOG("\nINFO   -->  E2AP : Sending RIC Indication Message");      
+
+      }
+      ret = ROK;
+      break;
    }
-   RETVALUE(ROK);
+   FreeRicIndication(e2apMsg); 
+   return ret;
 }
 
 /*******************************************************************
-*
-* @brief Sends E2 msg over SCTP
-*
-* @details
-*
-*    Function : SendE2APMsg
-*
-*    Functionality: Sends E2 msg over SCTP
-*
-* @params[in] Region region
-*             Pool pool
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-
-S16 SendE2APMsg(Region region, Pool pool)
+ *
+ * @brief Sends E2 msg over SCTP
+ *
+ * @details
+ *
+ *    Function : SendE2APMsg
+ *
+ *    Functionality: Sends E2 msg over SCTP
+ *
+ * @params[in] Region region
+ *             Pool pool
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t SendE2APMsg(Region region, Pool pool)
 {
-   Buffer *mBuf;
+   Buffer *mBuf=NULLP;
 
-   if(SGetMsg(region, pool, &mBuf) == ROK)
+   if(ODU_GET_MSG_BUF(region, pool, &mBuf) == ROK)
    {
-      if(SAddPstMsgMult((Data *)encBuf, encBufSize, mBuf) == ROK)
+      if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK)
       {
-         SPrntMsg(mBuf, 0,0);
-         if(sctpSend(mBuf, E2_INTERFACE) != ROK)
-         {
-            DU_LOG("\nE2AP : SCTP Send for E2  failed");
-            SPutMsg(mBuf);
-            RETVALUE(RFAILED);
-         }
+        ODU_PRINT_MSG(mBuf, 0,0);
+
+        if(sctpSend(mBuf, E2_INTERFACE) != ROK)
+        {
+           DU_LOG("\nERROR  -->  E2AP : SCTP Send for E2  failed");
+           ODU_PUT_MSG_BUF(mBuf);
+           return RFAILED;
+        }
       }
       else
       {
-         DU_LOG("\nE2AP : SAddPstMsgMult failed");
-         SPutMsg(mBuf);
-         RETVALUE(RFAILED);
+        DU_LOG("\nERROR  -->  E2AP : ODU_ADD_POST_MSG_MULT failed");
+        ODU_PUT_MSG_BUF(mBuf);
+        return RFAILED;
       }
-      SPutMsg(mBuf);
+      ODU_PUT_MSG_BUF(mBuf);
    }
    else
    {
-      DU_LOG("\nE2AP : Failed to allocate memory");
-      RETVALUE(RFAILED);
+      DU_LOG("\nERROR  -->  E2AP : Failed to allocate memory");
+      return RFAILED;
    }
-   RETVALUE(ROK);
+
+   return ROK;
 } /* SendE2APMsg */
 
 /*******************************************************************
-*
-* @brief Handles received E2AP message and sends back response  
-*
-* @details
-*
-*    Function : E2APMsgHdlr
-*
-*    Functionality:
-*         - Decodes received E2AP control message
-*         - Prepares response message, encodes and sends to SCTP
-*
-* @params[in] 
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Handles received E2AP message and sends back response  
+ *
+ * @details
+ *
+ *    Function : E2APMsgHdlr
+ *
+ *    Functionality:
+ *         - Decodes received E2AP control message
+ *         - Prepares response message, encodes and sends to SCTP
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 void E2APMsgHdlr(Buffer *mBuf)
 {
-   int i;
-   char *recvBuf;
-   MsgLen copyCnt;
-   MsgLen recvBufLen;
-   E2AP_PDU_t *e2apMsg;
-   asn_dec_rval_t rval; /* Decoder return value */
-   E2AP_PDU_t e2apasnmsg ;
-   DU_LOG("\nE2AP : Received E2AP message buffer");
-   SPrntMsg(mBuf, 0,0);
+   int i =0;
+   char *recvBuf = NULLP;
+   MsgLen copyCnt =0;
+   MsgLen recvBufLen =0;
+   E2AP_PDU_t *e2apMsg = NULLP;
+   asn_dec_rval_t rval ={0}; /* Decoder return value */
+   E2AP_PDU_t e2apasnmsg={0} ;
+
+   DU_LOG("\nDEBUG   -->  E2AP : Received E2AP message buffer");
+   ODU_PRINT_MSG(mBuf, 0,0);
+
    /* Copy mBuf into char array to decode it */
-   SFndLenMsg(mBuf, &recvBufLen);
-   if(SGetSBuf(DFLT_REGION, DFLT_POOL, (Data **)&recvBuf, (Size)recvBufLen) != ROK)
+   ODU_GET_MSG_LEN(mBuf, &recvBufLen);
+   DU_ALLOC(recvBuf, (Size)recvBufLen);
+
+   if(recvBuf == NULLP)
    {
-      DU_LOG("\nE2AP : Memory allocation failed");
+      DU_LOG("\nERROR  -->  E2AP : Memory allocation failed");
       return;
    }
-   if(SCpyMsgFix(mBuf, 0, recvBufLen, (Data *)recvBuf, &copyCnt) != ROK)
+   if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, &copyCnt) != ROK)
    {
-      DU_LOG("\nE2AP : Failed while copying %d", copyCnt);
+      DU_LOG("\nERROR  -->  E2AP : Failed while copying %d", copyCnt);
       return;
    }
 
-   printf("\nE2AP : Received flat buffer to be decoded : ");
+   printf("\nDEBUG   -->  E2AP : Received flat buffer to be decoded : ");
    for(i=0; i< recvBufLen; i++)
    {
-        printf("%x",recvBuf[i]);
+      printf("%x",recvBuf[i]);
    }
 
    /* Decoding flat buffer into E2AP messsage */
    e2apMsg = &e2apasnmsg;
    memset(e2apMsg, 0, sizeof(E2AP_PDU_t));
+
    rval = aper_decode(0, &asn_DEF_E2AP_PDU, (void **)&e2apMsg, recvBuf, recvBufLen, 0, 0);
-   SPutSBuf(DFLT_REGION, DFLT_POOL, (Data *)recvBuf, (Size)recvBufLen);
+   DU_FREE(recvBuf, (Size)recvBufLen);
+
    if(rval.code == RC_FAIL || rval.code == RC_WMORE)
    {
-      DU_LOG("\nE2AP : ASN decode failed");
+      DU_LOG("\nERROR  -->  E2AP : ASN decode failed");
       return;
    }
    printf("\n");
@@ -932,57 +1504,61 @@ void E2APMsgHdlr(Buffer *mBuf)
    switch(e2apMsg->present)
    {
       case E2AP_PDU_PR_successfulOutcome:
-      {
-         switch(e2apMsg->choice.successfulOutcome->value.present)
-         {
-            case SuccessfulOutcomeE2__value_PR_E2setupResponse:
-            {
-               if(!duCb.e2Status)
-               {
-                 DU_LOG("\nE2AP : Store E2 setup response Params");
-                 procE2SetupRsp(e2apMsg);
-               }
-              break;
-            }
-            default:
-            {
-               DU_LOG("\nE2AP : Invalid type of intiating message [%d]", e2apMsg->choice.initiatingMessage->value.present);
-               return;
-            }
-         }/* End of switch(successfulOutcome) */
-         break;
-      }
+        {
+           switch(e2apMsg->choice.successfulOutcome->value.present)
+           {
+              case SuccessfulOutcomeE2__value_PR_E2setupResponse:
+                 {
+                    if(!duCb.e2Status)
+                    {
+                       DU_LOG("\nDEBUG   -->  E2AP : Store E2 setup response Params");
+                       procE2SetupRsp(e2apMsg);
+                    }
+                    break;
+                 }
+              default:
+                 {
+                    DU_LOG("\nERROR  -->  E2AP : Invalid type of E2AP_PDU_PR_successfulOutcome  [%d]",\
+                    e2apMsg->choice.successfulOutcome->value.present);
+                    return;
+                 }
+           }/* End of switch(successfulOutcome) */
+           free(e2apMsg->choice.successfulOutcome);
+           break;
+        }
       case E2AP_PDU_PR_initiatingMessage:
-      {
-         switch(e2apMsg->choice.initiatingMessage->value.present)
-         {
-            case InitiatingMessageE2__value_PR_RICsubscriptionRequest: 
-            {
-               DU_LOG("\nE2AP : Calling RIC Subscription Response");
-              if(procRicSubsReq(e2apMsg) == ROK)
-               {
-                  BuildAndSendRicIndication();
-               }
-               break;
-            }
-            default:
-            {
-               DU_LOG("\nE2AP : Invalid type of successfulOutcome message [%d]", e2apMsg->choice.successfulOutcome->value.present);
-               return;
-            }
-         }/* End of switch(initiatingMessage) */
-         break;
-      }
+        {
+           switch(e2apMsg->choice.initiatingMessage->value.present)
+           {
+              case InitiatingMessageE2__value_PR_RICsubscriptionRequest: 
+                 {
+                    if(procRicSubsReq(e2apMsg) == ROK)
+                    {
+                       BuildAndSendRicIndication();
+                    }
+                    break;
+                 }
+              default:
+                 {
+                    DU_LOG("\nERROR  -->  E2AP : Invalid type of E2AP_PDU_PR_initiatingMessage [%d]",\
+                    e2apMsg->choice.initiatingMessage->value.present);
+                    return;
+                 }
+           }/* End of switch(initiatingMessage) */
+           free(e2apMsg->choice.initiatingMessage);
+           break;
+        }
       default:
-      {
-         DU_LOG("\nE2AP : Invalid type of e2apMsg->present [%d]",e2apMsg->present);
-         return;
-      }
+        {
+           DU_LOG("\nERROR  -->  E2AP : Invalid type of e2apMsg->present [%d]",e2apMsg->present);
+           return;
+        }
+        free(e2apMsg);
 
    }/* End of switch(e2apMsg->present) */
+
 } /* End of E2APMsgHdlr */
 
 /**********************************************************************
-         End of file
-**********************************************************************/
+  End of file
+ **********************************************************************/