valgrind memory leak fixes
[o-du/l2.git] / src / du_app / du_e2ap_msg_hdl.c
index d8f98ba..a25c8d8 100644 (file)
@@ -69,22 +69,22 @@ uint8_t BuildGlobalgNBId(GlobalE2node_gNB_ID_t *gNbId)
    else
    {
       buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn, \
-         gNbId->global_gNB_ID.plmn_id.buf);
+           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);
+           gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.size);
       if(gNbId->global_gNB_ID.gnb_id.choice.gnb_ID.buf == NULLP)
       {
-         DU_LOG("\nE2AP: Memory allocation failed for gnb buffer");
-         ret = RFAILED;
+        DU_LOG("\nE2AP: Memory allocation failed for gnb buffer");
+        ret = RFAILED;
       }
       else
       {
-         fillBitString(&gNbId->global_gNB_ID.gnb_id.choice.gnb_ID, unused, byteSize, val);
+        fillBitString(&gNbId->global_gNB_ID.gnb_id.choice.gnb_ID, unused, byteSize, val);
       }
    }
    return ret;
@@ -119,67 +119,67 @@ uint8_t fillE2SetupReq(E2setupRequest_t **e2SetupReq, uint8_t *idx)
       elementCnt = 1;
       (*e2SetupReq)->protocolIEs.list.count = elementCnt;
       (*e2SetupReq)->protocolIEs.list.size = \
-              elementCnt * sizeof(E2setupRequestIEs_t);
+                                            elementCnt * sizeof(E2setupRequestIEs_t);
 
       /* Initialize the E2Setup members */
       DU_ALLOC((*e2SetupReq)->protocolIEs.list.array, \
-               (*e2SetupReq)->protocolIEs.list.size);
+           (*e2SetupReq)->protocolIEs.list.size);
       if((*e2SetupReq)->protocolIEs.list.array == NULLP)
       {
-         DU_LOG("\nE2AP : Memory allocation failed for array elements");
-         ret = RFAILED;
+        DU_LOG("\nE2AP : Memory allocation failed for array elements");
+        ret = RFAILED;
       }
       else
       {
-         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("\nE2AP : Memory allocation failed for arrayidx [%d]", *idx);
-               ret = RFAILED;
-            }
-            else
-            {
-               /* GlobalE2node_gNB_ID */
-               (*e2SetupReq)->protocolIEs.list.array[idx2]->id = \
-                      ProtocolIE_IDE2_id_GlobalE2node_ID;
-               (*e2SetupReq)->protocolIEs.list.array[idx2]->criticality = \
-                            CriticalityE2_reject;
-               (*e2SetupReq)->protocolIEs.list.array[idx2]->value.present =\
-                             E2setupRequestIEs__value_PR_GlobalE2node_ID;
-               (*e2SetupReq)->protocolIEs.list.array[idx2]->value.choice.\
-                  GlobalE2node_ID.present = GlobalE2node_ID_PR_gNB;
-      
-               DU_ALLOC((*e2SetupReq)->protocolIEs.list.array[idx2]->value.choice.\
-                  GlobalE2node_ID.choice.gNB, sizeof(GlobalE2node_gNB_ID_t));
-               if((*e2SetupReq)->protocolIEs.list.array[idx2]->value.choice.\
-                  GlobalE2node_ID.choice.gNB == NULLP)
-               {
-                  DU_LOG("\nE2AP : Memory allocation failed for gNbId");
-                  ret = RFAILED;
-               }
-               else
-               {
-                  ret = BuildGlobalgNBId((*e2SetupReq)->protocolIEs.list.array[idx2]->value.\
-                     choice.GlobalE2node_ID.choice.gNB);
-                  if(ret != ROK)
-                  {
-                     ret = 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("\nE2AP : Memory allocation failed for arrayidx [%d]", *idx);
+              ret = RFAILED;
+           }
+           else
+           {
+              /* GlobalE2node_gNB_ID */
+              (*e2SetupReq)->protocolIEs.list.array[idx2]->id = \
+                                                                ProtocolIE_IDE2_id_GlobalE2node_ID;
+              (*e2SetupReq)->protocolIEs.list.array[idx2]->criticality = \
+                                                                         CriticalityE2_reject;
+              (*e2SetupReq)->protocolIEs.list.array[idx2]->value.present =\
+                                                                          E2setupRequestIEs__value_PR_GlobalE2node_ID;
+              (*e2SetupReq)->protocolIEs.list.array[idx2]->value.choice.\
+                 GlobalE2node_ID.present = GlobalE2node_ID_PR_gNB;
+
+              DU_ALLOC((*e2SetupReq)->protocolIEs.list.array[idx2]->value.choice.\
+                    GlobalE2node_ID.choice.gNB, sizeof(GlobalE2node_gNB_ID_t));
+              if((*e2SetupReq)->protocolIEs.list.array[idx2]->value.choice.\
+                    GlobalE2node_ID.choice.gNB == NULLP)
+              {
+                 DU_LOG("\nE2AP : Memory allocation failed for gNbId");
+                 ret = RFAILED;
+              }
+              else
+              {
+                 ret = BuildGlobalgNBId((*e2SetupReq)->protocolIEs.list.array[idx2]->value.\
+                       choice.GlobalE2node_ID.choice.gNB);
+                 if(ret != ROK)
+                 {
+                    ret = RFAILED;
+                 }
+              }
+
+           }
+        }
       }
-    }
-    else
-    {
-       ret = RFAILED;
-       DU_LOG("\nE2AP : Passed e2SetupReq is NULL");
-    }
-    return ret;
+   }
+   else
+   {
+      ret = RFAILED;
+      DU_LOG("\nE2AP : Passed e2SetupReq is NULL");
+   }
+   return ret;
 }
 
 /*******************************************************************
@@ -211,27 +211,27 @@ uint8_t BuildAndSendE2SetupReq()
       DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
       if(e2apMsg == NULLP)
       {
-         DU_LOG("\nE2AP : Memory allocation for E2AP-PDU failed");
-         break;
+        DU_LOG("\nE2AP : 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("\nE2AP : Memory allocation for E2AP-PDU failed");
-         DU_FREE(e2apMsg, sizeof(E2AP_PDU_t));
-         return RFAILED;
+        DU_LOG("\nE2AP : 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;
-      
+
       ret = fillE2SetupReq(&e2SetupReq, &idx);
       if(ret != ROK)
       {
-         DU_LOG("\nE2AP : fillE2SetupReq() failed");
-         break;
+        DU_LOG("\nE2AP : fillE2SetupReq() failed");
+        break;
       }
       /* Prints the Msg formed */
       xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2apMsg);
@@ -239,27 +239,27 @@ uint8_t BuildAndSendE2SetupReq()
       memset(encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
       encRetVal = aper_encode(&asn_DEF_E2AP_PDU, 0, e2apMsg, PrepFinalEncBuf,\
-                      encBuf);
+           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");
-         break;
+        DU_LOG("\nE2AP : Could not encode E2SetupRequest structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
       }
       else
       {
-         DU_LOG("\nE2AP : Created APER encoded buffer for E2SetupRequest\n");
-         for(int i=0; i< encBufSize; i++)
-         {
-            printf("%x",encBuf[i]);
-         }
+        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("\nE2AP : Sending E2 Setup request failed");
+        DU_LOG("\nE2AP : Sending E2 Setup request failed");
       }
 
-    break;
+      break;
    }while(true);
 
    deAllocateE2SetupReqMsg(e2apMsg, e2SetupReq, idx);
@@ -284,7 +284,7 @@ uint8_t BuildAndSendE2SetupReq()
  * ****************************************************************/
 
 uint8_t deAllocateE2SetupReqMsg(E2AP_PDU_t *e2apMsg, \
-   E2setupRequest_t *e2SetupReq, uint8_t idx)
+      E2setupRequest_t *e2SetupReq, uint8_t idx)
 {
    uint8_t idx2;
    uint8_t ret = ROK;
@@ -293,49 +293,49 @@ uint8_t deAllocateE2SetupReqMsg(E2AP_PDU_t *e2apMsg, \
    {
       if(e2apMsg->choice.initiatingMessage != NULLP)
       {
-         if(e2SetupReq->protocolIEs.list.array != NULLP)
-         {
-            for(idx2 = 0; idx2 < idx; idx2++)
-            {
-               if(e2SetupReq->protocolIEs.list.array[idx2] != NULLP)
-               {
-                  switch(e2SetupReq->protocolIEs.list.array[idx2]->id)
-                  {
-                     case ProtocolIE_IDE2_id_GlobalE2node_ID:
-                     {
-                        if(e2SetupReq->protocolIEs.list.array[idx2]->\
-                             value.choice.GlobalE2node_ID.choice.gNB != NULLP)
-                        {
-                              GlobalE2node_gNB_ID_t *gNbId = NULLP;
-                              gNbId = e2SetupReq->protocolIEs.list.array[idx2]->\
-                                         value.choice.GlobalE2node_ID.choice.gNB;
-                              if(gNbId->global_gNB_ID.plmn_id.buf != NULLP)
-                              {
-                                 if(gNbId->global_gNB_ID.gnb_id.choice.gnb_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[idx2]->value.\
-                                choice.GlobalE2node_ID.choice.gNB, sizeof(GlobalE2node_gNB_ID_t));
-                        }
-                        DU_FREE(e2SetupReq->protocolIEs.list.array[idx2],\
-                            sizeof(E2setupRequestIEs_t));
-                        break;
-                     }
-                     default:
-                        DU_LOG("\n E2AP: Invalid event at e2SetupRequet %ld ",\
-                          (e2SetupReq->protocolIEs.list.array[idx2]->id));
-                        break;
-                  }
-               }
-            }
-            DU_FREE(e2SetupReq->protocolIEs.list.array, e2SetupReq->protocolIEs.list.size);
-         }
-         DU_FREE(e2apMsg->choice.initiatingMessage, sizeof(InitiatingMessageE2_t));
+        if(e2SetupReq->protocolIEs.list.array != NULLP)
+        {
+           for(idx2 = 0; idx2 < idx; idx2++)
+           {
+              if(e2SetupReq->protocolIEs.list.array[idx2] != NULLP)
+              {
+                 switch(e2SetupReq->protocolIEs.list.array[idx2]->id)
+                 {
+                    case ProtocolIE_IDE2_id_GlobalE2node_ID:
+                       {
+                          if(e2SetupReq->protocolIEs.list.array[idx2]->\
+                                value.choice.GlobalE2node_ID.choice.gNB != NULLP)
+                          {
+                             GlobalE2node_gNB_ID_t *gNbId = NULLP;
+                             gNbId = e2SetupReq->protocolIEs.list.array[idx2]->\
+                                     value.choice.GlobalE2node_ID.choice.gNB;
+                             if(gNbId->global_gNB_ID.plmn_id.buf != NULLP)
+                             {
+                                if(gNbId->global_gNB_ID.gnb_id.choice.gnb_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[idx2]->value.\
+                                   choice.GlobalE2node_ID.choice.gNB, sizeof(GlobalE2node_gNB_ID_t));
+                          }
+                          DU_FREE(e2SetupReq->protocolIEs.list.array[idx2],\
+                                sizeof(E2setupRequestIEs_t));
+                          break;
+                       }
+                    default:
+                       DU_LOG("\n E2AP: Invalid event at e2SetupRequet %ld ",\
+                             (e2SetupReq->protocolIEs.list.array[idx2]->id));
+                       break;
+                 }
+              }
+           }
+           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));
    }
@@ -359,15 +359,13 @@ uint8_t deAllocateE2SetupReqMsg(E2AP_PDU_t *e2apMsg, \
 
 uint8_t BuildRicRequestId(RICrequestID_t *ricReqId)
 {
-   if(ricReqId != NULLP)
+   if(ricReqId == NULLP)
    {
-      ricReqId->ricRequestorID = 1;
-      ricReqId->ricInstanceID  = 1;
+      return RFAILED;
    }
-       else
-       {
-          return RFAILED;
-       }
+
+   ricReqId->ricRequestorID = 1;
+   ricReqId->ricInstanceID  = 1;
    return ROK;
 }
 
@@ -397,10 +395,10 @@ uint8_t 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; 
    }
-       else
-       {
-          return RFAILED;
-       }
+   else
+   {
+      return RFAILED;
+   }
    return ROK;
 }
 /*******************************************************************
@@ -423,41 +421,41 @@ uint8_t BuildRicAdmitList(RICaction_Admitted_List_t *admitListPtr)
 {
    uint8_t idx ;
    uint8_t elementCnt;  
-       uint8_t ret= ROK;
+   uint8_t ret= ROK;
    elementCnt = 1;
 
    if(admitListPtr == NULLP)
-       {
-           DU_LOG("\nE2AP : Memory allocation for RIC Admit List failed");
-           ret = RFAILED;
-       }
+   {
+      DU_LOG("\nE2AP : Memory allocation for RIC Admit List failed");
+      ret = RFAILED;
+   }
    else
-       {
-          admitListPtr->list.count = elementCnt;
+   {
+      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("\nE2AP : Memory allocation for RIC Admit List failed");
-         ret = RFAILED;
+        DU_LOG("\nE2AP : 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]);
-         }
-               }
-       }       
+      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;
 }
 /*******************************************************************
@@ -478,67 +476,67 @@ uint8_t BuildRicAdmitList(RICaction_Admitted_List_t *admitListPtr)
  ******************************************************************/
 void FreeRicSubscriptionRsp(E2AP_PDU_t  *e2apRicMsg)
 {
-         RICsubscriptionResponse_t  *ricSubscriptionRsp= NULLP;
-     uint8_t idx=0;
-         uint8_t idx1=0;
-         RICaction_Admitted_List_t *admitListPtr;
-
-         if(e2apRicMsg != NULLP)
-         {
-            if(e2apRicMsg->choice.successfulOutcome != NULLP)
+   RICsubscriptionResponse_t  *ricSubscriptionRsp= NULLP;
+   uint8_t idx=0;
+   uint8_t idx1=0;
+   RICaction_Admitted_List_t *admitListPtr;
+
+   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)
                  {
-                    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));            
-         }
+                    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
  *
@@ -555,69 +553,69 @@ void FreeRicSubscriptionRsp(E2AP_PDU_t  *e2apRicMsg)
 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;
+   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);
+   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)
-       {
+        ricSubscriptionRsp->protocolIEs.list.size);
+   if(ricSubscriptionRsp->protocolIEs.list.array == NULLP)
+   {
       DU_LOG("\nE2AP : 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;
-                               }
-                       }
-               }
-       }       
+      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;
 }
 /*******************************************************************
@@ -643,89 +641,89 @@ uint8_t BuildAndSendRicSubscriptionRsp()
    asn_enc_rval_t     encRetVal; 
    uint8_t ret = RFAILED;
    uint8_t FillRicricSubscriptionRspret;
-       
+
    while(true)
    {
-        DU_LOG("\nE2AP : Building RIC Subscription Response\n");
-
-        DU_ALLOC(e2apRicMsg, sizeof(E2AP_PDU_t)); 
-        if(e2apRicMsg == NULLP)
-        {
-           DU_LOG("\nE2AP : 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("\nE2AP : Memory allocation for Ric subscription Response failed");
-             break;
-        }
-
-        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;
-
-                 FillRicricSubscriptionRspret = FillRicSubscriptionRsp(ricSubscriptionRsp);
-        if(FillRicricSubscriptionRspret != ROK)
-                 {
-                    DU_LOG("\nE2AP : Memory allocation for RICsubscriptionResponseIE failed");
-                    break;
-                 }
+      DU_LOG("\nE2AP : Building RIC Subscription Response\n");
 
-       /* 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("\nE2AP : Could not encode RIC Subscription Response structure (at %s)\n",\
-                          encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-                break;
-        }
-        else
-        {
-            DU_LOG("\nE2AP : 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("\nE2AP : Sending RIC Subscription Response failed");      
-            break;
-        }
-
-                 ret = ROK;
-                 break;
+      DU_ALLOC(e2apRicMsg, sizeof(E2AP_PDU_t)); 
+      if(e2apRicMsg == NULLP)
+      {
+        DU_LOG("\nE2AP : 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("\nE2AP : Memory allocation for Ric subscription Response failed");
+        break;
+      }
+
+      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;
+
+      FillRicricSubscriptionRspret = FillRicSubscriptionRsp(ricSubscriptionRsp);
+      if(FillRicricSubscriptionRspret != ROK)
+      {
+        DU_LOG("\nE2AP : 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("\nE2AP : Could not encode RIC Subscription Response structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      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)
+      {
+        DU_LOG("\nE2AP : Sending RIC Subscription Response failed");      
+        break;
+      }
+
+      ret = ROK;
+      break;
+
+   }
+   FreeRicSubscriptionRsp(e2apRicMsg);
+
+   return ret;
+}
 /******************************************************************
-*
-* @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
-*
-* ****************************************************************/
+ *
+ * @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 idx; 
@@ -740,46 +738,52 @@ uint8_t procE2SetupRsp(E2AP_PDU_t *e2apMsg)
    {
       switch(e2SetRspMsg->protocolIEs.list.array[idx]->id)
       {
-         case ProtocolIE_IDE2_id_GlobalRIC_ID:
-         {
-            /* To store the Ric Id Params */
-            recvBufLen = sizeof(e2SetRspMsg->protocolIEs.list.array[idx]->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[idx]\
-                                        ->value.choice.GlobalRIC_ID.pLMN_Identity.buf, recvBufLen);
-                               }
-            bitStringToInt(&e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.ric_ID, &e2apMsgDb.ricId);
-            /*TODO : e2apMsgDb.plmn memory to be deallocated after the usage */
-                          break;
-         }
-         default:
-            DU_LOG("\nE2AP : Invalid IE received in E2SetupRsp:%ld",
-                  e2SetRspMsg->protocolIEs.list.array[idx]->id);
-            break;
+        case ProtocolIE_IDE2_id_GlobalRIC_ID:
+           {
+              /* To store the Ric Id Params */
+              recvBufLen = sizeof(e2SetRspMsg->protocolIEs.list.array[idx]->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[idx]\
+                       ->value.choice.GlobalRIC_ID.pLMN_Identity.buf, recvBufLen);
+                 free(e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.\
+                       GlobalRIC_ID.pLMN_Identity.buf);
+              }
+              bitStringToInt(&e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.ric_ID, &e2apMsgDb.ricId);
+              free(e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.\
+                    GlobalRIC_ID.ric_ID.buf);
+              /*TODO : e2apMsgDb.plmn memory to be deallocated after the usage */
+              break;
+           }
+        default:
+           DU_LOG("\nE2AP : Invalid IE received in E2SetupRsp:%ld",
+                 e2SetRspMsg->protocolIEs.list.array[idx]->id);
+           break;
       }
+      free(e2SetRspMsg->protocolIEs.list.array[idx]);
    }
+   free(e2SetRspMsg->protocolIEs.list.array);
    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
-*
-* ****************************************************************/
+ *
+ * @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)
 {
@@ -795,71 +799,84 @@ uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
 
    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:
-         {
-            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);
-                          }
-            actionItem =(RICaction_ToBeSetup_ItemIEs_t *)ricSubsReq->protocolIEs.list\
+        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("\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;
+
+                    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("\nE2AP : 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("\nE2AP : 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();
 
    return ret;
 }
 
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Free the RicIndication Message
  *
@@ -873,188 +890,188 @@ uint8_t procRicSubsReq(E2AP_PDU_t *e2apMsg)
  *         
  *
  ******************************************************************/
- void FreeRicIndication(E2AP_PDU_t  *e2apMsg) 
- {
-     uint8_t idx=0;
-     RICindication_t *ricIndicationMsg= NULLP;
+void FreeRicIndication(E2AP_PDU_t  *e2apMsg) 
+{
+   uint8_t idx=0;
+   RICindication_t *ricIndicationMsg= NULLP;
 
 
-     if(e2apMsg != NULLP)
-         {
-             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));
-         }
- }
- /*******************************************************************
 *
 * brief Fill the RicIndication Message
 *
 * @details
 *
 *    Function : FillRicIndication
 *
 * Functionality:Fills the RicIndication Message
 *
 * @return ROK     - success
 *         RFAILED - failure
 *
 ******************************************************************/
+   if(e2apMsg != NULLP)
+   {
+      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));
+   }
+}
+/*******************************************************************
+ *
+ * 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);
-       if(ricIndicationMsg->protocolIEs.list.array == NULLP)
-       {
+
+   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);
+   if(ricIndicationMsg->protocolIEs.list.array == NULLP)
+   {
+      DU_LOG("\nE2AP : Memory allocation for RICindicationIEs failed");
+      ret = RFAILED;
+   }
+   else
+   {
+      for(idx=0; idx<elementCnt; idx++)
+      {
+        DU_ALLOC(ricIndicationMsg->protocolIEs.list.array[idx],\
+              sizeof(RICindication_IEs_t));
+        if(ricIndicationMsg->protocolIEs.list.array[idx] == NULLP)
+        {
            DU_LOG("\nE2AP : Memory allocation for RICindicationIEs failed");
            ret = RFAILED;
-       }
-   else
-       {
-          for(idx=0; idx<elementCnt; idx++)
+        }
+      }
+      if(ret != RFAILED)
       {
-             DU_ALLOC(ricIndicationMsg->protocolIEs.list.array[idx],\
-             sizeof(RICindication_IEs_t));
-             if(ricIndicationMsg->protocolIEs.list.array[idx] == NULLP)
-             {
-                DU_LOG("\nE2AP : 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("\nE2AP : 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("\nE2AP : 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);
-                               }
-                       }
-               }
-       }
-       return ret;
+        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("\nE2AP : 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("\nE2AP : 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);
+           }
+        }
+      }
+   }
+   return ret;
 }
 
 /*******************************************************************
@@ -1078,86 +1095,86 @@ uint8_t BuildAndSendRicIndication()
    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 : Building Ric Indication Message\n");
-
-        DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
-        if(e2apMsg == NULLP)
-        {
-             DU_LOG("\nE2AP : 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("\nE2AP : 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("\nE2AP : Could not encode RIC Indication Message (at %s)\n",\
-                          encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-                break;
-        }
-        else
-        {
-           DU_LOG("\nE2AP : 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("\nE2AP : Sending RIC Indication Message");      
-      
-        }
-                 ret = ROK;
-                 break;
+   uint8_t FillRicIndicationret = ROK;
+
+   while(true)
+   {
+      DU_LOG("\nE2AP : Building Ric Indication Message\n");
+
+      DU_ALLOC(e2apMsg, sizeof(E2AP_PDU_t));
+      if(e2apMsg == NULLP)
+      {
+        DU_LOG("\nE2AP : 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("\nE2AP : 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("\nE2AP : Could not encode RIC Indication Message (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\nE2AP : 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("\nE2AP : Sending RIC Indication Message");      
+
+      }
+      ret = ROK;
+      break;
    }
    FreeRicIndication(e2apMsg); 
-       return ret;
+   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
-*
-* ****************************************************************/
+ *
+ * @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)
 {
@@ -1167,20 +1184,20 @@ uint8_t SendE2APMsg(Region region, Pool pool)
    {
       if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK)
       {
-         ODU_PRINT_MSG(mBuf, 0,0);
-         if(sctpSend(mBuf, E2_INTERFACE) != ROK)
-         {
-            DU_LOG("\nE2AP : SCTP Send for E2  failed");
-            ODU_PUT_MSG_BUF(mBuf);
-            return RFAILED;
-         }
+        ODU_PRINT_MSG(mBuf, 0,0);
+
+        if(sctpSend(mBuf, E2_INTERFACE) != ROK)
+        {
+           DU_LOG("\nE2AP : SCTP Send for E2  failed");
+           ODU_PUT_MSG_BUF(mBuf);
+           return RFAILED;
+        }
       }
       else
       {
-         DU_LOG("\nE2AP : ODU_ADD_POST_MSG_MULT failed");
-         ODU_PUT_MSG_BUF(mBuf);
-         return RFAILED;
+        DU_LOG("\nE2AP : ODU_ADD_POST_MSG_MULT failed");
+        ODU_PUT_MSG_BUF(mBuf);
+        return RFAILED;
       }
       ODU_PUT_MSG_BUF(mBuf);
    }
@@ -1189,40 +1206,40 @@ uint8_t SendE2APMsg(Region region, Pool pool)
       DU_LOG("\nE2AP : Failed to allocate memory");
       return RFAILED;
    }
+
    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 ;
+   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("\nE2AP : Received E2AP message buffer");
    ODU_PRINT_MSG(mBuf, 0,0);
+
    /* Copy mBuf into char array to decode it */
    ODU_GET_MSG_LEN(mBuf, &recvBufLen);
    DU_ALLOC(recvBuf, (Size)recvBufLen);
@@ -1241,16 +1258,16 @@ void E2APMsgHdlr(Buffer *mBuf)
    printf("\nE2AP : 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);
    DU_FREE(recvBuf, (Size)recvBufLen);
-   
+
    if(rval.code == RC_FAIL || rval.code == RC_WMORE)
    {
       DU_LOG("\nE2AP : ASN decode failed");
@@ -1262,57 +1279,60 @@ 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("\nE2AP : Store E2 setup response Params");
+                       procE2SetupRsp(e2apMsg);
+                    }
+                    break;
+                 }
+              default:
+                 {
+                    DU_LOG("\nE2AP : Invalid type of sucessful message [%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: 
+                 {
+                    DU_LOG("\nE2AP : Calling RIC Subscription Response");
+                    if(procRicSubsReq(e2apMsg) == ROK)
+                    {
+                       BuildAndSendRicIndication();
+                    }
+                    break;
+                 }
+              default:
+                 {
+                    DU_LOG("\nE2AP : Invalid type of intiating message [%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("\nE2AP : 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
+ **********************************************************************/