Merge "Fixes in current code for Multi-UE support [Issue-ID: ODUHIGH-354]"
[o-du/l2.git] / src / cu_stub / cu_f1ap_msg_hdl.c
index 1b256b4..07e176c 100644 (file)
@@ -26,6 +26,7 @@
 /*header files needed for Ue Context Setup */
 #include<ProtocolIE-Field.h>
 #include "ProtocolExtensionField.h"
+#include "ProtocolIE-SingleContainer.h"
 #include "F1AP-PDU.h"
 #include "ModulationOrder.h"
 #include "BandNR.h"
 #include "SRS-Resource.h"
 #include "SRS-ResourceSet.h"
 #include "SRS-Config.h"
+#include "PUCCH-Config.h"
 #include "BWP-UplinkDedicated.h"
 #include "PUSCH-ServingCellConfig.h"
 #include "UplinkConfig.h"
 #include "PDSCH-ServingCellConfig.h"
+#include "EUTRANQoS.h"
+#include "GBR-QosInformation.h"
+#include "DRBs-ToBeSetupMod-List.h"
+#include "DRBs-ToBeSetupMod-Item.h"
 
 /* MACRO for CUtoDURRCInformation */
 #define CELL_GRP_ID 1
 #define PDSCH_MAPPING_TYPE_B 1
 
 /* MACRO Define for PUSCH Configuration */
-#define PUSCH_K2  3
+#define PUSCH_K2_CFG1  3
+#define PUSCH_K2_CFG2  4
 
 #define PUSCH_MSG3_DELTA_PREAMBLE 0
 #define PUSCH_P0_NOMINAL_WITH_GRANT -70
 #define SCRAMBLING_ID  NR_PCI
 #define DMRS_ADDITIONAL_POS  0          /* DMRS Additional poistion */
 #define RES_ALLOC_TYPE       1          /* Resource allocation type */
-
+#define FIVE_QI_VALUE 9  /*spec 23.501, Table 5.7.4-1*/
 /*******************************************************************
-*
-* @brief Sends F1 msg over SCTP
-*
-* @details
-*
-*    Function : SendF1APMsg
-*
-*    Functionality: Sends F1 msg over SCTP
-*
-* @params[in] Region region
-*             Pool pool
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Sends F1 msg over SCTP
+ *
+ * @details
+ *
+ *    Function : SendF1APMsg
+ *
+ *    Functionality: Sends F1 msg over SCTP
+ *
+ * @params[in] Region region
+ *             Pool pool
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 S16 SendF1APMsg(Region region, Pool pool)
 {
    Buffer *mBuf = NULLP;
@@ -192,17 +199,17 @@ S16 SendF1APMsg(Region region, Pool pool)
       if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK)
       {
          ODU_PRINT_MSG(mBuf, 0,0);
+
          if(sctpSend(mBuf) != ROK)
          {
-            DU_LOG("\nF1AP : SCTP Send failed");
+            DU_LOG("\nERROR  -->  F1AP : SCTP Send failed");
             ODU_PUT_MSG_BUF(mBuf);
             return RFAILED;
          }
       }
       else
       {
-         DU_LOG("\nF1AP : ODU_ADD_POST_MSG_MULT failed");
+         DU_LOG("\nERROR  -->  F1AP : ODU_ADD_POST_MSG_MULT failed");
          ODU_PUT_MSG_BUF(mBuf);
          return RFAILED;
       }
@@ -210,7 +217,7 @@ S16 SendF1APMsg(Region region, Pool pool)
    }
    else
    {
-      DU_LOG("\nF1AP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  F1AP : Failed to allocate memory");
       return RFAILED;
    }
 
@@ -270,13 +277,13 @@ S16 BuildAndSendF1SetupRsp()
    Cells_to_be_Activated_List_t *cellToActivate;
    RRC_Version_t      *rrcVer;
    asn_enc_rval_t     encRetVal; 
-   DU_LOG("\nF1AP : Building F1 Setup Response\n");
+   DU_LOG("\nINFO  -->  F1AP : Building F1 Setup Response\n");
 
    /* Allocate the memory for F1SetupRequest_t */
    CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t)); 
    if(f1apMsg == NULLP)
    {
-      DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
       return RFAILED;
    }
    f1apMsg->present =  F1AP_PDU_PR_successfulOutcome;
@@ -284,7 +291,7 @@ S16 BuildAndSendF1SetupRsp()
    CU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
    if(f1apMsg->choice.successfulOutcome == NULLP)
    {
-      DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;  
    }
@@ -292,7 +299,7 @@ S16 BuildAndSendF1SetupRsp()
    f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_F1Setup;
    f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
    f1apMsg->choice.successfulOutcome->value.present = \
-                                                     SuccessfulOutcome__value_PR_F1SetupResponse;
+                                                      SuccessfulOutcome__value_PR_F1SetupResponse;
    f1SetupRsp = &f1apMsg->choice.successfulOutcome->value.choice.F1SetupResponse;
 
    elementCnt = 4;
@@ -300,10 +307,10 @@ S16 BuildAndSendF1SetupRsp()
    f1SetupRsp->protocolIEs.list.size = elementCnt*sizeof(F1SetupResponseIEs_t *);
 
    CU_ALLOC(f1SetupRsp->protocolIEs.list.array, \
-        elementCnt * sizeof(F1SetupResponseIEs_t *));
+         elementCnt * sizeof(F1SetupResponseIEs_t *));
    if(f1SetupRsp->protocolIEs.list.array == NULLP)
    {
-      DU_LOG("\nF1AP : Memory allocation for F1ResponseIEs failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1ResponseIEs failed");
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
@@ -312,15 +319,15 @@ S16 BuildAndSendF1SetupRsp()
    for(idx=0; idx<elementCnt; idx++)
    {
       CU_ALLOC(f1SetupRsp->protocolIEs.list.array[idx], \
-           sizeof(F1SetupResponseIEs_t)); 
+            sizeof(F1SetupResponseIEs_t)); 
       if(f1SetupRsp->protocolIEs.list.array[idx] == NULLP)
       {  
-        CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-              elementCnt * sizeof(F1SetupResponseIEs_t *));
-        CU_FREE(f1apMsg->choice.successfulOutcome, \
-              sizeof(SuccessfulOutcome_t));
-        CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
-        return RFAILED;
+         CU_FREE(f1SetupRsp->protocolIEs.list.array,\
+               elementCnt * sizeof(F1SetupResponseIEs_t *));
+         CU_FREE(f1apMsg->choice.successfulOutcome, \
+               sizeof(SuccessfulOutcome_t));
+         CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+         return RFAILED;
       }    
    }
 
@@ -329,16 +336,16 @@ S16 BuildAndSendF1SetupRsp()
    f1SetupRsp->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_TransactionID;
    f1SetupRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
    f1SetupRsp->protocolIEs.list.array[idx]->value.present = \
-                                                           F1SetupResponseIEs__value_PR_TransactionID;
+                                                            F1SetupResponseIEs__value_PR_TransactionID;
    f1SetupRsp->protocolIEs.list.array[idx]->value.choice.TransactionID =\
-                                                                       TRANS_ID;
+                                                                        TRANS_ID;
 
    /*CU Name*/
    idx++;
    f1SetupRsp->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_gNB_CU_Name;
    f1SetupRsp->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
    f1SetupRsp->protocolIEs.list.array[idx]->value.present = \
-                                                           F1SetupResponseIEs__value_PR_GNB_CU_Name;
+                                                            F1SetupResponseIEs__value_PR_GNB_CU_Name;
    cuName = &f1SetupRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_Name;
    cuName->size = sizeof(cuCfgParams.cuName);
 
@@ -347,13 +354,13 @@ S16 BuildAndSendF1SetupRsp()
    {
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx],\
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx],\
+               sizeof(F1SetupResponseIEs_t));
       }
       CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome,\
-           sizeof(SuccessfulOutcome_t));
+            sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
@@ -362,28 +369,28 @@ S16 BuildAndSendF1SetupRsp()
    /*Cells to be activated list*/
    idx++;
    f1SetupRsp->protocolIEs.list.array[idx]->id = \
-                                                ProtocolIE_ID_id_Cells_to_be_Activated_List ;
+                                                 ProtocolIE_ID_id_Cells_to_be_Activated_List ;
    f1SetupRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
    f1SetupRsp->protocolIEs.list.array[idx]->value.present = \
-                                                           F1SetupResponseIEs__value_PR_Cells_to_be_Activated_List;
+                                                            F1SetupResponseIEs__value_PR_Cells_to_be_Activated_List;
    cellToActivate = &f1SetupRsp->protocolIEs.list.array[idx]->value.choice.\
-                   Cells_to_be_Activated_List;
+                    Cells_to_be_Activated_List;
    cellCnt=1;
    cellToActivate->list.count = cellCnt;
    cellToActivate->list.size = \
-                              cellCnt*sizeof(struct Cells_to_be_Activated_List_ItemIEs  *);
+                               cellCnt*sizeof(struct Cells_to_be_Activated_List_ItemIEs  *);
    CU_ALLOC(cellToActivate->list.array,\
-        sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
+         sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
    if(cellToActivate->list.array == NULLP)
    {
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx],\
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx],\
+               sizeof(F1SetupResponseIEs_t));
       }
       CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
@@ -393,88 +400,88 @@ S16 BuildAndSendF1SetupRsp()
       CU_ALLOC(cellToActivate->list.array[ieIdx],sizeof(struct Cells_to_be_Activated_List_ItemIEs ));
       if(cellToActivate->list.array[ieIdx] == NULLP)
       {
-        CU_FREE(cellToActivate->list.array,\
-              sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
-        CU_FREE(cuName->buf, sizeof(cuName->size));
-        for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
-        {
-           CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-                 sizeof(F1SetupResponseIEs_t));
-        }
-        CU_FREE(f1SetupRsp->protocolIEs.list.array, \
-              elementCnt * sizeof(F1SetupResponseIEs_t *));
-        CU_FREE(f1apMsg->choice.successfulOutcome, \
-              sizeof(SuccessfulOutcome_t));
-        CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
-        return RFAILED;
+         CU_FREE(cellToActivate->list.array,\
+               sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
+         CU_FREE(cuName->buf, sizeof(cuName->size));
+         for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
+         {
+            CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+                  sizeof(F1SetupResponseIEs_t));
+         }
+         CU_FREE(f1SetupRsp->protocolIEs.list.array, \
+               elementCnt * sizeof(F1SetupResponseIEs_t *));
+         CU_FREE(f1apMsg->choice.successfulOutcome, \
+               sizeof(SuccessfulOutcome_t));
+         CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+         return RFAILED;
       }
    }
    cellToActivate->list.array[0]->id = \
-                                      ProtocolIE_ID_id_Cells_to_be_Activated_List_Item;
+                                       ProtocolIE_ID_id_Cells_to_be_Activated_List_Item;
    cellToActivate->list.array[0]->criticality = Criticality_ignore;
    cellToActivate->list.array[0]->value.present = \
-                                                 Cells_to_be_Activated_List_ItemIEs__value_PR_Cells_to_be_Activated_List_Item;
+                                                  Cells_to_be_Activated_List_ItemIEs__value_PR_Cells_to_be_Activated_List_Item;
    cellToActivate->list.array[0]->value.choice.Cells_to_be_Activated_List_Item.\
       nRCGI.pLMN_Identity.size = 3*sizeof(uint8_t);
    CU_ALLOC(cellToActivate->list.array[0]->\
-        value.choice.Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf,\
-        3*sizeof(uint8_t));
+         value.choice.Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf,\
+         3*sizeof(uint8_t));
    if(cellToActivate->list.array[0]->value.choice.\
-        Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf == NULLP)
+         Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf == NULLP)
    {
 
       for(ieIdx=0; ieIdx<cellCnt; ieIdx++)
       {
-        CU_FREE(cellToActivate->list.array[ieIdx],\
-              sizeof(struct Cells_to_be_Activated_List_ItemIEs ));
+         CU_FREE(cellToActivate->list.array[ieIdx],\
+               sizeof(struct Cells_to_be_Activated_List_ItemIEs ));
       }
 
       CU_FREE(cellToActivate->list.array,\
-           sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
+            sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+               sizeof(F1SetupResponseIEs_t));
       }
       CU_FREE(f1SetupRsp->protocolIEs.list.array, \
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, \
-           sizeof(SuccessfulOutcome_t));
+            sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
    buildPlmnId(cuCfgParams.plmn , cellToActivate->list.array[0]->value.choice.\
-        Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf);
+         Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf);
    cellToActivate->list.array[0]->value.choice.Cells_to_be_Activated_List_Item.\
       nRCGI.nRCellIdentity.size = 5;
    CU_ALLOC(cellToActivate->list.array[0]->value.choice.\
-        Cells_to_be_Activated_List_Item.nRCGI.nRCellIdentity.buf,\
-        5*sizeof(uint8_t));
+         Cells_to_be_Activated_List_Item.nRCGI.nRCellIdentity.buf,\
+         5*sizeof(uint8_t));
    if(cellToActivate->list.array[0]->value.choice.\
-        Cells_to_be_Activated_List_Item.nRCGI.nRCellIdentity.buf == NULLP)
+         Cells_to_be_Activated_List_Item.nRCGI.nRCellIdentity.buf == NULLP)
    {
       CU_FREE(cellToActivate->list.array[0]->\
-           value.choice.Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf,\
-           3*sizeof(uint8_t));
+            value.choice.Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf,\
+            3*sizeof(uint8_t));
       for(ieIdx=0; ieIdx<cellCnt; ieIdx++)
       {
-        CU_FREE(cellToActivate->list.array[ieIdx],\
-              sizeof(struct Cells_to_be_Activated_List_ItemIEs ));
+         CU_FREE(cellToActivate->list.array[ieIdx],\
+               sizeof(struct Cells_to_be_Activated_List_ItemIEs ));
       }
 
       CU_FREE(cellToActivate->list.array,\
-           sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
+            sizeof(struct Cells_to_be_Activated_List_ItemIEs  *));
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+               sizeof(F1SetupResponseIEs_t));
       }
       CU_FREE(f1SetupRsp->protocolIEs.list.array, \
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, \
-           sizeof(SuccessfulOutcome_t));
+            sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
@@ -482,10 +489,10 @@ S16 BuildAndSendF1SetupRsp()
    /* RRC Version */
    idx++;
    f1SetupRsp->protocolIEs.list.array[idx]->id = \
-                                                ProtocolIE_ID_id_GNB_CU_RRC_Version;
+                                                 ProtocolIE_ID_id_GNB_CU_RRC_Version;
    f1SetupRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
    f1SetupRsp->protocolIEs.list.array[idx]->value.present = \
-                                                           F1SetupResponseIEs__value_PR_RRC_Version;
+                                                            F1SetupResponseIEs__value_PR_RRC_Version;
    rrcVer = &f1SetupRsp->protocolIEs.list.array[idx]->value.choice.RRC_Version;
    rrcVer->latest_RRC_Version.size = RRC_SIZE; 
 
@@ -495,11 +502,11 @@ S16 BuildAndSendF1SetupRsp()
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; idx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+               sizeof(F1SetupResponseIEs_t));
       } 
       CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
@@ -515,11 +522,11 @@ S16 BuildAndSendF1SetupRsp()
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+               sizeof(F1SetupResponseIEs_t));
       } 
       CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
@@ -527,73 +534,73 @@ S16 BuildAndSendF1SetupRsp()
    rrcVer->iE_Extensions->list.count = 1;
    rrcVer->iE_Extensions->list.size = sizeof(struct RRC_Version_ExtIEs *);
    CU_ALLOC(rrcVer->iE_Extensions->list.array,\
-        sizeof(struct RRC_Version_ExtIEs *));
+         sizeof(struct RRC_Version_ExtIEs *));
    if(rrcVer->iE_Extensions->list.array == NULLP)
    {
       CU_FREE(rrcVer->iE_Extensions,\
-           sizeof(ProtocolExtensionContainer_4624P81_t));
+            sizeof(ProtocolExtensionContainer_4624P81_t));
       CU_FREE(rrcVer->latest_RRC_Version.buf, sizeof(uint8_t));
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+               sizeof(F1SetupResponseIEs_t));
       } 
       CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
    CU_ALLOC(rrcVer->iE_Extensions->list.array[0],\
-        sizeof(struct RRC_Version_ExtIEs));
+         sizeof(struct RRC_Version_ExtIEs));
    if(rrcVer->iE_Extensions->list.array[0] == NULLP)
    {
       CU_FREE(rrcVer->iE_Extensions->list.array,\
-           sizeof(struct RRC_Version_ExtIEs *));
+            sizeof(struct RRC_Version_ExtIEs *));
       CU_FREE(rrcVer->iE_Extensions,\
-           sizeof(ProtocolExtensionContainer_4624P81_t));
+            sizeof(ProtocolExtensionContainer_4624P81_t));
       CU_FREE(rrcVer->latest_RRC_Version.buf, sizeof(uint8_t));
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+               sizeof(F1SetupResponseIEs_t));
       } 
       CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
    rrcVer->iE_Extensions->list.array[0]->id = \
-                                             ProtocolIE_ID_id_latest_RRC_Version_Enhanced;
+                                              ProtocolIE_ID_id_latest_RRC_Version_Enhanced;
    rrcVer->iE_Extensions->list.array[0]->criticality = Criticality_reject;
    rrcVer->iE_Extensions->list.array[0]->extensionValue.present = \
-                                                                 RRC_Version_ExtIEs__extensionValue_PR_Latest_RRC_Version_Enhanced;
+                                                                  RRC_Version_ExtIEs__extensionValue_PR_Latest_RRC_Version_Enhanced;
    rrcVer->iE_Extensions->list.array[0]->extensionValue.choice.\
       Latest_RRC_Version_Enhanced.size = 3*sizeof(uint8_t);
    CU_ALLOC(rrcVer->iE_Extensions->list.\
-        array[0]->extensionValue.choice.Latest_RRC_Version_Enhanced.buf,\
-        3*sizeof(uint8_t));
+         array[0]->extensionValue.choice.Latest_RRC_Version_Enhanced.buf,\
+         3*sizeof(uint8_t));
    if(rrcVer->iE_Extensions->list.\
-        array[0]->extensionValue.choice.Latest_RRC_Version_Enhanced.buf == NULLP)
+         array[0]->extensionValue.choice.Latest_RRC_Version_Enhanced.buf == NULLP)
    {
       CU_FREE(rrcVer->iE_Extensions->list.array[0],\
-           sizeof(struct RRC_Version_ExtIEs));
+            sizeof(struct RRC_Version_ExtIEs));
       CU_FREE(rrcVer->iE_Extensions->list.array,\
-           sizeof(struct RRC_Version_ExtIEs *));
+            sizeof(struct RRC_Version_ExtIEs *));
       CU_FREE(rrcVer->iE_Extensions,\
-           sizeof(ProtocolExtensionContainer_4624P81_t));
+            sizeof(ProtocolExtensionContainer_4624P81_t));
       CU_FREE(rrcVer->latest_RRC_Version.buf, sizeof(uint8_t));
       CU_FREE(cuName->buf, sizeof(cuName->size));
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
-              sizeof(F1SetupResponseIEs_t));
+         CU_FREE(f1SetupRsp->protocolIEs.list.array[ieIdx], \
+               sizeof(F1SetupResponseIEs_t));
       } 
       CU_FREE(f1SetupRsp->protocolIEs.list.array,\
-           elementCnt * sizeof(F1SetupResponseIEs_t *));
+            elementCnt * sizeof(F1SetupResponseIEs_t *));
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
@@ -626,23 +633,23 @@ S16 BuildAndSendF1SetupRsp()
    /* Check encode results */
    if(encRetVal.encoded == ENCODE_FAIL)
    {
-      DU_LOG("\nF1AP : Could not encode F1SetupResponse structure (at %s)\n",\
-           encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+      DU_LOG("\nERROR  -->  F1AP : Could not encode F1SetupResponse structure (at %s)\n",\
+            encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
       return RFAILED;   
    } 
    else 
    {
-      DU_LOG("\nF1AP : Created APER encoded buffer for F1SetupResponse\n");
+      DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for F1SetupResponse\n");
       for(int i=0; i< encBufSize; i++)
       {
-        printf("%x",encBuf[i]);
+         DU_LOG("%x",encBuf[i]);
       } 
    }
 
    /* Sending msg */
    if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
    {
-      DU_LOG("\nF1AP : Sending F1 Setup Response failed");      
+      DU_LOG("\nERROR  -->  F1AP : Sending F1 Setup Response failed");      
       return RFAILED;
    }
 
@@ -660,8 +667,7 @@ S16 BuildAndSendF1SetupRsp()
  *    Functionality: Constructs the DU Update Acknowledge message and sends
  *                   it to the DU through SCTP.
  *
- * @params[in] void **buf,Buffer to which encoded pattern is written into
- * @params[in] int *size,size of buffer
+ * @params[in] 
  *
  * @return ROK     - success
  *         RFAILED - failure
@@ -676,13 +682,13 @@ S16 BuildAndSendDUUpdateAck()
    GNBDUConfigurationUpdateAcknowledge_t *gNBDuCfgAck;
    asn_enc_rval_t enRetVal; /* Encoder return value */
 
-   DU_LOG("\nF1AP : Building GNB-DU Config Update Ack\n");
+   DU_LOG("\nINFO  -->  F1AP : Building GNB-DU Config Update Ack\n");
 
    /* Allocate the memory for F1SetupRequest_t */
    CU_ALLOC(f1apMsg, (Size)sizeof(F1AP_PDU_t));
    if(f1apMsg == NULLP)
    {
-      DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
       return RFAILED;
    }
 
@@ -691,7 +697,7 @@ S16 BuildAndSendDUUpdateAck()
    CU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
    if(f1apMsg->choice.successfulOutcome == NULLP)
    {
-      DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
@@ -709,7 +715,7 @@ S16 BuildAndSendDUUpdateAck()
    CU_ALLOC(gNBDuCfgAck->protocolIEs.list.array, elementCnt * sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t *));
    if(gNBDuCfgAck->protocolIEs.list.array == NULLP)
    {
-      DU_LOG("\nF1AP : Memory allocation for DuUpdateAcknowledgeIEs failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for DuUpdateAcknowledgeIEs failed");
       CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       CU_FREE(f1apMsg,(Size)sizeof(F1AP_PDU_t));
       return RFAILED;
@@ -720,10 +726,10 @@ S16 BuildAndSendDUUpdateAck()
       CU_ALLOC(gNBDuCfgAck->protocolIEs.list.array[idx], sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t));
       if(gNBDuCfgAck->protocolIEs.list.array[idx] == NULLP)
       {
-        CU_FREE(gNBDuCfgAck->protocolIEs.list.array, elementCnt * sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t *));
-        CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
-        CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
-        return RFAILED;
+         CU_FREE(gNBDuCfgAck->protocolIEs.list.array, elementCnt * sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t *));
+         CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
+         CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+         return RFAILED;
       }
    }
 
@@ -731,7 +737,8 @@ S16 BuildAndSendDUUpdateAck()
    idx = 0;
    gNBDuCfgAck->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_TransactionID ;
    gNBDuCfgAck->protocolIEs.list.array[idx]->criticality = Criticality_reject;
-   gNBDuCfgAck->protocolIEs.list.array[idx]->value.present = GNBDUConfigurationUpdateAcknowledgeIEs__value_PR_TransactionID;
+   gNBDuCfgAck->protocolIEs.list.array[idx]->value.present =\
+   GNBDUConfigurationUpdateAcknowledgeIEs__value_PR_TransactionID;
    gNBDuCfgAck->protocolIEs.list.array[idx]->value.choice.TransactionID = TRANS_ID;
 
    xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
@@ -753,22 +760,23 @@ S16 BuildAndSendDUUpdateAck()
    /* Checking encode results */
    if(enRetVal.encoded == ENCODE_FAIL) 
    {
-      DU_LOG("\nF1AP : Could not encode DUConfigUpdateAcknowledge structure (at %s)",enRetVal.failed_type ? enRetVal.failed_type->name : "unknown");
+      DU_LOG("\nERROR  -->  F1AP : Could not encode DUConfigUpdateAcknowledge structure (at %s)",\
+      enRetVal.failed_type ? enRetVal.failed_type->name : "unknown");
       return RFAILED; 
    } 
    else 
    {
-      DU_LOG("\nF1AP : Created APER encoded buffer for DuConfigUpdateAcknowledge\n");  
+      DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for DuConfigUpdateAcknowledge\n");  
       for(int i=0; i< encBufSize; i++)
       {
-        printf("%x",encBuf[i]);
+         DU_LOG("%x",encBuf[i]);
       } 
    }
 
    /* Sending msg */
    if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
    {
-      DU_LOG("\nF1AP : Sending GNB-DU Config Update Ack failed");
+      DU_LOG("\nERROR  -->  F1AP : Sending GNB-DU Config Update Ack failed");
       return RFAILED;
    }
 
@@ -793,155 +801,155 @@ S16 BuildAndSendDUUpdateAck()
 * ****************************************************************/
 void FreeF1ResetReq(F1AP_PDU_t *f1apMsg)
 {
-    uint8_t idx = 0;
-    Reset_t *f1ResetMsg = NULLP;
+   uint8_t idx = 0;
+   Reset_t *f1ResetMsg = NULLP;
 
-    if(f1apMsg)
-    {
-       if(f1apMsg->choice.initiatingMessage)
-       {
-          f1ResetMsg = &f1apMsg->choice.initiatingMessage->value.choice.Reset;
-          if(f1ResetMsg->protocolIEs.list.array)
-          {
-             for(idx=0 ;idx < f1ResetMsg->protocolIEs.list.count ; idx++)
-             {
-                 if(f1ResetMsg->protocolIEs.list.array[idx])
-                 {
-                    CU_FREE(f1ResetMsg->protocolIEs.list.array[idx],sizeof(ResetIEs_t));
-                 }
-             }
-             CU_FREE(f1ResetMsg->protocolIEs.list.array,f1ResetMsg->protocolIEs.list.size);
-          }
-          CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
-       }
-       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
-    }
+   if(f1apMsg)
+   {
+      if(f1apMsg->choice.initiatingMessage)
+      {
+        f1ResetMsg = &f1apMsg->choice.initiatingMessage->value.choice.Reset;
+        if(f1ResetMsg->protocolIEs.list.array)
+        {
+           for(idx=0 ;idx < f1ResetMsg->protocolIEs.list.count ; idx++)
+           {
+              if(f1ResetMsg->protocolIEs.list.array[idx])
+              {
+                 CU_FREE(f1ResetMsg->protocolIEs.list.array[idx],sizeof(ResetIEs_t));
+              }
+           }
+           CU_FREE(f1ResetMsg->protocolIEs.list.array,f1ResetMsg->protocolIEs.list.size);
+        }
+        CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      }
+      CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
 }
 /*******************************************************************
-*
-* @brief build ansld ans send f1reset msg 
-*
-* @details
-*
-*    Function : BuildAndSendF1ResetReq
-*
-*    Functionality: build and send f1reset msg 
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief build ansld ans send f1reset msg 
+ *
+ * @details
+ *
+ *    Function : BuildAndSendF1ResetReq
+ *
+ *    Functionality: build and send f1reset msg 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildAndSendF1ResetReq()
 {
-    uint8_t          elementCnt=0;
-    uint8_t          idx=0;
-    uint8_t          ret= RFAILED;
-    Reset_t          *f1ResetMsg = NULLP;
-    F1AP_PDU_t       *f1apMsg = NULLP;
-    asn_enc_rval_t   encRetVal;
-    DU_LOG("\nF1AP : Building F1 Reset request \n");
-    do
-    {
-       CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
-       if(f1apMsg == NULLP)
-       {
-          DU_LOG("\nF1AP : Memory allocation for the BuildAndSendF1ResetReq's F1AP-PDU failed"); 
-         break;
-       }
-       f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
-       CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
-       if(f1apMsg->choice.initiatingMessage == NULLP)
-       {
-          DU_LOG("\nF1AP : Memory allocation for BuildAndSendF1ResetReq failed");
-          break;
-       }
-       f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_Reset;
-       f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
-       f1apMsg->choice.initiatingMessage->value.present = InitiatingMessage__value_PR_Reset;
+   uint8_t          elementCnt=0;
+   uint8_t          idx=0;
+   uint8_t          ret= RFAILED;
+   Reset_t          *f1ResetMsg = NULLP;
+   F1AP_PDU_t       *f1apMsg = NULLP;
+   asn_enc_rval_t   encRetVal;
+   DU_LOG("\nINFO  -->  F1AP : Building F1 Reset request \n");
+   do
+   {
+      CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for the BuildAndSendF1ResetReq's F1AP-PDU failed"); 
+        break;
+      }
+      f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
+      CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      if(f1apMsg->choice.initiatingMessage == NULLP)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for BuildAndSendF1ResetReq failed");
+        break;
+      }
+      f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_Reset;
+      f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
+      f1apMsg->choice.initiatingMessage->value.present = InitiatingMessage__value_PR_Reset;
 
-       f1ResetMsg = &f1apMsg->choice.initiatingMessage->value.choice.Reset;
+      f1ResetMsg = &f1apMsg->choice.initiatingMessage->value.choice.Reset;
 
-       elementCnt = 3;
-       f1ResetMsg->protocolIEs.list.count = elementCnt;
-       f1ResetMsg->protocolIEs.list.size = elementCnt * sizeof(ResetIEs_t *);
+      elementCnt = 3;
+      f1ResetMsg->protocolIEs.list.count = elementCnt;
+      f1ResetMsg->protocolIEs.list.size = elementCnt * sizeof(ResetIEs_t *);
 
-       /* Initialize the F1Reset members */
-       CU_ALLOC(f1ResetMsg->protocolIEs.list.array,f1ResetMsg->protocolIEs.list.size);
-       if(f1ResetMsg->protocolIEs.list.array == NULLP)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed for BuildAndSendF1ResetReq");
-         break;
-       }
-       for(idx=0; idx<elementCnt; idx++)
-       {
-           CU_ALLOC(f1ResetMsg->protocolIEs.list.array[idx],sizeof(ResetIEs_t));
-           if(f1ResetMsg->protocolIEs.list.array[idx] == NULLP)
-           {
-             DU_LOG("\nF1AP : Memory allocation failed for BuildAndSendF1ResetReq msg array");
-              break;
-           }
-       }
+      /* Initialize the F1Reset members */
+      CU_ALLOC(f1ResetMsg->protocolIEs.list.array,f1ResetMsg->protocolIEs.list.size);
+      if(f1ResetMsg->protocolIEs.list.array == NULLP)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for BuildAndSendF1ResetReq");
+        break;
+      }
+      for(idx=0; idx<elementCnt; idx++)
+      {
+        CU_ALLOC(f1ResetMsg->protocolIEs.list.array[idx],sizeof(ResetIEs_t));
+        if(f1ResetMsg->protocolIEs.list.array[idx] == NULLP)
+        {
+           DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for BuildAndSendF1ResetReq msg array");
+           break;
+        }
+      }
 
-       /*TransactionID*/
-       idx=0;
-       f1ResetMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_TransactionID;
-       f1ResetMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.present = ResetIEs__value_PR_TransactionID;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.choice.TransactionID = 1;
-
-       /*Cause*/
-       idx++;
-       f1ResetMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_Cause;
-       f1ResetMsg->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.present = ResetIEs__value_PR_Cause;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.choice.Cause.present = Cause_PR_radioNetwork;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.choice.Cause.choice.radioNetwork = CauseRadioNetwork_action_desirable_for_radio_reasons;
-
-       /*Reset Type*/
-       idx++;
-       f1ResetMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_ResetType;
-       f1ResetMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.present = ResetIEs__value_PR_ResetType;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.choice.ResetType.present = ResetType_PR_f1_Interface;
-       f1ResetMsg->protocolIEs.list.array[idx]->value.choice.ResetType.choice.f1_Interface = ResetAll_reset_all;
-
-       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
-
-       /* Encode the F1SetupRequest type as APER */
-       memset(encBuf, 0, ENC_BUF_MAX_LEN);
-       encBufSize = 0;
-       encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
-                   encBuf);
+      /*TransactionID*/
+      idx=0;
+      f1ResetMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_TransactionID;
+      f1ResetMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.present = ResetIEs__value_PR_TransactionID;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.choice.TransactionID = 1;
 
-       /* Encode results */
-       if(encRetVal.encoded == ENCODE_FAIL)
-       {
-          DU_LOG("\nF1AP : Could not encode F1Reset structure (at %s)\n",\
-                      encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-          break;
-       }
-       else
-       {
-          DU_LOG("\nF1AP : Created APER encoded buffer for F1Reset\n");
-          for(idx=0; idx< encBufSize; idx++)
-          {
-             printf("%x",encBuf[idx]);
-          }
-       }
+      /*Cause*/
+      idx++;
+      f1ResetMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_Cause;
+      f1ResetMsg->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.present = ResetIEs__value_PR_Cause;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.choice.Cause.present = Cause_PR_radioNetwork;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.choice.Cause.choice.radioNetwork = CauseRadioNetwork_action_desirable_for_radio_reasons;
 
-       if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
-       {
-          DU_LOG("\nF1AP : Sending F1 Reset request failed");
-          break;
-       }
+      /*Reset Type*/
+      idx++;
+      f1ResetMsg->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_ResetType;
+      f1ResetMsg->protocolIEs.list.array[idx]->criticality = Criticality_reject;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.present = ResetIEs__value_PR_ResetType;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.choice.ResetType.present = ResetType_PR_f1_Interface;
+      f1ResetMsg->protocolIEs.list.array[idx]->value.choice.ResetType.choice.f1_Interface = ResetAll_reset_all;
 
-       ret = ROK;
-       break;
-    }while(true);
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the F1SetupRequest type as APER */
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
+           encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Could not encode F1Reset structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for F1Reset\n");
+        for(idx=0; idx< encBufSize; idx++)
+        {
+           DU_LOG("%x",encBuf[idx]);
+        }
+      }
+
+      if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Sending F1 Reset request failed");
+        break;
+      }
+
+      ret = ROK;
+      break;
+   }while(true);
 
-    FreeF1ResetReq(f1apMsg);
-    return ret;
- }
+   FreeF1ResetReq(f1apMsg);
+   return ret;
+}
 
 /*******************************************************************
  *
@@ -968,27 +976,27 @@ uint8_t fillSrbCfg(uint8_t srbId, SRB_ToAddModList_t *bearerCfg)
       elementCnt = 1;
       bearerCfg->list.count = elementCnt;
       bearerCfg->list.size =\
-           elementCnt * sizeof(SRB_ToAddMod_t *);
+                           elementCnt * sizeof(SRB_ToAddMod_t *);
       CU_ALLOC(bearerCfg->list.array, bearerCfg->list.size);
       if(bearerCfg->list.array != NULLP)
       {
-         for(idx = 0; idx < elementCnt; idx++)
-         {
-            CU_ALLOC(bearerCfg->list.array[idx], sizeof(SRB_ToAddMod_t));
-            if(bearerCfg->list.array[idx] == NULLP)
-            {
-               for(ieId = 0; ieId < idx; ieId++)
-               {
-                  CU_FREE(bearerCfg->list.array[ieId], sizeof(SRB_ToAddMod_t));
-               }
-               CU_FREE(bearerCfg->list.array, bearerCfg->list.size);
-               return RFAILED;
-            }
-         }
+        for(idx = 0; idx < elementCnt; idx++)
+        {
+           CU_ALLOC(bearerCfg->list.array[idx], sizeof(SRB_ToAddMod_t));
+           if(bearerCfg->list.array[idx] == NULLP)
+           {
+              for(ieId = 0; ieId < idx; ieId++)
+              {
+                 CU_FREE(bearerCfg->list.array[ieId], sizeof(SRB_ToAddMod_t));
+              }
+              CU_FREE(bearerCfg->list.array, bearerCfg->list.size);
+              return RFAILED;
+           }
+        }
       }
       else
       {
-         return RFAILED;
+        return RFAILED;
       }
       idx = 0;
       bearerCfg->list.array[idx]->srb_Identity = srbId;
@@ -1013,18 +1021,18 @@ uint8_t fillSrbCfg(uint8_t srbId, SRB_ToAddModList_t *bearerCfg)
  *
  * ****************************************************************/
 
-uint8_t fillMasterCellGroup(OCTET_STRING_t *masterCellGroup)
+uint8_t fillMasterCellGroup(uint8_t ueId, OCTET_STRING_t *masterCellGroup)
 {
    uint8_t ret = ROK;
    masterCellGroup->buf = NULLP;
-   if(f1apMsgDb.duToCuContainer.buf)
+   if(ueCb[ueId-1].f1apMsgDb.duToCuContainer.buf)
    {
-      masterCellGroup->size = f1apMsgDb.duToCuContainer.size;
+      masterCellGroup->size = ueCb[ueId-1].f1apMsgDb.duToCuContainer.size;
       CU_ALLOC(masterCellGroup->buf, masterCellGroup->size);
       if(masterCellGroup->buf != NULLP)
       {
-        memcpy(masterCellGroup->buf, f1apMsgDb.duToCuContainer.buf,\
-              masterCellGroup->size);
+         memcpy(masterCellGroup->buf, ueCb[ueId-1].f1apMsgDb.duToCuContainer.buf,\
+               masterCellGroup->size);
       }
       else
       {
@@ -1055,7 +1063,7 @@ uint8_t fillMasterCellGroup(OCTET_STRING_t *masterCellGroup)
  *
  * ****************************************************************/
 
-uint8_t fillRRCSetupIE(RRCSetup_IEs_t *rrcSetupIE)
+uint8_t fillRRCSetupIE(uint8_t ueId, RRCSetup_IEs_t *rrcSetupIE)
 {
    uint8_t ret = ROK;
    if(rrcSetupIE)
@@ -1067,7 +1075,7 @@ uint8_t fillRRCSetupIE(RRCSetup_IEs_t *rrcSetupIE)
       }                
       if(ret == ROK)
       {
-        ret = fillMasterCellGroup(&rrcSetupIE->masterCellGroup);
+         ret = fillMasterCellGroup(ueId, &rrcSetupIE->masterCellGroup);
       }
       else
       {
@@ -1095,7 +1103,7 @@ uint8_t fillRRCSetupIE(RRCSetup_IEs_t *rrcSetupIE)
  *
  * ****************************************************************/
 
-uint8_t fillDlCcchRrcMsg(RRCContainer_t *rrcContainer)
+uint8_t fillDlCcchRrcMsg(uint8_t ueId, RRCContainer_t *rrcContainer)
 {
    uint8_t ret = ROK;
    uint16_t idx2;
@@ -1109,71 +1117,71 @@ uint8_t fillDlCcchRrcMsg(RRCContainer_t *rrcContainer)
       CU_ALLOC(dl_CCCH_Msg.message.choice.c1 , sizeof(DL_CCCH_MessageType_t));
       if(dl_CCCH_Msg.message.choice.c1 != NULLP)
       {
-        dl_CCCH_Msg.message.choice.c1->present = DL_CCCH_MessageType__c1_PR_rrcSetup;
-        CU_ALLOC(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup, sizeof(RRCSetup_t));
-        if(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup != NULLP)
-        {
-           dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->rrc_TransactionIdentifier = 0;
-           dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->criticalExtensions.\
-              present = RRCSetup__criticalExtensions_PR_rrcSetup;
-           /* Fill RRC Setup IE */
-           CU_ALLOC(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\
-                 criticalExtensions.choice.rrcSetup, sizeof(RRCSetup_IEs_t));
-           if(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\
-                 criticalExtensions.choice.rrcSetup != NULLP)
-           {
-              ret = fillRRCSetupIE(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\
-                    criticalExtensions.choice.rrcSetup);
+         dl_CCCH_Msg.message.choice.c1->present = DL_CCCH_MessageType__c1_PR_rrcSetup;
+         CU_ALLOC(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup, sizeof(RRCSetup_t));
+         if(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup != NULLP)
+         {
+            dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->rrc_TransactionIdentifier = 0;
+            dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->criticalExtensions.\
+               present = RRCSetup__criticalExtensions_PR_rrcSetup;
+            /* Fill RRC Setup IE */
+            CU_ALLOC(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\
+                  criticalExtensions.choice.rrcSetup, sizeof(RRCSetup_IEs_t));
+            if(dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\
+                  criticalExtensions.choice.rrcSetup != NULLP)
+            {
+               ret = fillRRCSetupIE(ueId, dl_CCCH_Msg.message.choice.c1->choice.rrcSetup->\
+                     criticalExtensions.choice.rrcSetup);
 
-              if(ret == ROK)
-              {
-                 /* encode DL-CCCH message into RRC Container */
-                 xer_fprint(stdout, &asn_DEF_DL_CCCH_MessageType, &dl_CCCH_Msg);
-                 memset(encBuf, 0, ENC_BUF_MAX_LEN);
-                 encBufSize = 0;
-                 encRetVal = aper_encode(&asn_DEF_DL_CCCH_MessageType, 0, &dl_CCCH_Msg, PrepFinalEncBuf, encBuf);
-                 /* Encode results */
-                 if(encRetVal.encoded == ENCODE_FAIL)
-                 {
-                    DU_LOG( "\n F1AP : Could not encode RRCContainer for DL-CCCH Msg(at %s)\n",\
-                          encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-                    return RFAILED;
-                 }
-                 else
-                 {
-                    DU_LOG("\n F1AP : Created APER encoded buffer for RRCContainer for DL-CCCH Msg\n");
-                    for(int i = 0; i< encBufSize; i++)
-                    {
-                       printf("%x",encBuf[i]);
-                    }
-                    rrcContainer->size = encBufSize;
-                    CU_ALLOC(rrcContainer->buf, rrcContainer->size);
-                    if(rrcContainer->buf != NULLP)
-                    {
-                       memset(rrcContainer->buf, 0, encBufSize);
-                       for(idx2 = 0; idx2 < encBufSize; idx2++)
-                       {
-                          rrcContainer->buf[idx2] =    encBuf[idx2];
-                       }
-                    }
-                 }
-              }
-              else
-              {
-                 ret = RFAILED;
-              }
-           }
-           else
-           {
-              DU_LOG("\nF1AP: Memory Alloc failed for RRC Setup Msg at fillDlCcchRrcMsg()");
-              ret = RFAILED;
-           }
-        }
-        else
-        {
-           DU_LOG("\nF1AP: Memory Alloc failed for RRC Msg at fillDlCcchRrcMsg()");
-           ret = RFAILED;
-        }
+               if(ret == ROK)
+               {
+                  /* encode DL-CCCH message into RRC Container */
+                  xer_fprint(stdout, &asn_DEF_DL_CCCH_MessageType, &dl_CCCH_Msg);
+                  memset(encBuf, 0, ENC_BUF_MAX_LEN);
+                  encBufSize = 0;
+                  encRetVal = aper_encode(&asn_DEF_DL_CCCH_MessageType, 0, &dl_CCCH_Msg, PrepFinalEncBuf, encBuf);
+                  /* Encode results */
+                  if(encRetVal.encoded == ENCODE_FAIL)
+                  {
+                     DU_LOG( "\nERROR  -->  F1AP : Could not encode RRCContainer for DL-CCCH Msg(at %s)\n",\
+                           encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+                     return RFAILED;
+                  }
+                  else
+                  {
+                     DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRCContainer for DL-CCCH Msg\n");
+                     for(int i = 0; i< encBufSize; i++)
+                     {
+                        DU_LOG("%x",encBuf[i]);
+                     }
+                     rrcContainer->size = encBufSize;
+                     CU_ALLOC(rrcContainer->buf, rrcContainer->size);
+                     if(rrcContainer->buf != NULLP)
+                     {
+                        memset(rrcContainer->buf, 0, encBufSize);
+                        for(idx2 = 0; idx2 < encBufSize; idx2++)
+                        {
+                           rrcContainer->buf[idx2] =   encBuf[idx2];
+                        }
+                     }
+                  }
+               }
+               else
+               {
+                  ret = RFAILED;
+               }
+            }
+            else
+            {
+               DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Setup Msg at fillDlCcchRrcMsg()");
+               ret = RFAILED;
+            }
+         }
+         else
+         {
+            DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Msg at fillDlCcchRrcMsg()");
+            ret = RFAILED;
+         }
       }
       else
       {
@@ -1183,7 +1191,7 @@ uint8_t fillDlCcchRrcMsg(RRCContainer_t *rrcContainer)
    }
    else
    {
-      DU_LOG("\nF1AP: RRC Container is NULLP at fillDlCcchRrcMsg()");
+      DU_LOG("\nERROR  -->  F1AP: RRC Container is NULLP at fillDlCcchRrcMsg()");
       ret = RFAILED;
    }
 }
@@ -1200,16 +1208,16 @@ uint8_t fillQosFlowsToAdd(struct SDAP_Config__mappedQoS_FlowsToAdd *qosFlow)
    {
       for(idx = 0; idx < elementCnt; idx++)
       {
-         CU_ALLOC(qosFlow->list.array[idx], sizeof(QFI_t));
-         if(qosFlow->list.array[idx] == NULLP)
-         {
-            for(ied = 0; ied < idx; ied++)
-            {
-               CU_FREE(qosFlow->list.array[idx], sizeof(QFI_t));
-            }
-            CU_FREE(qosFlow->list.array, qosFlow->list.size);
-            return RFAILED;
-         }
+        CU_ALLOC(qosFlow->list.array[idx], sizeof(QFI_t));
+        if(qosFlow->list.array[idx] == NULLP)
+        {
+           for(ied = 0; ied < idx; ied++)
+           {
+              CU_FREE(qosFlow->list.array[idx], sizeof(QFI_t));
+           }
+           CU_FREE(qosFlow->list.array, qosFlow->list.size);
+           return RFAILED;
+        }
       }
    }
    idx = 0;
@@ -1248,29 +1256,29 @@ uint8_t fillCnAssoc(struct DRB_ToAddMod__cnAssociation *cnAssoc)
       CU_ALLOC(cnAssoc->choice.sdap_Config, sizeof(SDAP_Config_t));
       if(cnAssoc->choice.sdap_Config)
       {
-         cnAssoc->choice.sdap_Config->pdu_Session = 5;
-         cnAssoc->choice.sdap_Config->sdap_HeaderDL = 0;
-         cnAssoc->choice.sdap_Config->sdap_HeaderUL = 0;
-         cnAssoc->choice.sdap_Config->defaultDRB = true;
-         cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd = NULLP;
-         cnAssoc->choice.sdap_Config->mappedQoS_FlowsToRelease = NULLP;
-         CU_ALLOC(cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd, \
-            sizeof(struct SDAP_Config__mappedQoS_FlowsToAdd));
-         if(cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd)
-         {
-            ret = fillQosFlowsToAdd(cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd);
-         }
-         else
-         {
-            DU_LOG("\nF1AP: Memory alloc failed at mappedQoS_FlowsToAdd in fillCnAssoc()");
-            CU_FREE(cnAssoc->choice.sdap_Config, sizeof(SDAP_Config_t));
-            ret = RFAILED;
-         }
-      }
-      else
+        cnAssoc->choice.sdap_Config->pdu_Session = 5;
+        cnAssoc->choice.sdap_Config->sdap_HeaderDL = 0;
+        cnAssoc->choice.sdap_Config->sdap_HeaderUL = 0;
+        cnAssoc->choice.sdap_Config->defaultDRB = true;
+        cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd = NULLP;
+        cnAssoc->choice.sdap_Config->mappedQoS_FlowsToRelease = NULLP;
+        CU_ALLOC(cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd, \
+              sizeof(struct SDAP_Config__mappedQoS_FlowsToAdd));
+        if(cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd)
+        {
+           ret = fillQosFlowsToAdd(cnAssoc->choice.sdap_Config->mappedQoS_FlowsToAdd);
+        }
+        else
+        {
+           DU_LOG("\nERROR  -->  F1AP: Memory alloc failed at mappedQoS_FlowsToAdd in fillCnAssoc()");
+           CU_FREE(cnAssoc->choice.sdap_Config, sizeof(SDAP_Config_t));
+           ret = RFAILED;
+        }
+      }
+      else
       {
-         DU_LOG("\nF1AP: Mem alloc failed at fillCnAssoc()");
-         ret = RFAILED;
+        DU_LOG("\nERROR  -->  F1AP: Mem alloc failed at fillCnAssoc()");
+        ret = RFAILED;
       }
    }
    return ret;
@@ -1295,41 +1303,41 @@ uint8_t fillCnAssoc(struct DRB_ToAddMod__cnAssociation *cnAssoc)
 uint8_t fillDrbCfg(uint8_t drbId, DRB_ToAddModList_t *drbCfg)
 {
    uint8_t idx, ied, ret, elementCnt;
-   
+
    ret = ROK;
    if(drbCfg != NULLP)
    {
       elementCnt = 1;
       drbCfg->list.count = elementCnt;
       drbCfg->list.size =\
-           elementCnt * sizeof(DRB_ToAddMod_t *);
+                        elementCnt * sizeof(DRB_ToAddMod_t *);
       CU_ALLOC(drbCfg->list.array, drbCfg->list.size);
       if(drbCfg->list.array != NULLP)
       {
-         for(idx = 0; idx < elementCnt; idx++)
-         {
-            CU_ALLOC(drbCfg->list.array[idx], sizeof(DRB_ToAddMod_t));
-            if(drbCfg->list.array[idx] == NULLP)
-            {
-               for(ied = 0; ied < idx; ied++)
-               {
-                  CU_FREE(drbCfg->list.array[idx], sizeof(DRB_ToAddMod_t));
-               }
-               CU_FREE(drbCfg->list.array, drbCfg->list.size);
-               return RFAILED;
-            }
-         }
+        for(idx = 0; idx < elementCnt; idx++)
+        {
+           CU_ALLOC(drbCfg->list.array[idx], sizeof(DRB_ToAddMod_t));
+           if(drbCfg->list.array[idx] == NULLP)
+           {
+              for(ied = 0; ied < idx; ied++)
+              {
+                 CU_FREE(drbCfg->list.array[idx], sizeof(DRB_ToAddMod_t));
+              }
+              CU_FREE(drbCfg->list.array, drbCfg->list.size);
+              return RFAILED;
+           }
+        }
       }
       else
       {
-         return RFAILED;
+        return RFAILED;
       }
       idx = 0;
       /* CN ASSOCIATION */
       CU_ALLOC(drbCfg->list.array[idx]->cnAssociation, sizeof(struct DRB_ToAddMod__cnAssociation));
       if(drbCfg->list.array[idx]->cnAssociation)
       {
-         ret = fillCnAssoc(drbCfg->list.array[idx]->cnAssociation);
+        ret = fillCnAssoc(drbCfg->list.array[idx]->cnAssociation);
       }
       /* DRB */
       drbCfg->list.array[idx]->drb_Identity = drbId;
@@ -1364,26 +1372,26 @@ uint8_t fillRrcReconfigIE(RRCReconfiguration_IEs_t *rrcReconfigMsg)
       CU_ALLOC(rrcReconfigMsg->radioBearerConfig->srb_ToAddModList, sizeof(SRB_ToAddModList_t));
       if(rrcReconfigMsg->radioBearerConfig->srb_ToAddModList != NULLP)
       {
-         ret = fillSrbCfg(SRB2, rrcReconfigMsg->radioBearerConfig->srb_ToAddModList);
-        
+        ret = fillSrbCfg(SRB2, rrcReconfigMsg->radioBearerConfig->srb_ToAddModList);
+
       }
       if(ret == ROK)
       {
-         CU_ALLOC(rrcReconfigMsg->radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
-         if(rrcReconfigMsg->radioBearerConfig->drb_ToAddModList != NULLP)
+        CU_ALLOC(rrcReconfigMsg->radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
+        if(rrcReconfigMsg->radioBearerConfig->drb_ToAddModList != NULLP)
         {
-            ret = fillDrbCfg(DRB1, rrcReconfigMsg->radioBearerConfig->drb_ToAddModList);
+           ret = fillDrbCfg(DRB1, rrcReconfigMsg->radioBearerConfig->drb_ToAddModList);
            if(ret == RFAILED)
            {
-               DU_LOG("\n F1AP: Failed to fill DrbCfg at fillRrcReconfigIE()");
+              DU_LOG("\nERROR  -->  F1AP : Failed to fill DrbCfg at fillRrcReconfigIE()");
               CU_FREE(rrcReconfigMsg->radioBearerConfig->srb_ToAddModList, sizeof(SRB_ToAddModList_t));
-               CU_FREE(rrcReconfigMsg->radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
+              CU_FREE(rrcReconfigMsg->radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
            }
         }
       }
       else
       {
-         DU_LOG("\n F1AP: memory Alloc failed at fillRrcReconfigIE()");
+        DU_LOG("\nERROR  -->  F1AP : memory Alloc failed at fillRrcReconfigIE()");
         CU_FREE(rrcReconfigMsg->radioBearerConfig->srb_ToAddModList, sizeof(SRB_ToAddModList_t));
       }
    }
@@ -1449,16 +1457,16 @@ uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
                  /* Encode results */
                  if(encRetVal.encoded == ENCODE_FAIL)
                  {
-                    DU_LOG( "\n F1AP : Could not encode RRCContainer for DL-DCCH Msg (at %s)\n",\
+                    DU_LOG( "\nERROR  -->  F1AP : Could not encode RRCContainer for DL-DCCH Msg (at %s)\n",\
                           encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
                     return RFAILED;
                  }
                  else
                  {
-                    DU_LOG("\n F1AP : Created APER encoded buffer for RRCContainer for DL-DCCH Msg\n");
+                    DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRCContainer for DL-DCCH Msg\n");
                     for(int i = 0; i< encBufSize; i++)
                     {
-                       printf("%x",encBuf[i]);
+                       DU_LOG("%x",encBuf[i]);
                     }
                     rrcContainer->size = encBufSize;
                     CU_ALLOC(rrcContainer->buf, rrcContainer->size);
@@ -1474,30 +1482,30 @@ uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
               }
               else
               {
-                 DU_LOG("\nF1AP: Failed to fill RrcReconfig IE at fillDlDcchRrcMsg()");
+                 DU_LOG("\nERROR  -->  F1AP: Failed to fill RrcReconfig IE at fillDlDcchRrcMsg()");
               }
            }
            else
            {
-              DU_LOG("\nF1AP: Memory Alloc failed for RRC Reconfig at fillDlDcchRrcMsg()");
+              DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Reconfig at fillDlDcchRrcMsg()");
               ret = RFAILED;
            }
         }
         else
         {
-           DU_LOG("\nF1AP: Memory Alloc failed for RRC Msg at fillDlDcchRrcMsg()");
+           DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Msg at fillDlDcchRrcMsg()");
            ret = RFAILED;
         }
       }
       else
       {
-        DU_LOG("\nF1AP: Memory Alloc failed for DL Dcch Msg choice at fillDlDcchRrcMsg()");
+        DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for DL Dcch Msg choice at fillDlDcchRrcMsg()");
         ret = RFAILED;
       }
    }
    else
    {
-      DU_LOG("\nF1AP: RRC Container is NULLP at fillDlDcchRrcMsg()");
+      DU_LOG("\nERROR  -->  F1AP: RRC Container is NULLP at fillDlDcchRrcMsg()");
       ret = RFAILED;
    }
    return ret;
@@ -1521,16 +1529,16 @@ uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
  *
  * ****************************************************************/
 
-uint8_t        BuildDLRRCContainer(uint8_t rrcMsgType, RRCContainer_t *rrcContainer)
+uint8_t        BuildDLRRCContainer(uint8_t ueId, uint8_t rrcMsgType, RRCContainer_t *rrcContainer)
 {
    uint8_t ret, bufLen;
-   
+
    ret =ROK;
    if(rrcMsgType == RRC_SETUP)
    { 
-      ret = fillDlCcchRrcMsg(rrcContainer);
+      ret = fillDlCcchRrcMsg(ueId, rrcContainer);
       if(ret == RFAILED)
-          DU_LOG("\n F1AP: Failed to fill DL-CCCH Msg at RRC SETUP");
+        DU_LOG("\nERROR  -->  F1AP: Failed to fill DL-CCCH Msg at RRC SETUP");
    }
    else if(rrcMsgType == REGISTRATION_ACCEPT)
    {
@@ -1541,7 +1549,7 @@ uint8_t   BuildDLRRCContainer(uint8_t rrcMsgType, RRCContainer_t *rrcContainer)
       CU_ALLOC(rrcContainer->buf, rrcContainer->size);
       if(rrcContainer->buf != NULLP)
       {
-         memset(rrcContainer->buf, 0, bufLen);
+        memset(rrcContainer->buf, 0, bufLen);
         memcpy(rrcContainer->buf, buf, bufLen);
       }
    }
@@ -1549,29 +1557,29 @@ uint8_t BuildDLRRCContainer(uint8_t rrcMsgType, RRCContainer_t *rrcContainer)
    {
       /*Hardcoded RRC Container from reference logs*/
       char buf[196]= { 
-      0x00, 0x04, 0x00, 0xaa, 0x80, 0x40, 0x9a, 0x05, 0x20, 0x00, 0x05, 0xeb, 0xc0, 0x51, 0x50, 0x00,
-      0x03, 0x00, 0x03, 0xf7, 0x56, 0xec, 0x7f, 0x08, 0x42, 0x10, 0x80, 0x00, 0x10, 0x21, 0x47, 0x84,
-      0xd1, 0x00, 0x00, 0x00, 0x02, 0x81, 0x5d, 0x10, 0x0a, 0xc2, 0x44, 0x40, 0x2b, 0xb2, 0x07, 0x41,
-      0x87, 0xa8, 0x02, 0xc7, 0x00, 0x88, 0x05, 0x76, 0x40, 0xe8, 0x30, 0xf5, 0x40, 0x4c, 0x00, 0x10,
-      0x02, 0x00, 0xa5, 0x83, 0xe0, 0x60, 0x02, 0x10, 0x72, 0x01, 0x0c, 0xa0, 0xa0, 0xd8, 0x00, 0x00,
-      0x00, 0x01, 0x0f, 0x02, 0x3c, 0x01, 0x80, 0x10, 0x82, 0xb0, 0x40, 0x00, 0x00, 0x02, 0x1e, 0x04,
-      0x78, 0x07, 0x00, 0x21, 0x05, 0x61, 0x00, 0x00, 0x00, 0x04, 0x3c, 0x08, 0xf0, 0x16, 0x00, 0x42,
-      0x0a, 0xc3, 0x00, 0x00, 0x00, 0x08, 0x78, 0x11, 0xe0, 0x3c, 0x00, 0x84, 0x14, 0x00, 0x07, 0xe5,
-      0xc0, 0xa0, 0xd8, 0x42, 0x20, 0x02, 0x80, 0xa0, 0x02, 0x24, 0x47, 0xa0, 0x20, 0x27, 0xa1, 0x22,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x24, 0x41, 0x20, 0xc0, 0x80, 0x00, 0x20, 0x80,
-      0x00, 0x25, 0x20, 0xa0, 0x38, 0x00, 0x00, 0x00, 0x44, 0xa2, 0x82, 0x69, 0xee, 0x0c, 0xad, 0xca,
-      0x4c, 0x2c, 0x8d, 0x2e, 0x6f, 0x2e, 0x69, 0x2d, 0xce, 0x8c, 0xae, 0x4d, 0xcc, 0xae, 0x80, 0x00,
-      0x00, 0x00, 0x00, 0x00};
+        0x00, 0x04, 0x00, 0xaa, 0x80, 0x40, 0x9a, 0x05, 0x20, 0x00, 0x05, 0xeb, 0xc0, 0x51, 0x50, 0x00,
+        0x03, 0x00, 0x03, 0xf7, 0x56, 0xec, 0x7f, 0x08, 0x42, 0x10, 0x80, 0x00, 0x10, 0x21, 0x47, 0x84,
+        0xd1, 0x00, 0x00, 0x00, 0x02, 0x81, 0x5d, 0x10, 0x0a, 0xc2, 0x44, 0x40, 0x2b, 0xb2, 0x07, 0x41,
+        0x87, 0xa8, 0x02, 0xc7, 0x00, 0x88, 0x05, 0x76, 0x40, 0xe8, 0x30, 0xf5, 0x40, 0x4c, 0x00, 0x10,
+        0x02, 0x00, 0xa5, 0x83, 0xe0, 0x60, 0x02, 0x10, 0x72, 0x01, 0x0c, 0xa0, 0xa0, 0xd8, 0x00, 0x00,
+        0x00, 0x01, 0x0f, 0x02, 0x3c, 0x01, 0x80, 0x10, 0x82, 0xb0, 0x40, 0x00, 0x00, 0x02, 0x1e, 0x04,
+        0x78, 0x07, 0x00, 0x21, 0x05, 0x61, 0x00, 0x00, 0x00, 0x04, 0x3c, 0x08, 0xf0, 0x16, 0x00, 0x42,
+        0x0a, 0xc3, 0x00, 0x00, 0x00, 0x08, 0x78, 0x11, 0xe0, 0x3c, 0x00, 0x84, 0x14, 0x00, 0x07, 0xe5,
+        0xc0, 0xa0, 0xd8, 0x42, 0x20, 0x02, 0x80, 0xa0, 0x02, 0x24, 0x47, 0xa0, 0x20, 0x27, 0xa1, 0x22,
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x24, 0x41, 0x20, 0xc0, 0x80, 0x00, 0x20, 0x80,
+        0x00, 0x25, 0x20, 0xa0, 0x38, 0x00, 0x00, 0x00, 0x44, 0xa2, 0x82, 0x69, 0xee, 0x0c, 0xad, 0xca,
+        0x4c, 0x2c, 0x8d, 0x2e, 0x6f, 0x2e, 0x69, 0x2d, 0xce, 0x8c, 0xae, 0x4d, 0xcc, 0xae, 0x80, 0x00,
+        0x00, 0x00, 0x00, 0x00};
       bufLen =196;
       rrcContainer->size = bufLen;
       CU_ALLOC(rrcContainer->buf, rrcContainer->size);
       if(rrcContainer->buf != NULLP)
       {
-         memset(rrcContainer->buf, 0, bufLen);
+        memset(rrcContainer->buf, 0, bufLen);
         memcpy(rrcContainer->buf, buf, bufLen);
       }
    }
-   
+
    return ret;
 }
 
@@ -1592,7 +1600,7 @@ uint8_t   BuildDLRRCContainer(uint8_t rrcMsgType, RRCContainer_t *rrcContainer)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
+uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t ueId, uint8_t srbId, uint8_t rrcMsgType)
 {
    uint8_t   elementCnt = 0;
    uint8_t  ieId;
@@ -1601,12 +1609,12 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
    DLRRCMessageTransfer_t  *dlRRCMsg = NULLP;
    asn_enc_rval_t   encRetVal;        /* Encoder return value */
 
-   DU_LOG("\n F1AP : Building DL RRC Message Transfer Message\n");
+   DU_LOG("\nINFO  -->  F1AP : Building DL RRC Message Transfer Message\n");
 
    CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
    if(f1apMsg == NULLP)
    {
-      DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
       return RFAILED;
    }
 
@@ -1615,7 +1623,7 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
         sizeof(InitiatingMessage_t));
    if(f1apMsg->choice.initiatingMessage == NULLP)
    {
-      DU_LOG(" F1AP : Memory allocation for  F1AP-PDU failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for  F1AP-PDU failed");
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
@@ -1633,7 +1641,7 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
    CU_ALLOC(dlRRCMsg->protocolIEs.list.array, dlRRCMsg->protocolIEs.list.size);
    if(dlRRCMsg->protocolIEs.list.array == NULLP)
    {
-      DU_LOG(" F1AP : Memory allocation for DL RRC MessageTransferIEs failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for DL RRC MessageTransferIEs failed");
       CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
@@ -1663,8 +1671,8 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
    dlRRCMsg->protocolIEs.list.array[idx]->id  = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
    dlRRCMsg->protocolIEs.list.array[idx]->criticality  =   Criticality_reject;
    dlRRCMsg->protocolIEs.list.array[idx]->value.present = \
-                                                         DLRRCMessageTransferIEs__value_PR_GNB_CU_UE_F1AP_ID;
-   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = CU_ID;
+                                                          DLRRCMessageTransferIEs__value_PR_GNB_CU_UE_F1AP_ID;
+   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = ueId;
 
    /* GNB DU UE F1AP ID */
    idx++;
@@ -1672,8 +1680,8 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
                                                ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
    dlRRCMsg->protocolIEs.list.array[idx]->criticality  =   Criticality_reject;
    dlRRCMsg->protocolIEs.list.array[idx]->value.present = \
-                                                         DLRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
-   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = DU_ID;
+                                                          DLRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
+   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueId;
 
    /* SRBID */
    idx++;
@@ -1688,8 +1696,8 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
    dlRRCMsg->protocolIEs.list.array[idx]->id  = ProtocolIE_ID_id_RRCContainer;
    dlRRCMsg->protocolIEs.list.array[idx]->criticality   = Criticality_reject;
    dlRRCMsg->protocolIEs.list.array[idx]->value.present = \
-                                                         DLRRCMessageTransferIEs__value_PR_RRCContainer;
-   BuildDLRRCContainer(rrcMsgType, &dlRRCMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer);
+                                                          DLRRCMessageTransferIEs__value_PR_RRCContainer;
+   BuildDLRRCContainer(ueId, rrcMsgType, &dlRRCMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer);
 
    xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
@@ -1701,23 +1709,23 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
    /* Encode results */
    if(encRetVal.encoded == ENCODE_FAIL)
    {
-      DU_LOG( "\n F1AP : Could not encode DL RRC Message Transfer structure (at %s)\n",\
+      DU_LOG( "\nERROR  -->  F1AP : Could not encode DL RRC Message Transfer structure (at %s)\n",\
            encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
       return RFAILED;
    }
    else
    {
-      DU_LOG("\n F1AP : Created APER encoded buffer for DL RRC Message transfer\n");
+      DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for DL RRC Message transfer\n");
       for(int i=0; i< encBufSize; i++)
       {
-        printf("%x",encBuf[i]);
+        DU_LOG("%x",encBuf[i]);
       }
    }
 
    /* Sending  msg  */
    if(SendF1APMsg(CU_APP_MEM_REG,CU_POOL)  !=  ROK)
    {
-      DU_LOG("\n F1AP : Sending  DL RRC Message Transfer Failed");
+      DU_LOG("\nERROR  -->  F1AP : Sending  DL RRC Message Transfer Failed");
       return RFAILED;
    }
 
@@ -1742,28 +1750,31 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t srbId, uint8_t rrcMsgType)
  *
  * ****************************************************************/
 
-uint8_t setDlRRCMsgType()
+uint8_t setDlRRCMsgType(uint8_t ueId)
 {
    uint8_t rrcMsgType = 0;
-   switch(f1apMsgDb.dlRrcMsgCount)
+   switch(ueCb[ueId -1].f1apMsgDb.dlRrcMsgCount)
    {
       case RRC_SETUP:
-        rrcMsgType = RRC_SETUP;
-        break;
+        rrcMsgType = RRC_SETUP;
+        break;
       case REGISTRATION_ACCEPT:
-        rrcMsgType = REGISTRATION_ACCEPT;
-        break;
+        rrcMsgType = REGISTRATION_ACCEPT;
+        break;
       case UE_CONTEXT_SETUP_REQ:
-        rrcMsgType = UE_CONTEXT_SETUP_REQ;
-        break;
+        rrcMsgType = UE_CONTEXT_SETUP_REQ;
+        break;
       case SECURITY_MODE_COMPLETE:
-        rrcMsgType = SECURITY_MODE_COMPLETE;
-        break;
+        rrcMsgType = SECURITY_MODE_COMPLETE;
+        break;
       case RRC_RECONFIG:
-        rrcMsgType = RRC_RECONFIG;
-        break;
+        rrcMsgType = RRC_RECONFIG;
+        break;
+      case UE_CONTEXT_MOD_REQ:
+        rrcMsgType = UE_CONTEXT_MOD_REQ;
+        break;
       default:
-        break;
+        break;
    }
    return rrcMsgType;   
 }
@@ -1787,10 +1798,10 @@ uint8_t setDlRRCMsgType()
 
 uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg)
 {
-   uint8_t idx, rrcMsgType;
+   uint8_t idx, rrcMsgType, gnbDuUeF1apId;
    uint8_t ret =ROK;
    InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP;
-   DU_LOG("\n filling the required values in DB in procInitULRRCMsg");
+   DU_LOG("\nINFO -->  F1AP : filling the required values in DB in procInitULRRCMsg");
 
    initULRRCMsg = &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer;
 
@@ -1798,49 +1809,51 @@ uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg)
    {
       switch(initULRRCMsg->protocolIEs.list.array[idx]->id)
       {
-        case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-           break;
-        case ProtocolIE_ID_id_NRCGI:
-           break;
-        case ProtocolIE_ID_id_C_RNTI:
-           break;
-        case ProtocolIE_ID_id_RRCContainer:
-           break;
-        case ProtocolIE_ID_id_DUtoCURRCContainer:
-           {
-              if((initULRRCMsg->protocolIEs.list.array[idx]->value.choice\
-                       .DUtoCURRCContainer.size > 0) && (initULRRCMsg->protocolIEs\
-                          .list.array[idx]->value.choice.DUtoCURRCContainer.buf != NULLP))
-              {
-                 DU_LOG("\n Received Du to Cu RRC Container ");
-                 f1apMsgDb.duToCuContainer.size = initULRRCMsg->protocolIEs\
-                                                  .list.array[idx]->value.choice.DUtoCURRCContainer.size;
-                 CU_ALLOC(f1apMsgDb.duToCuContainer.buf, \
-                       f1apMsgDb.duToCuContainer.size);
-                 if(f1apMsgDb.duToCuContainer.buf != NULLP)
-                 { 
-                    memcpy(f1apMsgDb.duToCuContainer.buf, initULRRCMsg->protocolIEs\
-                          .list.array[idx]->value.choice.DUtoCURRCContainer.buf, f1apMsgDb\
-                          .duToCuContainer.size);
-                 }
-              }
-              else
-              {
-                 DU_LOG("\n Failed to receive Du to Cu RRC Container ");
-                 ret = RFAILED;
-              }
-              break;
-           }
-        default:
-           DU_LOG("\n Invalid Event %ld", initULRRCMsg->protocolIEs.list.array[idx]->id);
-           break;
+         case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+            gnbDuUeF1apId = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
+            break;
+         case ProtocolIE_ID_id_NRCGI:
+            break;
+         case ProtocolIE_ID_id_C_RNTI:
+            break;
+         case ProtocolIE_ID_id_RRCContainer:
+            break;
+         case ProtocolIE_ID_id_DUtoCURRCContainer:
+            {
+               if((initULRRCMsg->protocolIEs.list.array[idx]->value.choice\
+                        .DUtoCURRCContainer.size > 0) && (initULRRCMsg->protocolIEs\
+                           .list.array[idx]->value.choice.DUtoCURRCContainer.buf != NULLP))
+               {
+                  DU_LOG("\nINFO  -->  Received Du to Cu RRC Container ");
+                  ueCb[gnbDuUeF1apId-1].ueId = gnbDuUeF1apId;
+                  ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.size = initULRRCMsg->protocolIEs\
+                         .list.array[idx]->value.choice.DUtoCURRCContainer.size;
+                  CU_ALLOC(ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.buf, \
+                        ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.size);
+                  if(ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.buf != NULLP)
+                  { 
+                     memcpy(ueCb[gnbDuUeF1apId-1].f1apMsgDb.duToCuContainer.buf, initULRRCMsg->protocolIEs\
+                           .list.array[idx]->value.choice.DUtoCURRCContainer.buf, ueCb[gnbDuUeF1apId-1].f1apMsgDb\
+                           .duToCuContainer.size);
+                  }
+               }
+               else
+               {
+                  DU_LOG("\nERROR  -->  Failed to receive Du to Cu RRC Container ");
+                  ret = RFAILED;
+               }
+               break;
+            }
+         default:
+            DU_LOG("\nERROR  -->  Invalid Event %ld", initULRRCMsg->protocolIEs.list.array[idx]->id);
+            break;
       }
    }
    if(ret == ROK)
    {
-      f1apMsgDb.dlRrcMsgCount++;
-      rrcMsgType = setDlRRCMsgType();
-      ret = BuildAndSendDLRRCMessageTransfer(SRB0, rrcMsgType);
+      ueCb[gnbDuUeF1apId-1].f1apMsgDb.dlRrcMsgCount++;
+      rrcMsgType = setDlRRCMsgType(gnbDuUeF1apId);
+      ret = BuildAndSendDLRRCMessageTransfer(gnbDuUeF1apId, SRB0, rrcMsgType);
    }
    return ret;
 }
@@ -1991,7 +2004,7 @@ uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
    srbSet->list.array[idx]->id = ProtocolIE_ID_id_SRBs_ToBeSetup_Item;
    srbSet->list.array[idx]->criticality = Criticality_ignore;
    srbSet->list.array[idx]->value.present = \
-      SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item;
+                                           SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item;
    srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = 2;
    return ROK;
 }/* End of BuildSRBSetup*/
@@ -2022,7 +2035,7 @@ uint8_t BuildQOSInfo(QoSFlowLevelQoSParameters_t *drbQos)
       return RFAILED;
    }
    /*FiveQI*/
-   drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = 0;
+   drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE;
    /*AveragingWindow*/
    CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,\
         sizeof(AveragingWindow_t));
@@ -2043,11 +2056,10 @@ uint8_t BuildQOSInfo(QoSFlowLevelQoSParameters_t *drbQos)
    *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume) = 0;
 
    /*nRGRAN Allocation Retention Priority*/
-   drbQos->nGRANallocationRetentionPriority.priorityLevel = PriorityLevel_highest;
+   drbQos->nGRANallocationRetentionPriority.priorityLevel = PriorityLevel_lowest;
    drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = Pre_emptionCapability_may_trigger_pre_emption;
    drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = Pre_emptionVulnerability_not_pre_emptable;
 
-   /* TO DO: GBR_QoSFlowInformation */
    return ROK;
 }/*End of BuildQOSInfo*/
 
@@ -2199,14 +2211,15 @@ uint8_t BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
    {
       return RFAILED;
    }
+   /* NOTE: Below IP address must be changed if running on different IP configuration */
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[0] = 4;
+      transportLayerAddress.buf[0] = 192;
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[1] = 4;
+      transportLayerAddress.buf[1] = 168;
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[2] = 4;
+      transportLayerAddress.buf[2] = 130;
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[3] = 5;
+      transportLayerAddress.buf[3] = 82;
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
       transportLayerAddress.bits_unused = 0;
    /*GTP TEID*/
@@ -2221,13 +2234,13 @@ uint8_t BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
       return RFAILED;
    }
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      gTP_TEID.buf[0] = 11;
+     gTP_TEID.buf[0] = 0;
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
       gTP_TEID.buf[1] = 0;
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
       gTP_TEID.buf[2] = 0;
    ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      gTP_TEID.buf[3] = 1;
+      gTP_TEID.buf[3] = cuCfgParams.egtpParams.currTunnelId++;
 
    return ROK;
 }/*End of BuildULTnlInfo*/
@@ -2294,7 +2307,7 @@ uint8_t BuildDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
                                                                     Criticality_ignore;
    drbSetItem->qoSInformation.choice.choice_extension->value.present = \
                                                                       QoSInformation_ExtIEs__value_PR_DRB_Information;
-  BuildQOSInforet =  BuildQOSInfo(&drbSetItem->qoSInformation.choice.\
+   BuildQOSInforet =  BuildQOSInfo(&drbSetItem->qoSInformation.choice.\
         choice_extension->value.choice.DRB_Information.dRB_QoS);
    if(BuildQOSInforet != ROK)
    {
@@ -2491,7 +2504,7 @@ void FreeULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
                  if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
                        !=NULLP)
                  {
-                    CU_ALLOC(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
+                    CU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
                           gTP_TEID.buf,ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.\
                           gTPTunnel->gTP_TEID.size);
                  }
@@ -2667,41 +2680,41 @@ void FreeUeContextSetupReq(F1AP_PDU_t  *f1apMsg)
            {
               if(ueSetReq->protocolIEs.list.array[idx])
               {
-                 switch(ueSetReq->protocolIEs.list.array[idx]->id)
+                 switch(ueSetReq->protocolIEs.list.array[idx]->id)
                  {
-                     case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
-                        break;
-                     case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-                        break;
-                     case ProtocolIE_ID_id_SpCell_ID:
-                       FreeNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI);
-                       break;
+                    case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+                       break;
+                    case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+                       break;
+                    case ProtocolIE_ID_id_SpCell_ID:
+                       FreeNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI);
+                       break;
                     case ProtocolIE_ID_id_ServCellIndex:
-                       break;
+                       break;
                     case ProtocolIE_ID_id_SpCellULConfigured:
-                       break;
+                       break;
                     case ProtocolIE_ID_id_CUtoDURRCInformation:
-                       FreeCuToDuInfo(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation);
-                       break;
+                       FreeCuToDuInfo(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation);
+                       break;
                     case ProtocolIE_ID_id_SCell_ToBeSetup_List:
-                       FreeSplCellList(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
+                       FreeSplCellList(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
                        break;
                     case ProtocolIE_ID_id_SRBs_ToBeSetup_List:
-                       FreeSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
-                       break;
-                     case ProtocolIE_ID_id_DRBs_ToBeSetup_List:
-                       FreeDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
+                       FreeSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
+                       break;
+                    case ProtocolIE_ID_id_DRBs_ToBeSetup_List:
+                       FreeDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
                        break;
-                     case ProtocolIE_ID_id_RRCContainer:
-                       if(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf != NULLP)
+                    case ProtocolIE_ID_id_RRCContainer:
+                       if(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf != NULLP)
                        {
-                         CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, \
+                         CU_FREE(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, \
                          ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
                        }
                        break;
                     default:
-                       printf("\nF1AP: Invalid event type %ld", ueSetReq->protocolIEs.list.array[idx]->id);
-                 }
+                       DU_LOG("\nERROR  -->  F1AP: Invalid event type %ld", ueSetReq->protocolIEs.list.array[idx]->id);
+                 }
               }
               break;
            }
@@ -2709,7 +2722,7 @@ void FreeUeContextSetupReq(F1AP_PDU_t  *f1apMsg)
            {
               if(ueSetReq->protocolIEs.list.array[ieId] != NULLP)
               {
-                 CU_FREE(ueSetReq->protocolIEs.list.array[ieId],sizeof(UEContextSetupRequestIEs_t));
+                 CU_FREE(ueSetReq->protocolIEs.list.array[ieId],sizeof(UEContextSetupRequestIEs_t));
               }
            }
            CU_FREE(ueSetReq->protocolIEs.list.array,ueSetReq->protocolIEs.list.size);
@@ -2738,10 +2751,10 @@ void FreeUeContextSetupReq(F1AP_PDU_t  *f1apMsg)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildControlRSetToAddModList
+   uint8_t BuildControlRSetToAddModList
 (
-struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
-)
+ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
+ )
 {
    uint8_t idx;
    uint8_t elementCnt;
@@ -2753,13 +2766,13 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
    elementCnt = 1;
    controlRSetList->list.count = elementCnt;
    controlRSetList->list.size = \
-       elementCnt * sizeof(struct ControlResourceSet *);
+                               elementCnt * sizeof(struct ControlResourceSet *);
 
    controlRSetList->list.array = NULLP;
    CU_ALLOC(controlRSetList->list.array, controlRSetList->list.size);
    if(!controlRSetList->list.array)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
       return RFAILED;
    }
 
@@ -2769,8 +2782,8 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
       CU_ALLOC(controlRSetList->list.array[idx], sizeof(struct ControlResourceSet));
       if(!controlRSetList->list.array[idx])
       {
-         DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
-         return RFAILED;
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+        return RFAILED;
       }
    }
 
@@ -2787,12 +2800,12 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
    bitsUnused = 3;
    controlRSet->frequencyDomainResources.size = numBytes * sizeof(uint8_t);
    controlRSet->frequencyDomainResources.buf = NULLP;
-       CU_ALLOC(controlRSet->frequencyDomainResources.buf, \
-          controlRSet->frequencyDomainResources.size);
-       if(!controlRSet->frequencyDomainResources.buf)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
-               return RFAILED;
+   CU_ALLOC(controlRSet->frequencyDomainResources.buf, \
+        controlRSet->frequencyDomainResources.size);
+   if(!controlRSet->frequencyDomainResources.buf)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
    }
 
    memset(controlRSet->frequencyDomainResources.buf, 0, FREQ_DOM_RSRC_SIZE);
@@ -2806,20 +2819,20 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
 
    controlRSet->duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
    controlRSet->cce_REG_MappingType.present = \
-      ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
+                                             ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
 
    controlRSet->precoderGranularity = PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY;
    controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
-       controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
-       controlRSet->tci_PresentInDCI = NULLP;
+   controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
+   controlRSet->tci_PresentInDCI = NULLP;
 #if 0
    uint8_t tciStateIdx;
 
    CU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList, \
-      sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
+        sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
    if(!controlRset->tci_StatesPDCCH_ToAddList)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
       return RFAILED;
    }
 
@@ -2827,20 +2840,20 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
    controlRset->tci_StatesPDCCH_ToAddList->list.count = elementCnt;
    controlRset->tci_StatesPDCCH_ToAddList->list.size = elementCnt * sizeof(TCI_StateId_t *);
    CU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array, \
-      controlRset->tci_StatesPDCCH_ToAddList->list.size)
-   if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
-   {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
-      return RFAILED;
-   }
-   
+        controlRset->tci_StatesPDCCH_ToAddList->list.size)
+      if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+        return RFAILED;
+      }
+
    for(tciStateIdx = 0; tciStateIdx <elementCntl; tciStateIdx++)
    {
       CU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx], sizeof(TCI_StateId_t));
       if(!controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx])
       {
-         DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
-         return RFAILED;
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+        return RFAILED;
       }
    }
 
@@ -2851,7 +2864,7 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
    CU_ALLOC(controlRset->tci_PresentInDCI, sizeof(long));
    if(!controlRset->tci_PresentInDCI)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
       return RFAILED;
    }
    /* TODO */
@@ -2862,7 +2875,7 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
    CU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
    if(!controlRSet->pdcch_DMRS_ScramblingID)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
       return RFAILED;
    }
    *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
@@ -2885,15 +2898,15 @@ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSearchSpcToAddModList
+   uint8_t BuildSearchSpcToAddModList
 (
-struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
-)
+ struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+ )
 {
    uint8_t idx;
-       uint8_t numBytes;
-       uint8_t byteIdx;
-       uint8_t bitsUnused;
+   uint8_t numBytes;
+   uint8_t byteIdx;
+   uint8_t bitsUnused;
    uint8_t elementCnt;
    struct SearchSpace *searchSpc;
 
@@ -2901,22 +2914,22 @@ struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
    searchSpcList->list.count = elementCnt;
    searchSpcList->list.size = elementCnt * sizeof(struct SearchSpace *);
 
-       searchSpcList->list.array = NULLP;
+   searchSpcList->list.array = NULLP;
    CU_ALLOC(searchSpcList->list.array, searchSpcList->list.size);
    if(!searchSpcList->list.array)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
       return RFAILED;
    }
 
    for(idx = 0; idx < elementCnt; idx++)
    {
-          searchSpcList->list.array[idx] = NULLP;
+      searchSpcList->list.array[idx] = NULLP;
       CU_ALLOC(searchSpcList->list.array[idx], sizeof(struct SearchSpace));
       if(!searchSpcList->list.array[idx])
       {
-         DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-         return RFAILED;
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+        return RFAILED;
       }
    }
 
@@ -2929,94 +2942,94 @@ struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
    CU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
    if(!searchSpc->controlResourceSetId)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
       return RFAILED;
    }
    *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
 
    searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
    CU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, \
-      sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+        sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
    if(!searchSpc->monitoringSlotPeriodicityAndOffset)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-               return RFAILED;
-       }
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
    searchSpc->monitoringSlotPeriodicityAndOffset->present = \
-          SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
-  
+                                                           SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+
    searchSpc->duration = NULLP;
    searchSpc->monitoringSymbolsWithinSlot = NULLP;
-       CU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
-       if(!searchSpc->monitoringSymbolsWithinSlot)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-               return RFAILED;
-       }
-   
-       /* Values taken from reference logs :
-        * size 2 bytes
-        * 2 LSBs unsued
-        * Bit string stores 8000
-        */
+   CU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
+   if(!searchSpc->monitoringSymbolsWithinSlot)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+
+   /* Values taken from reference logs :
+    * size 2 bytes
+    * 2 LSBs unsued
+    * Bit string stores 8000
+    */
    numBytes = 2;
-       bitsUnused = 2;
+   bitsUnused = 2;
 
    searchSpc->monitoringSymbolsWithinSlot->size = numBytes * sizeof(uint8_t);
-       searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
-       CU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, \
-          searchSpc->monitoringSymbolsWithinSlot->size);
-       if(!searchSpc->monitoringSymbolsWithinSlot->buf)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-               return RFAILED;
-       }
-
-       byteIdx = 0;
-       searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = \
-        PDCCH_SYMBOL_WITHIN_SLOT /* setting MSB to 128 i.e. 0x80 */;
-       searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = 0;
-       searchSpc->monitoringSymbolsWithinSlot->bits_unused = bitsUnused;
+   searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
+   CU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, \
+        searchSpc->monitoringSymbolsWithinSlot->size);
+   if(!searchSpc->monitoringSymbolsWithinSlot->buf)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+
+   byteIdx = 0;
+   searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = \
+                                                           PDCCH_SYMBOL_WITHIN_SLOT /* setting MSB to 128 i.e. 0x80 */;
+   searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = 0;
+   searchSpc->monitoringSymbolsWithinSlot->bits_unused = bitsUnused;
 
    searchSpc->nrofCandidates = NULLP;
    CU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
    if(!searchSpc->nrofCandidates)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
       return RFAILED;
    }
 
    searchSpc->nrofCandidates->aggregationLevel1 = \
-          PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE;
+                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE;
    searchSpc->nrofCandidates->aggregationLevel2 = \
-          PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE;
+                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE;
    searchSpc->nrofCandidates->aggregationLevel4 = \
-          PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE;
+                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE;
    searchSpc->nrofCandidates->aggregationLevel8 = \
-          PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE;
+                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE;
    searchSpc->nrofCandidates->aggregationLevel16 = \
-          PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE;
+                                                  PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE;
 
    searchSpc->searchSpaceType = NULLP;
    CU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
    if(!searchSpc->searchSpaceType)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
       return RFAILED;
    }
-   
+
    searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
 
    searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
    CU_ALLOC(searchSpc->searchSpaceType->choice.ue_Specific, \
-      sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+        sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
    if(!searchSpc->searchSpaceType->choice.ue_Specific)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
       return RFAILED;
    }  
    searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = \
-          PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+                                                                PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
 
    return ROK;
 }/* End BuildSearchSpcToAddModList */
@@ -3041,39 +3054,39 @@ uint8_t BuildBWPDlDedPdcchCfg(struct PDCCH_Config *pdcchCfg)
 {
    pdcchCfg->controlResourceSetToAddModList = NULLP;
    CU_ALLOC(pdcchCfg->controlResourceSetToAddModList, \
-      sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+        sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
    if(!pdcchCfg->controlResourceSetToAddModList)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      return RFAILED;
+   }
+
+   if(BuildControlRSetToAddModList(pdcchCfg->controlResourceSetToAddModList) != ROK)
+   {
       return RFAILED;
    }
 
-       if(BuildControlRSetToAddModList(pdcchCfg->controlResourceSetToAddModList) != ROK)
-       {
-          return RFAILED;
-       }
-  
    pdcchCfg->controlResourceSetToReleaseList = NULLP;
 
    pdcchCfg->searchSpacesToAddModList = NULLP;
-       CU_ALLOC(pdcchCfg->searchSpacesToAddModList, \
-          sizeof(struct PDCCH_Config__searchSpacesToAddModList));
-       if(!pdcchCfg->searchSpacesToAddModList)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
-               return RFAILED;
-       }
-  
-       if(BuildSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList) != ROK)
-       {
-          return RFAILED;
-       }
-   
+   CU_ALLOC(pdcchCfg->searchSpacesToAddModList, \
+        sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+   if(!pdcchCfg->searchSpacesToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      return RFAILED;
+   }
+
+   if(BuildSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList) != ROK)
+   {
+      return RFAILED;
+   }
+
    pdcchCfg->searchSpacesToReleaseList = NULLP;
-       pdcchCfg->downlinkPreemption = NULLP;
-       pdcchCfg->tpc_PUSCH = NULLP;
-       pdcchCfg->tpc_PUCCH = NULLP;
-       pdcchCfg->tpc_SRS = NULLP;
+   pdcchCfg->downlinkPreemption = NULLP;
+   pdcchCfg->tpc_PUSCH = NULLP;
+   pdcchCfg->tpc_PUCCH = NULLP;
+   pdcchCfg->tpc_SRS = NULLP;
 
    return ROK;
 }
@@ -3094,34 +3107,34 @@ uint8_t BuildBWPDlDedPdcchCfg(struct PDCCH_Config *pdcchCfg)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildDMRSDLPdschMapTypeA
+   uint8_t BuildDMRSDLPdschMapTypeA
 (
-struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
-)
+ struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
+ )
 {
    dmrsDlCfg->present = PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup;
-       dmrsDlCfg->choice.setup = NULLP;
+   dmrsDlCfg->choice.setup = NULLP;
    CU_ALLOC(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
    if(!dmrsDlCfg->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
       return RFAILED;
    }
-        
-       dmrsDlCfg->choice.setup->dmrs_Type = NULLP;
-       dmrsDlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
+
+   dmrsDlCfg->choice.setup->dmrs_Type = NULLP;
+   dmrsDlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
    CU_ALLOC(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
    if(!dmrsDlCfg->choice.setup->dmrs_AdditionalPosition)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
       return RFAILED;
    }
    *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
-         
-       dmrsDlCfg->choice.setup->maxLength = NULLP;
-       dmrsDlCfg->choice.setup->scramblingID0 = NULLP;
-       dmrsDlCfg->choice.setup->scramblingID1 = NULLP;
-       dmrsDlCfg->choice.setup->phaseTrackingRS = NULLP;
+
+   dmrsDlCfg->choice.setup->maxLength = NULLP;
+   dmrsDlCfg->choice.setup->scramblingID0 = NULLP;
+   dmrsDlCfg->choice.setup->scramblingID1 = NULLP;
+   dmrsDlCfg->choice.setup->phaseTrackingRS = NULLP;
 
    return ROK;
 }
@@ -3165,59 +3178,76 @@ uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPdschTimeDomAllocList
+   uint8_t BuildPdschTimeDomAllocList
 (
-struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
-)
+ struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
+ )
 {
    uint8_t idx;
    uint8_t elementCnt;
-       struct PDSCH_TimeDomainResourceAllocation *timeDomAlloc;
+   struct PDSCH_TimeDomainResourceAllocation *timeDomAlloc;
 
    timeDomAllocList->present = \
-          PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
+                              PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
 
    timeDomAllocList->choice.setup = NULLP;
    CU_ALLOC(timeDomAllocList->choice.setup, \
-          sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+        sizeof(struct PDSCH_TimeDomainResourceAllocationList));
    if(!timeDomAllocList->choice.setup)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
-               return RFAILED;
-       }
-         
-       elementCnt = 1;
-       timeDomAllocList->choice.setup->list.count = elementCnt;
-       timeDomAllocList->choice.setup->list.size = \
-          elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
-
-       timeDomAllocList->choice.setup->list.array = NULLP;
-       CU_ALLOC(timeDomAllocList->choice.setup->list.array, \
-          timeDomAllocList->choice.setup->list.size);
-       if(!timeDomAllocList->choice.setup->list.array)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
-               return RFAILED;
-       }
-
-       for(idx = 0; idx < elementCnt; idx++)
-       {
-          timeDomAllocList->choice.setup->list.array[idx] = NULLP;
-          CU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], \
-                  sizeof(struct PDSCH_TimeDomainResourceAllocation));
-               if(!timeDomAllocList->choice.setup->list.array[idx])
-               {
-                  DU_LOG("\nF1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
-                       return RFAILED;
-               }
-       }
-
-       idx = 0;
-       timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
-
-   timeDomAlloc->k0 = NULLP;
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+      return RFAILED;
+   }
+
+   elementCnt = 2;
+   timeDomAllocList->choice.setup->list.count = elementCnt;
+   timeDomAllocList->choice.setup->list.size = \
+                                              elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
+
+   timeDomAllocList->choice.setup->list.array = NULLP;
+   CU_ALLOC(timeDomAllocList->choice.setup->list.array, \
+        timeDomAllocList->choice.setup->list.size);
+   if(!timeDomAllocList->choice.setup->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      timeDomAllocList->choice.setup->list.array[idx] = NULLP;
+      CU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], \
+           sizeof(struct PDSCH_TimeDomainResourceAllocation));
+      if(!timeDomAllocList->choice.setup->list.array[idx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+        return RFAILED;
+      }
+   }
+
+   idx = 0;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   CU_ALLOC(timeDomAlloc->k0, sizeof(long));
+   if(!timeDomAlloc->k0)
+   {
+       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+       return RFAILED;
+   }
+   *(timeDomAlloc->k0) = 0;
    timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = 53;
+   timeDomAlloc->startSymbolAndLength = 66;
+
+   idx++;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   CU_ALLOC(timeDomAlloc->k0, sizeof(long));
+   if(!timeDomAlloc->k0)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+      return RFAILED;
+   }
+   *(timeDomAlloc->k0) = 1;
+   timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
+   timeDomAlloc->startSymbolAndLength = 66;
 
    return ROK;
 }
@@ -3239,22 +3269,22 @@ struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPdschPrbBundlingType
+   uint8_t BuildPdschPrbBundlingType
 (
-struct PDSCH_Config__prb_BundlingType *prbBndlType
-)
+ struct PDSCH_Config__prb_BundlingType *prbBndlType
+ )
 {
    prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
 
    prbBndlType->choice.staticBundling = NULLP;
-       CU_ALLOC(prbBndlType->choice.staticBundling, \
-          sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
-       if(!prbBndlType->choice.staticBundling)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildPdschPrbBundlingType");
-               return RFAILED;
-       }
-       prbBndlType->choice.staticBundling->bundleSize = NULLP;
+   CU_ALLOC(prbBndlType->choice.staticBundling, \
+        sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
+   if(!prbBndlType->choice.staticBundling)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschPrbBundlingType");
+      return RFAILED;
+   }
+   prbBndlType->choice.staticBundling->bundleSize = NULLP;
 
    return ROK;
 }
@@ -3281,10 +3311,10 @@ uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
 
    pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA = NULLP;
    CU_ALLOC(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
-      sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+        sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
    if(!pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
       return RFAILED;
    }
 
@@ -3296,12 +3326,12 @@ uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
    pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeB = NULLP;
    pdschCfg->tci_StatesToAddModList = NULLP;
    pdschCfg->tci_StatesToReleaseList = NULLP;
-       pdschCfg->vrb_ToPRB_Interleaver = NULLP;
+   pdschCfg->vrb_ToPRB_Interleaver = NULLP;
 #if 0
    CU_ALLOC(pdschCfg->tci_StatesToAddModList, sizeof(struct PDSCH_Config__tci_StatesToAddModList));
    if(!pdschCfg->tci_StatesToAddModList)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
       return RFAILED;
    }
    if(BuildTCIStatesToAddModList(pdschCfg->tci_StatesToAddModList) != ROK)
@@ -3310,48 +3340,48 @@ uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
    }
 #endif
 
-       pdschCfg->resourceAllocation = RES_ALLOC_TYPE;
+   pdschCfg->resourceAllocation = RES_ALLOC_TYPE;
 
    pdschCfg->pdsch_TimeDomainAllocationList = NULLP;
-       CU_ALLOC(pdschCfg->pdsch_TimeDomainAllocationList, \
-          sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
+   CU_ALLOC(pdschCfg->pdsch_TimeDomainAllocationList, \
+        sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
    if(!pdschCfg->pdsch_TimeDomainAllocationList)
-       {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
-               return RFAILED;
-       }
-       if(BuildPdschTimeDomAllocList(pdschCfg->pdsch_TimeDomainAllocationList) != ROK)
-       {
-          return RFAILED;
-       }
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
+   if(BuildPdschTimeDomAllocList(pdschCfg->pdsch_TimeDomainAllocationList) != ROK)
+   {
+      return RFAILED;
+   }
    pdschCfg->pdsch_AggregationFactor = NULLP;
-       pdschCfg->rateMatchPatternToAddModList = NULLP;
-       pdschCfg->rateMatchPatternToReleaseList = NULLP;
-       pdschCfg->rateMatchPatternGroup1 = NULLP;
-       pdschCfg->rateMatchPatternGroup2 = NULLP;
-       pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
-       pdschCfg->mcs_Table = NULLP;
-
-       pdschCfg->maxNrofCodeWordsScheduledByDCI = NULLP;
-       CU_ALLOC(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
-       if(!pdschCfg->maxNrofCodeWordsScheduledByDCI)
-       {
-          DU_LOG("\nF1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
-               return RFAILED;
-       }
-       *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
-       
-       if(BuildPdschPrbBundlingType(&pdschCfg->prb_BundlingType) != ROK)
-       {
-          return RFAILED;
-       }
-
-       pdschCfg->zp_CSI_RS_ResourceToAddModList = NULLP;
-       pdschCfg->zp_CSI_RS_ResourceToReleaseList = NULLP;
-       pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
-       pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
-       pdschCfg->sp_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
-       pdschCfg->sp_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
+   pdschCfg->rateMatchPatternToAddModList = NULLP;
+   pdschCfg->rateMatchPatternToReleaseList = NULLP;
+   pdschCfg->rateMatchPatternGroup1 = NULLP;
+   pdschCfg->rateMatchPatternGroup2 = NULLP;
+   pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
+   pdschCfg->mcs_Table = NULLP;
+
+   pdschCfg->maxNrofCodeWordsScheduledByDCI = NULLP;
+   CU_ALLOC(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
+   if(!pdschCfg->maxNrofCodeWordsScheduledByDCI)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
+   *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
+
+   if(BuildPdschPrbBundlingType(&pdschCfg->prb_BundlingType) != ROK)
+   {
+      return RFAILED;
+   }
+
+   pdschCfg->zp_CSI_RS_ResourceToAddModList = NULLP;
+   pdschCfg->zp_CSI_RS_ResourceToReleaseList = NULLP;
+   pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
+   pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
+   pdschCfg->sp_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
+   pdschCfg->sp_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
    pdschCfg->p_ZP_CSI_RS_ResourceSet = NULLP;
 
    return ROK;
@@ -3376,46 +3406,46 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
 {
    dlBwp->pdcch_Config = NULLP;
    CU_ALLOC(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
-       if(!dlBwp->pdcch_Config)
-       {
-          DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
+   if(!dlBwp->pdcch_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
       return RFAILED;
-       }
-       dlBwp->pdcch_Config->present = BWP_DownlinkDedicated__pdcch_Config_PR_setup; 
+   }
+   dlBwp->pdcch_Config->present = BWP_DownlinkDedicated__pdcch_Config_PR_setup; 
 
    dlBwp->pdcch_Config->choice.setup = NULLP;
-       CU_ALLOC(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
+   CU_ALLOC(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
    if(!dlBwp->pdcch_Config->choice.setup)
    {
-          DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
-               return RFAILED;
-       }
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
+   }
    if(BuildBWPDlDedPdcchCfg(dlBwp->pdcch_Config->choice.setup) != ROK)
-       {
-          return RFAILED;
-       }
+   {
+      return RFAILED;
+   }
 
    dlBwp->pdsch_Config = NULLP;
-       CU_ALLOC(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
-       if(!dlBwp->pdsch_Config)
-       {
-          DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
-               return RFAILED;
-       }
-       dlBwp->pdsch_Config->present = BWP_DownlinkDedicated__pdsch_Config_PR_setup;
+   CU_ALLOC(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
+   if(!dlBwp->pdsch_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
+   }
+   dlBwp->pdsch_Config->present = BWP_DownlinkDedicated__pdsch_Config_PR_setup;
 
    dlBwp->pdsch_Config->choice.setup = NULLP;
    CU_ALLOC(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
    if(!dlBwp->pdsch_Config->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory Allocation failure in BuildInitialDlBWP");
-               return RFAILED;
-       }
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
+   }
 
    if(BuildBWPDlDedPdschCfg(dlBwp->pdsch_Config->choice.setup) != ROK)
-       {
-          return RFAILED;
-       }
+   {
+      return RFAILED;
+   }
 
    dlBwp->sps_Config = NULLP;
    dlBwp->radioLinkMonitoringConfig = NULLP; 
@@ -3438,53 +3468,53 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildDMRSULPuschMapTypeA
+   uint8_t BuildDMRSULPuschMapTypeA
 (
-struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
-)
+ struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
+ )
 {
    dmrsUlCfg->present = PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA_PR_setup;
    dmrsUlCfg->choice.setup= NULLP;
    CU_ALLOC(dmrsUlCfg->choice.setup, sizeof(DMRS_UplinkConfig_t));
    if(!dmrsUlCfg->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
       return RFAILED;
    }
-         
+
    dmrsUlCfg->choice.setup->dmrs_Type = NULLP;
-       dmrsUlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
+   dmrsUlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
    CU_ALLOC(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
    if(!dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
       return RFAILED;
    }
    *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS; 
 
-       dmrsUlCfg->choice.setup->phaseTrackingRS = NULLP;
-       dmrsUlCfg->choice.setup->maxLength = NULLP;
+   dmrsUlCfg->choice.setup->phaseTrackingRS = NULLP;
+   dmrsUlCfg->choice.setup->maxLength = NULLP;
    dmrsUlCfg->choice.setup->transformPrecodingDisabled = NULLP;
    CU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, \
-      sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+        sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
    if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
       return RFAILED;
    }
 
    dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0 = NULLP;
    CU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
-      sizeof(long));
+        sizeof(long));
    if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
       return RFAILED;
    }
    *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
 
-       dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID1 = NULLP;
-       dmrsUlCfg->choice.setup->transformPrecodingEnabled = NULLP;
+   dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID1 = NULLP;
+   dmrsUlCfg->choice.setup->transformPrecodingEnabled = NULLP;
    return ROK;
 }
 
@@ -3505,10 +3535,10 @@ struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPuschTimeDomAllocList
+   uint8_t BuildPuschTimeDomAllocList
 (
-struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
-)
+ struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
+ )
 {
    uint8_t idx;
    uint8_t elementCnt;
@@ -3517,35 +3547,35 @@ struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
    timeDomAllocList->present = PUSCH_Config__pusch_TimeDomainAllocationList_PR_setup;
    timeDomAllocList->choice.setup = NULLP;
    CU_ALLOC(timeDomAllocList->choice.setup, \
-      sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+        sizeof(struct PUSCH_TimeDomainResourceAllocationList));
    if(!timeDomAllocList->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
       return RFAILED;
    }
-         
-   elementCnt = 1;
+
+   elementCnt = 2;
    timeDomAllocList->choice.setup->list.count = elementCnt;
    timeDomAllocList->choice.setup->list.size = \
-      elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
-       timeDomAllocList->choice.setup->list.array = NULLP;
+                                              elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
+   timeDomAllocList->choice.setup->list.array = NULLP;
    CU_ALLOC(timeDomAllocList->choice.setup->list.array, \
-      timeDomAllocList->choice.setup->list.size);
+        timeDomAllocList->choice.setup->list.size);
    if(!timeDomAllocList->choice.setup->list.array)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
       return RFAILED;
    }
 
    for(idx = 0; idx < elementCnt; idx++)
    {
-          timeDomAllocList->choice.setup->list.array[idx] = NULLP;
+      timeDomAllocList->choice.setup->list.array[idx] = NULLP;
       CU_ALLOC(timeDomAllocList->choice.setup->list.array[idx],\
-         sizeof(PUSCH_TimeDomainResourceAllocation_t));
+           sizeof(PUSCH_TimeDomainResourceAllocation_t));
       if(!timeDomAllocList->choice.setup->list.array[idx])
       {
-         DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
-         return RFAILED;
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+        return RFAILED;
       }
    }
 
@@ -3554,12 +3584,25 @@ struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
    CU_ALLOC(timeDomAlloc->k2, sizeof(long));
    if(!timeDomAlloc->k2)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
       return RFAILED;
    }
-   *(timeDomAlloc->k2) = PUSCH_K2;
+   *(timeDomAlloc->k2) = PUSCH_K2_CFG1;
+   timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
+   timeDomAlloc->startSymbolAndLength = 66; 
+
+   idx++;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   CU_ALLOC(timeDomAlloc->k2, sizeof(long));
+   if(!timeDomAlloc->k2)
+   {
+       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+       return RFAILED;
+   }
+   *(timeDomAlloc->k2) = PUSCH_K2_CFG2;
    timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = 27; 
+   timeDomAlloc->startSymbolAndLength = 66;
+
    return ROK;
 }
 
@@ -3586,18 +3629,18 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
    CU_ALLOC(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
    if(!puschCfg->dataScramblingIdentityPUSCH)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
    *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
 
    puschCfg->txConfig = NULLP;
-       puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
+   puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
    CU_ALLOC(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
-      sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+        sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
    if(!puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
 
@@ -3607,17 +3650,17 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
    }
 
    puschCfg->dmrs_UplinkForPUSCH_MappingTypeB = NULLP;
-       puschCfg->pusch_PowerControl = NULLP;
-       puschCfg->frequencyHopping = NULLP;
-       puschCfg->frequencyHoppingOffsetLists = NULLP;
+   puschCfg->pusch_PowerControl = NULLP;
+   puschCfg->frequencyHopping = NULLP;
+   puschCfg->frequencyHoppingOffsetLists = NULLP;
    puschCfg->resourceAllocation = RES_ALLOC_TYPE;
 
    puschCfg->pusch_TimeDomainAllocationList = NULLP;
    CU_ALLOC(puschCfg->pusch_TimeDomainAllocationList, \
-      sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+        sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
    if(!puschCfg->pusch_TimeDomainAllocationList)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
 
@@ -3627,22 +3670,77 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
    }
 
    puschCfg->pusch_AggregationFactor = NULLP;
-       puschCfg->mcs_Table = NULLP;
-       puschCfg->mcs_TableTransformPrecoder = NULLP;
+   puschCfg->mcs_Table = NULLP;
+   puschCfg->mcs_TableTransformPrecoder = NULLP;
    puschCfg->transformPrecoder = NULLP;
    CU_ALLOC(puschCfg->transformPrecoder, sizeof(long));
    if(!puschCfg->transformPrecoder)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedPuschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
    *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
 
-       puschCfg->codebookSubset = NULLP;
-       puschCfg->maxRank = NULLP;
-       puschCfg->rbg_Size = NULLP;
-       puschCfg->uci_OnPUSCH = NULLP;
-       puschCfg->tp_pi2BPSK = NULLP;
+   puschCfg->codebookSubset = NULLP;
+   puschCfg->maxRank = NULLP;
+   puschCfg->rbg_Size = NULLP;
+   puschCfg->uci_OnPUSCH = NULLP;
+   puschCfg->tp_pi2BPSK = NULLP;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds BWP UL dedicated PUCCH Config
+ *
+ * @details
+ *
+ *    Function : BuildBWPUlDedPucchCfg
+ *
+ *    Functionality:
+ *      Builds BWP UL dedicated PUCCH Config
+ *
+ * @params[in] : PUCCH_Config_t *pucchCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPUlDedPucchCfg(PUCCH_Config_t *pucchCfg)
+{
+   uint8_t arrIdx, elementCnt;
+
+   CU_ALLOC(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
+   if(pucchCfg->dl_DataToUL_ACK == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+      return RFAILED;
+   }
+
+   elementCnt = 2;
+   pucchCfg->dl_DataToUL_ACK->list.count = elementCnt;
+   pucchCfg->dl_DataToUL_ACK->list.size = elementCnt * sizeof(long *);
+   CU_ALLOC(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size);
+   if(pucchCfg->dl_DataToUL_ACK->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+      return RFAILED;
+   }
+
+   for(arrIdx = 0; arrIdx <  pucchCfg->dl_DataToUL_ACK->list.count; arrIdx++)
+   {
+      CU_ALLOC(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx], sizeof(long));
+      if(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx] == NULLP)
+      {
+          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+          return RFAILED;
+      }
+   }
+
+   arrIdx = 0;
+   *(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx++]) = 1;
+   *(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx]) = 2;
 
    return ROK;
 }
@@ -3674,17 +3772,17 @@ uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *reso
    CU_ALLOC(resourceList->list.array, resourceList->list.size);
    if(!resourceList->list.array)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
       return RFAILED;
    }
+
    for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
    {
       CU_ALLOC(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
       if(!resourceList->list.array[rsrcIdx])
       {
-         DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
-         return RFAILED;
+        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+        return RFAILED;
       }
    }
 
@@ -3695,23 +3793,23 @@ uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *reso
 
    resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2 = NULLP;
    CU_ALLOC(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2, \
-      sizeof(struct SRS_Resource__transmissionComb__n2));
+        sizeof(struct SRS_Resource__transmissionComb__n2));
    if(!resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
       return RFAILED;
    }
    resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->combOffset_n2\
-          = SRS_COMB_OFFSET_N2;
+      = SRS_COMB_OFFSET_N2;
    resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->cyclicShift_n2\
-          = SRS_CYCLIC_SHIFT_N2;
+      = SRS_CYCLIC_SHIFT_N2;
 
    resourceList->list.array[rsrcIdx]->resourceMapping.startPosition = \
-          0;
+                                                                     0;
    resourceList->list.array[rsrcIdx]->resourceMapping.nrofSymbols =  \
-      SRS_Resource__resourceMapping__nrofSymbols_n1;
+                                                                    SRS_Resource__resourceMapping__nrofSymbols_n1;
    resourceList->list.array[rsrcIdx]->resourceMapping.repetitionFactor = \
-      SRS_Resource__resourceMapping__repetitionFactor_n1;
+                                                                        SRS_Resource__resourceMapping__repetitionFactor_n1;
 
    resourceList->list.array[rsrcIdx]->freqDomainPosition = SRS_FREQ_DOM_POS;
    resourceList->list.array[rsrcIdx]->freqDomainShift = SRS_FREQ_DOM_SHIFT;
@@ -3719,17 +3817,17 @@ uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *reso
    resourceList->list.array[rsrcIdx]->freqHopping.b_SRS = B_SRS;
    resourceList->list.array[rsrcIdx]->freqHopping.b_hop = B_HOP;
    resourceList->list.array[rsrcIdx]->groupOrSequenceHopping = \
-      SRS_Resource__groupOrSequenceHopping_neither;
+                                                              SRS_Resource__groupOrSequenceHopping_neither;
 
    /* Setting resource type to aperiodic for intergration purposes */
    resourceList->list.array[rsrcIdx]->resourceType.present = \
-          SRS_Resource__resourceType_PR_aperiodic;
+                                                            SRS_Resource__resourceType_PR_aperiodic;
    resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic = NULLP;
    CU_ALLOC(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,
-      sizeof(struct SRS_Resource__resourceType__aperiodic));
+        sizeof(struct SRS_Resource__resourceType__aperiodic));
    if(!resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
       return RFAILED;
    }
    resourceList->list.array[rsrcIdx]->sequenceId = SRS_SEQ_ID;
@@ -3752,15 +3850,15 @@ uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *reso
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSrsRsrcSetAddModList
+   uint8_t BuildSrsRsrcSetAddModList
 (
-struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
-)
+ struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
+ )
 {
    uint8_t  elementCnt;
    uint8_t  rSetIdx;
-       uint8_t  rsrcIdx;
-       struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList;
+   uint8_t  rsrcIdx;
+   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList;
 
    elementCnt = 1;
    rsrcSetList->list.count = elementCnt;
@@ -3769,7 +3867,7 @@ struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
    CU_ALLOC(rsrcSetList->list.array, rsrcSetList->list.size);
    if(!rsrcSetList->list.array)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
       return RFAILED;
    }
 
@@ -3778,74 +3876,74 @@ struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
       CU_ALLOC(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
       if(!rsrcSetList->list.array[rSetIdx])
       {
-         DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-         return RFAILED;
+        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+        return RFAILED;
       }
    }
 
    rSetIdx = 0;
    rsrcSetList->list.array[rSetIdx]->srs_ResourceSetId = SRS_RSET_ID;
 
-       /* Fill Resource Id list in resource set */
-       rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList = NULLP;
-       CU_ALLOC(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
-          sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
-       if(!rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
-       {
-          DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-               return RFAILED;
-       }
-
-       elementCnt = 1;
-       rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
-       rsrcIdList->list.count = elementCnt;
-       rsrcIdList->list.size = elementCnt * sizeof(SRS_ResourceId_t *);
-       rsrcIdList->list.array = NULLP;
-       CU_ALLOC(rsrcIdList->list.array, rsrcIdList->list.size);
-       if(!rsrcIdList->list.array)
-       {
-          DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-               return RFAILED;
-       }
-
-       for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
-       {
-          CU_ALLOC(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
-               if(!rsrcIdList->list.array[rsrcIdx])
-               {
-                  DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-                       return RFAILED;
-               }
-       }
-
-       rsrcIdx = 0;
-       *rsrcIdList->list.array[rsrcIdx] = SRS_RSRC_ID;
-
-       /* Fill resource type */
-   rsrcSetList->list.array[rSetIdx]->resourceType.present = \
-      SRS_ResourceSet__resourceType_PR_aperiodic;
-
-   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic = NULLP;
-   CU_ALLOC(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
-      sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
-   if(!rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic)
+   /* Fill Resource Id list in resource set */
+   rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList = NULLP;
+   CU_ALLOC(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+        sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+   if(!rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
    {
-          DU_LOG("\nF1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-               return RFAILED;
-       }
-   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->aperiodicSRS_ResourceTrigger \
-          = APERIODIC_SRS_RESRC_TRIGGER;
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
+      return RFAILED;
+   }
 
-       /* TODO : Fill values for below IEs as expected by Viavi */
-       rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->csi_RS = NULLP;
-   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->slotOffset = NULLP;
-  
+   elementCnt = 1;
+   rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+   rsrcIdList->list.count = elementCnt;
+   rsrcIdList->list.size = elementCnt * sizeof(SRS_ResourceId_t *);
+   rsrcIdList->list.array = NULLP;
+   CU_ALLOC(rsrcIdList->list.array, rsrcIdList->list.size);
+   if(!rsrcIdList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+      return RFAILED;
+   }
+
+   for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+   {
+      CU_ALLOC(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+      if(!rsrcIdList->list.array[rsrcIdx])
+      {
+        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+        return RFAILED;
+      }
+   }
+
+   rsrcIdx = 0;
+   *rsrcIdList->list.array[rsrcIdx] = SRS_RSRC_ID;
+
+   /* Fill resource type */
+   rsrcSetList->list.array[rSetIdx]->resourceType.present = \
+                                                           SRS_ResourceSet__resourceType_PR_aperiodic;
+
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic = NULLP;
+   CU_ALLOC(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+        sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+   if(!rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+      return RFAILED;
+   }
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->aperiodicSRS_ResourceTrigger \
+      = APERIODIC_SRS_RESRC_TRIGGER;
+
+   /* TODO : Fill values for below IEs as expected by Viavi */
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->csi_RS = NULLP;
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->slotOffset = NULLP;
 
-   rsrcSetList->list.array[rSetIdx]->usage = SRS_ResourceSet__usage_codebook;
-       rsrcSetList->list.array[rSetIdx]->alpha = NULLP;
-       rsrcSetList->list.array[rSetIdx]->p0 = NULLP;
-       rsrcSetList->list.array[rSetIdx]->pathlossReferenceRS = NULLP;
-       rsrcSetList->list.array[rSetIdx]->srs_PowerControlAdjustmentStates = NULLP;
+
+   rsrcSetList->list.array[rSetIdx]->usage = SRS_ResourceSet__usage_codebook;
+   rsrcSetList->list.array[rSetIdx]->alpha = NULLP;
+   rsrcSetList->list.array[rSetIdx]->p0 = NULLP;
+   rsrcSetList->list.array[rSetIdx]->pathlossReferenceRS = NULLP;
+   rsrcSetList->list.array[rSetIdx]->srs_PowerControlAdjustmentStates = NULLP;
 
    return ROK;
 }
@@ -3870,10 +3968,10 @@ uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
    srsCfg->srs_ResourceSetToReleaseList = NULLP;
    srsCfg->srs_ResourceSetToAddModList = NULLP;
    CU_ALLOC(srsCfg->srs_ResourceSetToAddModList, \
-      sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
+        sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
    if(!srsCfg->srs_ResourceSetToAddModList)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
       return RFAILED;
    }
    if(BuildSrsRsrcSetAddModList(srsCfg->srs_ResourceSetToAddModList) != ROK)
@@ -3886,10 +3984,10 @@ uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
    /* Resource to Add/Modify list */
    srsCfg->srs_ResourceToAddModList = NULLP;
    CU_ALLOC(srsCfg->srs_ResourceToAddModList, \
-      sizeof(struct SRS_Config__srs_ResourceToAddModList));
+        sizeof(struct SRS_Config__srs_ResourceToAddModList));
    if(!srsCfg->srs_ResourceToAddModList)
    {
-      DU_LOG("\nF1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
       return RFAILED;
    }
 
@@ -3921,22 +4019,43 @@ uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
 uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
 {
    ulBwp->pucch_Config = NULLP;
+   ulBwp->pucch_Config = NULLP;
+   CU_ALLOC(ulBwp->pucch_Config, sizeof(struct BWP_UplinkDedicated__pucch_Config));
+   if(!ulBwp->pucch_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
+
+   ulBwp->pucch_Config->present = BWP_UplinkDedicated__pucch_Config_PR_setup;
+   ulBwp->pucch_Config->choice.setup = NULLP;
+   CU_ALLOC(ulBwp->pucch_Config->choice.setup, sizeof(PUCCH_Config_t));
+   if(!ulBwp->pucch_Config->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
+
+   if(BuildBWPUlDedPucchCfg(ulBwp->pucch_Config->choice.setup) != ROK)
+   {
+      return RFAILED;
+   }
 
    /* Fill BWP UL dedicated PUSCH config */
-       ulBwp->pusch_Config = NULLP;
+   ulBwp->pusch_Config = NULLP;
    CU_ALLOC(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
    if(!ulBwp->pusch_Config)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
-   
+
    ulBwp->pusch_Config->present = BWP_UplinkDedicated__pusch_Config_PR_setup;
    ulBwp->pusch_Config->choice.setup = NULLP;
    CU_ALLOC(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
    if(!ulBwp->pusch_Config->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
 
@@ -3945,14 +4064,14 @@ uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
       return RFAILED;
    }
 
-       ulBwp->configuredGrantConfig = NULLP;
+   ulBwp->configuredGrantConfig = NULLP;
 
    /* Fill BPW UL dedicated SRS config */
-       ulBwp->srs_Config = NULLP;
+   ulBwp->srs_Config = NULLP;
    CU_ALLOC(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
    if(!ulBwp->srs_Config)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
 
@@ -3961,7 +4080,7 @@ uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
    CU_ALLOC(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
    if(!ulBwp->srs_Config->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildInitialUlBWP");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
 
@@ -3970,27 +4089,27 @@ uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
       return RFAILED;   
    }
 
-       ulBwp->beamFailureRecoveryConfig = NULLP;
-   
+   ulBwp->beamFailureRecoveryConfig = NULLP;
+
    return ROK;
 }
 
 /*******************************************************************
-*
-* @brief Builds Pusch Serving cell Config
-*
-* @details
-*
-*    Function : BuildPuschSrvCellCfg
-*
-*    Functionality: Builds Pusch Serving cell Config
-*
-* @params[in] struct UplinkConfig__pusch_ServingCellConfig *puschCfg
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds Pusch Serving cell Config
+ *
+ * @details
+ *
+ *    Function : BuildPuschSrvCellCfg
+ *
+ *    Functionality: Builds Pusch Serving cell Config
+ *
+ * @params[in] struct UplinkConfig__pusch_ServingCellConfig *puschCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *puschCfg)
 {
    puschCfg->present = UplinkConfig__pusch_ServingCellConfig_PR_setup;
@@ -3998,18 +4117,18 @@ uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *pusch
    CU_ALLOC(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
    if(!puschCfg->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
       return RFAILED;
    }
 
    puschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
-       puschCfg->choice.setup->rateMatching = NULLP;
-       puschCfg->choice.setup->xOverhead = NULLP;
+   puschCfg->choice.setup->rateMatching = NULLP;
+   puschCfg->choice.setup->xOverhead = NULLP;
    puschCfg->choice.setup->ext1 = NULLP;
    CU_ALLOC(puschCfg->choice.setup->ext1, sizeof(struct PUSCH_ServingCellConfig__ext1));
    if(!puschCfg->choice.setup->ext1)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
       return RFAILED;
    }
 
@@ -4017,7 +4136,7 @@ uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *pusch
    CU_ALLOC(puschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
    if(!puschCfg->choice.setup->ext1->maxMIMO_Layers)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
       return RFAILED;
    }
    *(puschCfg->choice.setup->ext1->maxMIMO_Layers) = PUSCH_MAX_MIMO_LAYERS;
@@ -4026,7 +4145,7 @@ uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *pusch
    CU_ALLOC(puschCfg->choice.setup->ext1->processingType2Enabled,sizeof(BOOLEAN_t));
    if(!puschCfg->choice.setup->ext1->processingType2Enabled)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
       return RFAILED;
    }
    *(puschCfg->choice.setup->ext1->processingType2Enabled) = PUSCH_PROCESS_TYPE2_ENABLED;
@@ -4052,34 +4171,34 @@ uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
 {
    ulCfg->initialUplinkBWP = NULLP;
    CU_ALLOC(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
-       if(!ulCfg->initialUplinkBWP)
-       {
-          DU_LOG("\nF1AP : Memory Allocation failed in BuildUlCfg");
-               return RFAILED;
-       }
+   if(!ulCfg->initialUplinkBWP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
+      return RFAILED;
+   }
 
    if(BuildInitialUlBWP(ulCfg->initialUplinkBWP) != ROK)
-       {
-          return RFAILED;
-       }
+   {
+      return RFAILED;
+   }
 
    ulCfg->uplinkBWP_ToReleaseList = NULLP;
-       ulCfg->uplinkBWP_ToAddModList = NULLP;
-       ulCfg->firstActiveUplinkBWP_Id = NULLP;
+   ulCfg->uplinkBWP_ToAddModList = NULLP;
+   ulCfg->firstActiveUplinkBWP_Id = NULLP;
    CU_ALLOC(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
    if(!ulCfg->firstActiveUplinkBWP_Id)
    {
-      DU_LOG("\nF1AP : Memory Allocation failed in BuildUlCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
       return RFAILED;
    }
    *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
 
    ulCfg->pusch_ServingCellConfig = NULLP;
    CU_ALLOC(ulCfg->pusch_ServingCellConfig, \
-      sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+        sizeof(struct UplinkConfig__pusch_ServingCellConfig));
    if(!ulCfg->pusch_ServingCellConfig)
    {
-      DU_LOG("\nF1AP : Memory Allocation failed in BuildUlCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
       return RFAILED;
    }
 
@@ -4087,10 +4206,10 @@ uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
    {
       return RFAILED;
    }
-   
-       ulCfg->carrierSwitching = NULLP;
-       ulCfg->ext1 = NULLP;
-       return ROK;
+
+   ulCfg->carrierSwitching = NULLP;
+   ulCfg->ext1 = NULLP;
+   return ROK;
 }
 
 /*******************************************************************
@@ -4115,22 +4234,22 @@ uint8_t BuildPdschSrvCellCfg(struct ServingCellConfig__pdsch_ServingCellConfig *
    CU_ALLOC(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
    if(!pdschCfg->choice.setup)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
       return RFAILED;
    }
 
    pdschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
-       pdschCfg->choice.setup->xOverhead = NULLP;
+   pdschCfg->choice.setup->xOverhead = NULLP;
    pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH = NULLP;
    CU_ALLOC(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH, sizeof(long));
    if(!pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)
    {
-      DU_LOG("\nF1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
       return RFAILED;
    }
    *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)= PDSCH_NUM_HARQ_PROC;
-       pdschCfg->choice.setup->pucch_Cell = NULLP;
-       pdschCfg->choice.setup->ext1 = NULLP;
+   pdschCfg->choice.setup->pucch_Cell = NULLP;
+   pdschCfg->choice.setup->ext1 = NULLP;
 
    return ROK;
 }
@@ -4177,94 +4296,94 @@ uint8_t BuildSpCellCfgDed(ServingCellConfig_t *srvCellCfg)
 
    srvCellCfg->initialDownlinkBWP = NULLP;
    CU_ALLOC(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
-       if(!srvCellCfg->initialDownlinkBWP)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
+   if(!srvCellCfg->initialDownlinkBWP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
 
    if(BuildInitialDlBWP(srvCellCfg->initialDownlinkBWP) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildInitialDlBWP failed");
-               return RFAILED;
-       }
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildInitialDlBWP failed");
+      return RFAILED;
+   }
    srvCellCfg->downlinkBWP_ToReleaseList = NULLP;
-       srvCellCfg->downlinkBWP_ToAddModList = NULLP;
+   srvCellCfg->downlinkBWP_ToAddModList = NULLP;
 
    srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
-       CU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
-       if(!srvCellCfg->firstActiveDownlinkBWP_Id)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
-       *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+   CU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+   if(!srvCellCfg->firstActiveDownlinkBWP_Id)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+   *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
 
-       srvCellCfg->bwp_InactivityTimer = NULLP;
+   srvCellCfg->bwp_InactivityTimer = NULLP;
 
    srvCellCfg->defaultDownlinkBWP_Id = NULLP;
-       CU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
-       if(!srvCellCfg->defaultDownlinkBWP_Id)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
-       *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+   CU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+   if(!srvCellCfg->defaultDownlinkBWP_Id)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+   *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
 
    srvCellCfg->uplinkConfig = NULLP;
    CU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
-       if(!srvCellCfg->uplinkConfig)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
+   if(!srvCellCfg->uplinkConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
 
    if(BuildUlCfg(srvCellCfg->uplinkConfig) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildUlCfg failed");
-               return RFAILED;
-       }
-       srvCellCfg->supplementaryUplink = NULLP;
-       srvCellCfg->pdcch_ServingCellConfig = NULLP;
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildUlCfg failed");
+      return RFAILED;
+   }
+   srvCellCfg->supplementaryUplink = NULLP;
+   srvCellCfg->pdcch_ServingCellConfig = NULLP;
 
    srvCellCfg->pdsch_ServingCellConfig = NULLP;
-       CU_ALLOC(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct     ServingCellConfig__pdsch_ServingCellConfig));
-       if(!srvCellCfg->pdsch_ServingCellConfig)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
+   CU_ALLOC(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct ServingCellConfig__pdsch_ServingCellConfig));
+   if(!srvCellCfg->pdsch_ServingCellConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
 
    if(BuildPdschSrvCellCfg(srvCellCfg->pdsch_ServingCellConfig) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildPdschSrvCellCfg failed");
-               return RFAILED;
-       }
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildPdschSrvCellCfg failed");
+      return RFAILED;
+   }
 
    srvCellCfg->csi_MeasConfig = NULLP;
 #if 0
-       CU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct      ServingCellConfig__csi_MeasConfig))
-       if(!srvCellCfg->csi_MeasConfig)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfgDed");
-               return RFAILED;
-       }
+   CU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct  ServingCellConfig__csi_MeasConfig))
+      if(!srvCellCfg->csi_MeasConfig)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+        return RFAILED;
+      }
 
    if(BuildCsiMeasCfg(srvCellCfg->csi_MeasConfig) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
-               return RFAILED;
-       }
+   {
+      DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
+      return RFAILED;
+   }
 #endif
    srvCellCfg->sCellDeactivationTimer = NULLP;
-       srvCellCfg->crossCarrierSchedulingConfig = NULLP;
-       srvCellCfg->tag_Id = TAG_ID;
+   srvCellCfg->crossCarrierSchedulingConfig = NULLP;
+   srvCellCfg->tag_Id = TAG_ID;
    srvCellCfg->dummy = NULLP;
    srvCellCfg->pathlossReferenceLinking = NULLP;
    srvCellCfg->servingCellMO = NULLP;
    srvCellCfg->ext1 = NULLP;
 
-       return ROK;
+   return ROK;
 }
 /*******************************************************************
  *
@@ -4286,356 +4405,356 @@ uint8_t BuildSpCellCfg(SpCellConfig_t *spCellCfg)
 {
 
    spCellCfg->servCellIndex = NULLP;
-       CU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
-       if(!spCellCfg->servCellIndex)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
-               return RFAILED;
-       }
+   CU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
+   if(!spCellCfg->servCellIndex)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      return RFAILED;
+   }
    *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
 
    spCellCfg->reconfigurationWithSync = NULLP;
-       spCellCfg->rlf_TimersAndConstants = NULLP;
+   spCellCfg->rlf_TimersAndConstants = NULLP;
    spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
-       CU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
-       if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
-               return RFAILED;
-       }
+   CU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+   if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      return RFAILED;
+   }
    *(spCellCfg->rlmInSyncOutOfSyncThreshold) = RLM_SYNC_OUT_SYNC_THRESHOLD;
 
    spCellCfg->spCellConfigDedicated = NULLP;
    CU_ALLOC(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
-       if(!spCellCfg->spCellConfigDedicated)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSpCellCfg");
-               return RFAILED;
-       }
+   if(!spCellCfg->spCellConfigDedicated)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      return RFAILED;
+   }
    if(BuildSpCellCfgDed(spCellCfg->spCellConfigDedicated) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildSpCellCfgDed failed");
-               return RFAILED;
-       }
-       return ROK;
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfgDed failed");
+      return RFAILED;
+   }
+   return ROK;
 }
 /*******************************************************************
-*
-* @brief Builds Phy cell group config 
-*
-* @details
-*
-*    Function : BuildPhyCellGrpCfg 
-*
-*    Functionality: Builds Phy cell group config in DuToCuRrcContainer
-*
-* @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds Phy cell group config 
+ *
+ * @details
+ *
+ *    Function : BuildPhyCellGrpCfg 
+ *
+ *    Functionality: Builds Phy cell group config in DuToCuRrcContainer
+ *
+ * @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildPhyCellGrpCfg(PhysicalCellGroupConfig_t *phyCellGrpCfg)
 {
    phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
-       phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
+   phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
 
    phyCellGrpCfg->p_NR_FR1 = NULLP;
-       CU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
-       if(!phyCellGrpCfg->p_NR_FR1)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildPhyCellGrpCfg");
-               return RFAILED;
-       }
+   CU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
+   if(!phyCellGrpCfg->p_NR_FR1)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhyCellGrpCfg");
+      return RFAILED;
+   }
    *(phyCellGrpCfg->p_NR_FR1)             = P_NR_FR1;
-       phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
-       phyCellGrpCfg->tpc_SRS_RNTI = NULLP;
-       phyCellGrpCfg->tpc_PUCCH_RNTI = NULLP;
-       phyCellGrpCfg->tpc_PUSCH_RNTI = NULLP;
-       phyCellGrpCfg->sp_CSI_RNTI = NULLP;
-       phyCellGrpCfg->cs_RNTI = NULLP;
-       phyCellGrpCfg->ext1 = NULLP;
-       phyCellGrpCfg->ext2 = NULLP;
-
-       return ROK;
+   phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
+   phyCellGrpCfg->tpc_SRS_RNTI = NULLP;
+   phyCellGrpCfg->tpc_PUCCH_RNTI = NULLP;
+   phyCellGrpCfg->tpc_PUSCH_RNTI = NULLP;
+   phyCellGrpCfg->sp_CSI_RNTI = NULLP;
+   phyCellGrpCfg->cs_RNTI = NULLP;
+   phyCellGrpCfg->ext1 = NULLP;
+   phyCellGrpCfg->ext2 = NULLP;
+
+   return ROK;
 }
 
 /*******************************************************************
-*
-* @brief Builds tag config 
-*
-* @details
-*
-*    Function : BuildTagConfig 
-*
-*    Functionality: Builds tag config in MacCellGroupConfig
-*
-* @params[in] TAG_Config *tag_Config
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds tag config 
+ *
+ * @details
+ *
+ *    Function : BuildTagConfig 
+ *
+ *    Functionality: Builds tag config in MacCellGroupConfig
+ *
+ * @params[in] TAG_Config *tag_Config
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
 {
-       struct TAG_Config__tag_ToAddModList *tagList;
+   struct TAG_Config__tag_ToAddModList *tagList;
    uint8_t                     idx, elementCnt;
 
    tagConfig->tag_ToReleaseList = NULLP;
    tagConfig->tag_ToAddModList = NULLP;
    CU_ALLOC(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
-       if(!tagConfig->tag_ToAddModList)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildTagConfig");
-               return RFAILED;
-       }
+   if(!tagConfig->tag_ToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+      return RFAILED;
+   }
 
-       elementCnt = 1; //ODU_VALUE_ONE;
-       tagList = tagConfig->tag_ToAddModList;
-       tagList->list.count = elementCnt;
-       tagList->list.size  =  elementCnt * sizeof(struct TAG *);
+   elementCnt = 1; //ODU_VALUE_ONE;
+   tagList = tagConfig->tag_ToAddModList;
+   tagList->list.count = elementCnt;
+   tagList->list.size  =  elementCnt * sizeof(struct TAG *);
 
    tagList->list.array = NULLP;
-       CU_ALLOC(tagList->list.array, tagList->list.size);
-       if(!tagList->list.array)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildTagConfig");
-               return RFAILED;
-       }
-
-       for(idx=0; idx<tagList->list.count; idx++)
-       {
-          tagList->list.array[idx] = NULLP;
-               CU_ALLOC(tagList->list.array[idx], sizeof(struct TAG));
-               if(!tagList->list.array[idx])
-               {
-                       DU_LOG("\nF1AP : Memory allocation failure in BuildTagConfig");
-                       return RFAILED;
-               }
-       }
-
-       idx = 0;
-       tagList->list.array[idx]->tag_Id = TAG_ID;
-       tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
+   CU_ALLOC(tagList->list.array, tagList->list.size);
+   if(!tagList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+      return RFAILED;
+   }
+
+   for(idx=0; idx<tagList->list.count; idx++)
+   {
+      tagList->list.array[idx] = NULLP;
+      CU_ALLOC(tagList->list.array[idx], sizeof(struct TAG));
+      if(!tagList->list.array[idx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+        return RFAILED;
+      }
+   }
+
+   idx = 0;
+   tagList->list.array[idx]->tag_Id = TAG_ID;
+   tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
 
    return ROK;
 }
 
 /*******************************************************************
-*
-* @brief Builds PHR Config 
-*
-* @details
-*
-*    Function : BuildPhrConfig
-*
-*    Functionality: Builds phrConfig in MacCellGroupConfig
-*
-* @params[in] PHR Config *
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds PHR Config 
+ *
+ * @details
+ *
+ *    Function : BuildPhrConfig
+ *
+ *    Functionality: Builds phrConfig in MacCellGroupConfig
+ *
+ * @params[in] PHR Config *
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildPhrConfig(struct MAC_CellGroupConfig__phr_Config *phrConfig)
 {
 
    phrConfig->present = MAC_CellGroupConfig__phr_Config_PR_setup;
-       phrConfig->choice.setup = NULLP;
-       CU_ALLOC(phrConfig->choice.setup, sizeof(struct PHR_Config));
-       if(!phrConfig->choice.setup)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildPhrConfig");
-               return RFAILED;
-       }
-
-       phrConfig->choice.setup->phr_PeriodicTimer        = PHR_PERIODIC_TMR;
-       phrConfig->choice.setup->phr_ProhibitTimer        = PHR_PROHIBHIT_TMR;
+   phrConfig->choice.setup = NULLP;
+   CU_ALLOC(phrConfig->choice.setup, sizeof(struct PHR_Config));
+   if(!phrConfig->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhrConfig");
+      return RFAILED;
+   }
+
+   phrConfig->choice.setup->phr_PeriodicTimer        = PHR_PERIODIC_TMR;
+   phrConfig->choice.setup->phr_ProhibitTimer        = PHR_PROHIBHIT_TMR;
    phrConfig->choice.setup->phr_Tx_PowerFactorChange = PHR_PWR_FACTOR_CHANGE;
-       phrConfig->choice.setup->multiplePHR              = false;
-       phrConfig->choice.setup->dummy                    = false;
-       phrConfig->choice.setup->phr_Type2OtherCell       = false;
-       phrConfig->choice.setup->phr_ModeOtherCG          = PHR_MODE_OTHER_CG;
+   phrConfig->choice.setup->multiplePHR              = false;
+   phrConfig->choice.setup->dummy                    = false;
+   phrConfig->choice.setup->phr_Type2OtherCell       = false;
+   phrConfig->choice.setup->phr_ModeOtherCG          = PHR_MODE_OTHER_CG;
 
-       return ROK;
+   return ROK;
 }
 
 /*******************************************************************
-*
-* @brief Builds BSR Config 
-*
-* @details
-*
-*    Function : BuildBsrConfig
-*
-*    Functionality: Builds BuildBsrConfig in MacCellGroupConfig
-*
-* @params[in] BSR_Config *bsrConfig
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds BSR Config 
+ *
+ * @details
+ *
+ *    Function : BuildBsrConfig
+ *
+ *    Functionality: Builds BuildBsrConfig in MacCellGroupConfig
+ *
+ * @params[in] BSR_Config *bsrConfig
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildBsrConfig(struct BSR_Config *bsrConfig)
 {
    bsrConfig->periodicBSR_Timer = PERIODIC_BSR_TMR;
-       bsrConfig->retxBSR_Timer     = RETX_BSR_TMR;
-       bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+   bsrConfig->retxBSR_Timer     = RETX_BSR_TMR;
+   bsrConfig->logicalChannelSR_DelayTimer = NULLP;
 
    return ROK;
 }
 
 /*******************************************************************
-*
-* @brief Builds scheduling request config 
-*
-* @details
-*
-*    Function : BuildSchedulingReqConfig 
-*
-*    Functionality: Builds BuildSchedulingReqConfig in MacCellGroupConfig
-*
-* @params[in] SchedulingRequestConfig *schedulingRequestConfig
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds scheduling request config 
+ *
+ * @details
+ *
+ *    Function : BuildSchedulingReqConfig 
+ *
+ *    Functionality: Builds BuildSchedulingReqConfig in MacCellGroupConfig
+ *
+ * @params[in] SchedulingRequestConfig *schedulingRequestConfig
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingRequestConfig)
 {
-       struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList;
+   struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList;
    uint8_t                     idx, elementCnt;
 
    schedulingRequestConfig->schedulingRequestToAddModList = NULLP;
-       CU_ALLOC(schedulingRequestConfig->schedulingRequestToAddModList,
-                       sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));
-       if(!schedulingRequestConfig->schedulingRequestToAddModList)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSchedulingReqConfig");
-               return RFAILED;
-       }
-
-       elementCnt = 1; //ODU_VALUE_ONE;
-       schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
-       schReqList->list.count = elementCnt;
+   CU_ALLOC(schedulingRequestConfig->schedulingRequestToAddModList,
+        sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));
+   if(!schedulingRequestConfig->schedulingRequestToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+      return RFAILED;
+   }
+
+   elementCnt = 1; //ODU_VALUE_ONE;
+   schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
+   schReqList->list.count = elementCnt;
    schReqList->list.size  = elementCnt * sizeof(struct SchedulingRequestToAddMod *);
 
    schReqList->list.array = NULLP;
    CU_ALLOC(schReqList->list.array, schReqList->list.size);
-       if(!schReqList->list.array)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSchedulingReqConfig");
-               return RFAILED;
-       }
+   if(!schReqList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+      return RFAILED;
+   }
 
    for(idx=0;idx<schReqList->list.count; idx++)
-       {
-          schReqList->list.array[idx] = NULLP;
-               CU_ALLOC(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
-               if(!schReqList->list.array[idx])
-               {
-                       DU_LOG("\nF1AP : Memory allocation failure in BuildSchedulingReqConfig");
-                       return RFAILED;
-               }
-       }
-
-       idx = 0;
-       schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
-
-   schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
-       CU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
-       if(!schReqList->list.array[idx]->sr_ProhibitTimer)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildSchedulingReqConfig");
-               return RFAILED;
-       }
+   {
+      schReqList->list.array[idx] = NULLP;
+      CU_ALLOC(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
+      if(!schReqList->list.array[idx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+        return RFAILED;
+      }
+   }
+
+   idx = 0;
+   schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
+
+   schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
+   CU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+   if(!schReqList->list.array[idx]->sr_ProhibitTimer)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+      return RFAILED;
+   }
    *(schReqList->list.array[idx]->sr_ProhibitTimer) = SR_PROHIBIT_TMR;
-       schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
-       schedulingRequestConfig->schedulingRequestToReleaseList = NULLP;
+   schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
+   schedulingRequestConfig->schedulingRequestToReleaseList = NULLP;
 
-       return ROK;
+   return ROK;
 }
 /*******************************************************************
-*
-* @brief Builds Mac cell group config 
-*
-* @details
-*
-*    Function : BuildMacCellGrpCfg 
-*
-*    Functionality: Builds Mac cell group config in DuToCuRrcContainer
-*
-* @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds Mac cell group config 
+ *
+ * @details
+ *
+ *    Function : BuildMacCellGrpCfg 
+ *
+ *    Functionality: Builds Mac cell group config in DuToCuRrcContainer
+ *
+ * @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
 {
    macCellGrpCfg->drx_Config = NULLP;
    macCellGrpCfg->schedulingRequestConfig = NULLP;
-       CU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
-       if(!macCellGrpCfg->schedulingRequestConfig)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
-               return RFAILED;
-       }
-
-       if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
-       {
-          DU_LOG("\nF1AP : BuildSchedulingReqConfig failed");
-               return RFAILED;
-       }
+   CU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
+   if(!macCellGrpCfg->schedulingRequestConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
+
+   if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildSchedulingReqConfig failed");
+      return RFAILED;
+   }
 
    macCellGrpCfg->bsr_Config = NULLP;
    CU_ALLOC(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
-       if(!macCellGrpCfg->bsr_Config)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
-               return RFAILED;
-       }
+   if(!macCellGrpCfg->bsr_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
 
    if(BuildBsrConfig(macCellGrpCfg->bsr_Config) != ROK)
-       {
-      DU_LOG("\nF1AP : BuildBsrConfig failed");
-          return RFAILED;
-       }
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildBsrConfig failed");
+      return RFAILED;
+   }
 
    macCellGrpCfg->tag_Config = NULLP;
    CU_ALLOC(macCellGrpCfg->tag_Config, sizeof(struct TAG_Config));
-       if(!macCellGrpCfg->tag_Config)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
-               return RFAILED;
-       }
+   if(!macCellGrpCfg->tag_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
 
    if(BuildTagConfig(macCellGrpCfg->tag_Config) != ROK)
-       {
-          DU_LOG("\nF1AP : BuildTagConfig failed");
-          return RFAILED;
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildTagConfig failed");
+      return RFAILED;
    }
 
    macCellGrpCfg->phr_Config = NULLP;
    CU_ALLOC(macCellGrpCfg->phr_Config, sizeof(struct MAC_CellGroupConfig__phr_Config));
-       if(!macCellGrpCfg->phr_Config)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacCellGrpCfg");
-               return RFAILED;
-       }
+   if(!macCellGrpCfg->phr_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
 
    if(BuildPhrConfig(macCellGrpCfg->phr_Config) != ROK)
-       {
-          DU_LOG("\nF1AP : BuildPhrConfig failed");
-          return RFAILED;
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildPhrConfig failed");
+      return RFAILED;
    }
 
    macCellGrpCfg->skipUplinkTxDynamic = false;
-       macCellGrpCfg->ext1 = NULLP;
+   macCellGrpCfg->ext1 = NULLP;
 
-       return ROK;
+   return ROK;
 }
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Frees memeory allocated for SearchSpcToAddModList
  *
@@ -4652,57 +4771,57 @@ uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
  4221 * ****************************************************************/
 void FreeSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
 {
-    uint8_t idx1=0;
-    uint8_t idx2=0;
-    struct  SearchSpace *searchSpc=NULLP;
+   uint8_t idx1=0;
+   uint8_t idx2=0;
+   struct  SearchSpace *searchSpc=NULLP;
 
-    if(searchSpcList->list.array)
+   if(searchSpcList->list.array)
+   {
+      if(searchSpcList->list.array[idx2])
+      {
+        searchSpc = searchSpcList->list.array[idx2];
+        if(searchSpc->controlResourceSetId)
         {
-           if(searchSpcList->list.array[idx2])
+           if(searchSpc->monitoringSlotPeriodicityAndOffset)
            {
-          searchSpc = searchSpcList->list.array[idx2];
-              if(searchSpc->controlResourceSetId)
+              if(searchSpc->monitoringSymbolsWithinSlot)
               {
-                 if(searchSpc->monitoringSlotPeriodicityAndOffset)
-                 {
-                    if(searchSpc->monitoringSymbolsWithinSlot)
-                    {
-                       if(searchSpc->monitoringSymbolsWithinSlot->buf)
-                       {
-                          if(searchSpc->nrofCandidates)
-                          {
-                             if(searchSpc->searchSpaceType)
-                             {
-                                CU_FREE(searchSpc->searchSpaceType->choice.ue_Specific,\
-                                sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
-                                CU_FREE(searchSpc->searchSpaceType, sizeof(struct
-                                                                        SearchSpace__searchSpaceType));
-                             }
-                             CU_FREE(searchSpc->nrofCandidates,
-                             sizeof(struct SearchSpace__nrofCandidates));
-                          }
-                          CU_FREE(searchSpc->monitoringSymbolsWithinSlot->buf, \
-                          searchSpc->monitoringSymbolsWithinSlot->size);
-                       }
-                       CU_FREE(searchSpc->monitoringSymbolsWithinSlot,
-                       sizeof(BIT_STRING_t));
-                    }
-                    CU_FREE(searchSpc->monitoringSlotPeriodicityAndOffset, \
-                    sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
-                 }
-                 CU_FREE(searchSpc->controlResourceSetId,
-                 sizeof(ControlResourceSetId_t));
+                 if(searchSpc->monitoringSymbolsWithinSlot->buf)
+                 {
+                    if(searchSpc->nrofCandidates)
+                    {
+                       if(searchSpc->searchSpaceType)
+                       {
+                          CU_FREE(searchSpc->searchSpaceType->choice.ue_Specific,\
+                                sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+                          CU_FREE(searchSpc->searchSpaceType, sizeof(struct
+                                   SearchSpace__searchSpaceType));
+                       }
+                       CU_FREE(searchSpc->nrofCandidates,
+                             sizeof(struct SearchSpace__nrofCandidates));
                     }
+                    CU_FREE(searchSpc->monitoringSymbolsWithinSlot->buf, \
+                          searchSpc->monitoringSymbolsWithinSlot->size);
                  }
-                 for(idx1 = 0; idx1 < searchSpcList->list.count; idx1++)
-            {
-                CU_FREE(searchSpcList->list.array[idx1],
-                               sizeof(struct SearchSpace));
-                 }
-                 CU_FREE(searchSpcList->list.array,searchSpcList->list.size);
+                 CU_FREE(searchSpc->monitoringSymbolsWithinSlot,
+                       sizeof(BIT_STRING_t));
+              }
+              CU_FREE(searchSpc->monitoringSlotPeriodicityAndOffset, \
+                    sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+           }
+           CU_FREE(searchSpc->controlResourceSetId,
+                 sizeof(ControlResourceSetId_t));
         }
+      }
+      for(idx1 = 0; idx1 < searchSpcList->list.count; idx1++)
+      {
+        CU_FREE(searchSpcList->list.array[idx1],
+              sizeof(struct SearchSpace));
+      }
+      CU_FREE(searchSpcList->list.array,searchSpcList->list.size);
+   }
 }
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Frees memory allocated for PdschTimeDomAllocList
  *
@@ -4720,24 +4839,24 @@ void FreeSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *se
 void FreePdschTimeDomAllocList( struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
 {
    uint8_t idx1=0;
-       
-       if(timeDomAllocList->choice.setup)
+
+   if(timeDomAllocList->choice.setup)
    {
       if(timeDomAllocList->choice.setup->list.array)
       {
-          for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
-          {
-             CU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
-             sizeof(struct PDSCH_TimeDomainResourceAllocation));
-          }
-          CU_FREE(timeDomAllocList->choice.setup->list.array, \
-          timeDomAllocList->choice.setup->list.size);
+        for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
+        {
+           CU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
+                 sizeof(struct PDSCH_TimeDomainResourceAllocation));
+        }
+        CU_FREE(timeDomAllocList->choice.setup->list.array, \
+              timeDomAllocList->choice.setup->list.size);
       }
       CU_FREE(timeDomAllocList->choice.setup,\
-      sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+           sizeof(struct PDSCH_TimeDomainResourceAllocationList));
    }
 }
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Frees memory allocated for PuschTimeDomAllocList
  *
@@ -4754,36 +4873,36 @@ void FreePdschTimeDomAllocList( struct PDSCH_Config__pdsch_TimeDomainAllocationL
  ***********************************************************************/
 void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
 {
-    uint8_t idx1=0;
-        uint8_t idx2=0;
-    struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
+   uint8_t idx1=0;
+   uint8_t idx2=0;
+   struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
 
-    if(puschCfg->pusch_TimeDomainAllocationList)
-    {
-       timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
-       if(timeDomAllocList_t->choice.setup)
-       {
-          if(timeDomAllocList_t->choice.setup->list.array)
-          {
-             CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx2]->k2, sizeof(long));
-             for(idx1 = 0; idx1<timeDomAllocList_t->choice.setup->list.count; idx1++)
-             {
-                CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx1],\
-                                   sizeof(PUSCH_TimeDomainResourceAllocation_t));
-                                }
-                                CU_FREE(timeDomAllocList_t->choice.setup->list.array, \
-             timeDomAllocList_t->choice.setup->list.size);
-          }
-          CU_FREE(timeDomAllocList_t->choice.setup, \
+   if(puschCfg->pusch_TimeDomainAllocationList)
+   {
+      timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
+      if(timeDomAllocList_t->choice.setup)
+      {
+        if(timeDomAllocList_t->choice.setup->list.array)
+        {
+           CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx2]->k2, sizeof(long));
+           for(idx1 = 0; idx1<timeDomAllocList_t->choice.setup->list.count; idx1++)
+           {
+              CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx1],\
+                    sizeof(PUSCH_TimeDomainResourceAllocation_t));
+           }
+           CU_FREE(timeDomAllocList_t->choice.setup->list.array, \
+                 timeDomAllocList_t->choice.setup->list.size);
+        }
+        CU_FREE(timeDomAllocList_t->choice.setup, \
               sizeof(struct PUSCH_TimeDomainResourceAllocationList));
-       }
-                CU_FREE(puschCfg->transformPrecoder, sizeof(long));
-       CU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
-                sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
-    }
+      }
+      CU_FREE(puschCfg->transformPrecoder, sizeof(long));
+      CU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
+           sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+   }
 
 }
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Frees memory allocated for InitialUlBWP
  *
@@ -4800,126 +4919,126 @@ void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
  * ****************************************************************/
 void FreeInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
 {
-    uint8_t  rSetIdx, rsrcIdx;
-    SRS_Config_t   *srsCfg = NULLP;
-    PUSCH_Config_t *puschCfg = NULLP;
-    struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg = NULLP;
-        struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList = NULLP;
-        struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
-        struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
-
-        if(ulBwp->pusch_Config)
-    {
-       if(ulBwp->pusch_Config->choice.setup)
-       {
-          puschCfg=ulBwp->pusch_Config->choice.setup;
-          if(puschCfg->dataScramblingIdentityPUSCH)
-          {
-             if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
-             {
-                FreePuschTimeDomAllocList(puschCfg);
-                dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
-                                        if(dmrsUlCfg->choice.setup)
-                {
-                   if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
-                   {
-                      if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
-                      {
-                         CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
-                                                                sizeof(long));
-                                                                CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
-                         sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
-                                                        }
-                                                        CU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
-                                                        sizeof(long));
-                                                }
-                                                CU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
-                }
-                                        CU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
-                                        sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
-                                }
-             CU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
-          }
-          CU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+   uint8_t  rSetIdx, rsrcIdx;
+   SRS_Config_t   *srsCfg = NULLP;
+   PUSCH_Config_t *puschCfg = NULLP;
+   struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg = NULLP;
+   struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList = NULLP;
+   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
+   struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
+
+   if(ulBwp->pusch_Config)
+   {
+      if(ulBwp->pusch_Config->choice.setup)
+      {
+        puschCfg=ulBwp->pusch_Config->choice.setup;
+        if(puschCfg->dataScramblingIdentityPUSCH)
+        {
+           if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+           {
+              FreePuschTimeDomAllocList(puschCfg);
+              dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
+              if(dmrsUlCfg->choice.setup)
+              {
+                 if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
+                 {
+                    if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
+                    {
+                       CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
+                             sizeof(long));
+                       CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
+                             sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+                    }
+                    CU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
+                          sizeof(long));
+                 }
+                 CU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
+              }
+              CU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
+                    sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
            }
-                CU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
+           CU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+        }
+        CU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+      }
+      CU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
 
-                /* Free SRS-Config */
-                if(ulBwp->srs_Config)
-                {
-                   if(ulBwp->srs_Config->choice.setup)
-                        {
-                           srsCfg = ulBwp->srs_Config->choice.setup;
+      /* Free SRS-Config */
+      if(ulBwp->srs_Config)
+      {
+        if(ulBwp->srs_Config->choice.setup)
+        {
+           srsCfg = ulBwp->srs_Config->choice.setup;
 
-                                /* Free Resource Set to add/mod list */
-                           if(srsCfg->srs_ResourceSetToAddModList)
-                                {
-                                   rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
-                                        if(rsrcSetList->list.array)
-                                        {
-                                           rSetIdx = 0;
-
-                                                /* Free SRS resource Id list in this SRS resource set */
-                                                if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
-                                                {
-                                                   rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
-
-                                                   if(rsrcIdList->list.array)
-                                                        {
-                                                           for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
-                                                                {
-                                                                   CU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
-                                                           }
-                                                           CU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
-                                                        }
-                                                   CU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
-                                                           sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
-                                                }
-
-                                                /* Free resource type info for this SRS resource set */
-                                                CU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
-                                                   sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
-
-                                                /* Free memory for each resource set */
-                                           for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
-                                                {
-                                                   CU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
-                                                }
-                                           CU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); 
-                                        }
-                                   CU_FREE(srsCfg->srs_ResourceSetToAddModList, \
-                                           sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
-                                }
+           /* Free Resource Set to add/mod list */
+           if(srsCfg->srs_ResourceSetToAddModList)
+           {
+              rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
+              if(rsrcSetList->list.array)
+              {
+                 rSetIdx = 0;
 
-                                /* Free resource to add/modd list */
-                                if(srsCfg->srs_ResourceToAddModList)
-                                {
-                                   resourceList = srsCfg->srs_ResourceToAddModList;
-                                        if(resourceList->list.array)
-                                        {
-                                           rsrcIdx = 0;
-                                                CU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
-                                                   sizeof(struct SRS_Resource__transmissionComb__n2));
-                                           CU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
-                                                   sizeof(struct SRS_Resource__resourceType__aperiodic));
-
-                                           for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
-                                                {
-                                                   CU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
-                   }
-                                           CU_FREE(resourceList->list.array, resourceList->list.size);
-                                        }
-                                   CU_FREE(srsCfg->srs_ResourceToAddModList, \
-                                           sizeof(struct SRS_Config__srs_ResourceToAddModList));
-                                }
+                 /* Free SRS resource Id list in this SRS resource set */
+                 if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
+                 {
+                    rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
 
-                           CU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
-                        }
-                   CU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
-       }
+                    if(rsrcIdList->list.array)
+                    {
+                       for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+                       {
+                          CU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+                       }
+                       CU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
+                    }
+                    CU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+                          sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+                 }
+
+                 /* Free resource type info for this SRS resource set */
+                 CU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+                       sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+
+                 /* Free memory for each resource set */
+                 for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+                 {
+                    CU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+                 }
+                 CU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); 
+              }
+              CU_FREE(srsCfg->srs_ResourceSetToAddModList, \
+                    sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
+           }
+
+           /* Free resource to add/modd list */
+           if(srsCfg->srs_ResourceToAddModList)
+           {
+              resourceList = srsCfg->srs_ResourceToAddModList;
+              if(resourceList->list.array)
+              {
+                 rsrcIdx = 0;
+                 CU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
+                       sizeof(struct SRS_Resource__transmissionComb__n2));
+                 CU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
+                       sizeof(struct SRS_Resource__resourceType__aperiodic));
+
+                 for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+                 {
+                    CU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
+                 }
+                 CU_FREE(resourceList->list.array, resourceList->list.size);
+              }
+              CU_FREE(srsCfg->srs_ResourceToAddModList, \
+                    sizeof(struct SRS_Config__srs_ResourceToAddModList));
+           }
+
+           CU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
         }
+        CU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
+      }
+   }
 }      
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Frees memory allocated for initialUplinkBWP
  *
@@ -4939,37 +5058,37 @@ void FreeinitialUplinkBWP(UplinkConfig_t *ulCfg)
 {
    BWP_UplinkDedicated_t *ulBwp=NULLP; 
    struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
-   
-       if(ulCfg->initialUplinkBWP)
-       {
-          ulBwp=ulCfg->initialUplinkBWP;
-          if(ulCfg->firstActiveUplinkBWP_Id)
-          {
-             if(ulCfg->pusch_ServingCellConfig)
-             {
-                puschCfg=ulCfg->pusch_ServingCellConfig;
-                if(puschCfg->choice.setup)
-                {
-                   if(puschCfg->choice.setup->ext1)
-                   {
-                       CU_FREE(puschCfg->choice.setup->ext1->\
-                                                processingType2Enabled,sizeof(BOOLEAN_t));
-                       CU_FREE(puschCfg->choice.setup->ext1->\
-                                                maxMIMO_Layers,sizeof(long));
-                                                CU_FREE(puschCfg->choice.setup->ext1, \
-                                                sizeof(struct PUSCH_ServingCellConfig__ext1));
-                                       }
-                   CU_FREE(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
-                }
-                CU_FREE(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
-             }
-             CU_FREE(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
-          }
-          FreeInitialUlBWP(ulBwp);
-          CU_FREE(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
-       }
+
+   if(ulCfg->initialUplinkBWP)
+   {
+      ulBwp=ulCfg->initialUplinkBWP;
+      if(ulCfg->firstActiveUplinkBWP_Id)
+      {
+        if(ulCfg->pusch_ServingCellConfig)
+        {
+           puschCfg=ulCfg->pusch_ServingCellConfig;
+           if(puschCfg->choice.setup)
+           {
+              if(puschCfg->choice.setup->ext1)
+              {
+                 CU_FREE(puschCfg->choice.setup->ext1->\
+                       processingType2Enabled,sizeof(BOOLEAN_t));
+                 CU_FREE(puschCfg->choice.setup->ext1->\
+                       maxMIMO_Layers,sizeof(long));
+                 CU_FREE(puschCfg->choice.setup->ext1, \
+                       sizeof(struct PUSCH_ServingCellConfig__ext1));
+              }
+              CU_FREE(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
+           }
+           CU_FREE(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+        }
+        CU_FREE(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
+      }
+      FreeInitialUlBWP(ulBwp);
+      CU_FREE(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
+   }
 }
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Frees emmory allocated for BWPDlDedPdschCfg
  *
@@ -4988,43 +5107,43 @@ void FreeinitialUplinkBWP(UplinkConfig_t *ulCfg)
 void FreeBWPDlDedPdschCfg(BWP_DownlinkDedicated_t *dlBwp)
 {
    struct PDSCH_Config *pdschCfg=NULLP;
-       struct PDSCH_Config__prb_BundlingType *prbBndlType=NULLP;
+   struct PDSCH_Config__prb_BundlingType *prbBndlType=NULLP;
    struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList=NULLP;
    struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg=NULLP;
 
-       if(dlBwp->pdsch_Config->choice.setup)
+   if(dlBwp->pdsch_Config->choice.setup)
    {
       pdschCfg=dlBwp->pdsch_Config->choice.setup;
       if(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
       {
-          if(pdschCfg->pdsch_TimeDomainAllocationList)
-          {
-             timeDomAllocList=pdschCfg->pdsch_TimeDomainAllocationList;
-             if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
-             {
-                prbBndlType=&pdschCfg->prb_BundlingType;
-                CU_FREE(prbBndlType->choice.staticBundling,\
-                sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
-                CU_FREE(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
-             }
-             FreePdschTimeDomAllocList(timeDomAllocList);
-             CU_FREE(pdschCfg->pdsch_TimeDomainAllocationList, \
-             sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
-          }
-          dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
-          if(dmrsDlCfg->choice.setup)
-          {
-             CU_FREE(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition,
-             sizeof(long));
-             CU_FREE(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
-          }
-          CU_FREE(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
-          sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
-       }
-       CU_FREE(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
-    }
+        if(pdschCfg->pdsch_TimeDomainAllocationList)
+        {
+           timeDomAllocList=pdschCfg->pdsch_TimeDomainAllocationList;
+           if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
+           {
+              prbBndlType=&pdschCfg->prb_BundlingType;
+              CU_FREE(prbBndlType->choice.staticBundling,\
+                    sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
+              CU_FREE(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
+           }
+           FreePdschTimeDomAllocList(timeDomAllocList);
+           CU_FREE(pdschCfg->pdsch_TimeDomainAllocationList, \
+                 sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
+        }
+        dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
+        if(dmrsDlCfg->choice.setup)
+        {
+           CU_FREE(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition,
+                 sizeof(long));
+           CU_FREE(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
+        }
+        CU_FREE(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
+              sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+      }
+      CU_FREE(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
+   }
 }
- /*******************************************************************
+/*******************************************************************
  *
  * @brief Frees emmory allocated for BWPDlDedPdcchCfg
  *
@@ -5043,66 +5162,66 @@ void FreeBWPDlDedPdschCfg(BWP_DownlinkDedicated_t *dlBwp)
 void FreeBWPDlDedPdcchCfg(BWP_DownlinkDedicated_t *dlBwp)
 {
    uint8_t idx1=0;
-       uint8_t idx2=0;
-       struct PDCCH_Config *pdcchCfg=NULLP;
+   uint8_t idx2=0;
+   struct PDCCH_Config *pdcchCfg=NULLP;
    struct ControlResourceSet *controlRSet=NULLP;
-       struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
+   struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
 
-       if(dlBwp->pdcch_Config->choice.setup)
+   if(dlBwp->pdcch_Config->choice.setup)
    {
       pdcchCfg=dlBwp->pdcch_Config->choice.setup;
       if(pdcchCfg->controlResourceSetToAddModList)
       {
-         controlRSetList = pdcchCfg->controlResourceSetToAddModList;
-         if(controlRSetList->list.array)
-         {
-            controlRSet = controlRSetList->list.array[idx2];
-            if(controlRSet)
-            {
-               if(controlRSet->frequencyDomainResources.buf)
-               {
-                  if(controlRSet->pdcch_DMRS_ScramblingID)
-                  {
-                     if(pdcchCfg->searchSpacesToAddModList)
-                     {
-                         FreeSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList);
-                         CU_FREE(pdcchCfg->searchSpacesToAddModList, \
-                         sizeof(struct PDCCH_Config__searchSpacesToAddModList));
-                     }
-                     CU_FREE(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
-                  }
-                                               CU_FREE(controlRSet->frequencyDomainResources.buf, \
-                                               controlRSet->frequencyDomainResources.size);
-                                       }
-                               }
-            for(idx1 = 0; idx1 <controlRSetList->list.count; idx1++)
-            {
-               CU_FREE(controlRSetList->list.array[idx1], sizeof(struct ControlResourceSet));
-            }
-                               CU_FREE(controlRSetList->list.array, controlRSetList->list.size);
-                       }
-                       CU_FREE(pdcchCfg->controlResourceSetToAddModList, \
-                       sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
-               }
-               CU_FREE(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
-       }
+        controlRSetList = pdcchCfg->controlResourceSetToAddModList;
+        if(controlRSetList->list.array)
+        {
+           controlRSet = controlRSetList->list.array[idx2];
+           if(controlRSet)
+           {
+              if(controlRSet->frequencyDomainResources.buf)
+              {
+                 if(controlRSet->pdcch_DMRS_ScramblingID)
+                 {
+                    if(pdcchCfg->searchSpacesToAddModList)
+                    {
+                       FreeSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList);
+                       CU_FREE(pdcchCfg->searchSpacesToAddModList, \
+                             sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+                    }
+                    CU_FREE(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
+                 }
+                 CU_FREE(controlRSet->frequencyDomainResources.buf, \
+                       controlRSet->frequencyDomainResources.size);
+              }
+           }
+           for(idx1 = 0; idx1 <controlRSetList->list.count; idx1++)
+           {
+              CU_FREE(controlRSetList->list.array[idx1], sizeof(struct ControlResourceSet));
+           }
+           CU_FREE(controlRSetList->list.array, controlRSetList->list.size);
+        }
+        CU_FREE(pdcchCfg->controlResourceSetToAddModList, \
+              sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+      }
+      CU_FREE(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
+   }
 }
 /*******************************************************************
-*
-* @brief Builds RLC Config
-*
-* @details
-*
-*    Function : BuildRlcConfig
-*
-*    Functionality: Builds RLC Config in BuildRlcBearerToAddModList 
-*
-* @params[in] RLC_Config *rlcConfig
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds RLC Config
+ *
+ * @details
+ *
+ *    Function : BuildRlcConfig
+ *
+ *    Functionality: Builds RLC Config in BuildRlcBearerToAddModList 
+ *
+ * @params[in] RLC_Config *rlcConfig
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildRlcConfig(struct RLC_Config *rlcConfig)
 {
 
@@ -5110,186 +5229,186 @@ uint8_t BuildRlcConfig(struct RLC_Config *rlcConfig)
 
    rlcConfig->choice.am = NULLP;
    CU_ALLOC(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
-       if(!rlcConfig->choice.am)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildRlcConfig");
-               return RFAILED;
-       }
+   if(!rlcConfig->choice.am)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+      return RFAILED;
+   }
 
    /* UL */
-       rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength = NULLP;
+   rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength = NULLP;
    CU_ALLOC(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
-       if(!rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildRlcConfig");
-               return RFAILED;
-       }
+   if(!rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+      return RFAILED;
+   }
    *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
-       rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit  = T_POLL_RETRANSMIT;
-       rlcConfig->choice.am->ul_AM_RLC.pollPDU           = POLL_PDU;
-       rlcConfig->choice.am->ul_AM_RLC.pollByte          = POLL_BYTE;
-       rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold  = MAX_RETX_THRESHOLD;
+   rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit  = T_POLL_RETRANSMIT;
+   rlcConfig->choice.am->ul_AM_RLC.pollPDU           = POLL_PDU;
+   rlcConfig->choice.am->ul_AM_RLC.pollByte          = POLL_BYTE;
+   rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold  = MAX_RETX_THRESHOLD;
 
    /* DL */
    rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength = NULLP;
    CU_ALLOC(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
-       if(!rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildRlcConfig");
-               return RFAILED;
-       }
-       *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
+   if(!rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+      return RFAILED;
+   }
+   *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
    rlcConfig->choice.am->dl_AM_RLC.t_Reassembly      = T_REASSEMBLY;
-       rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit  = T_STATUS_PROHIBHIT;
-       
+   rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit  = T_STATUS_PROHIBHIT;
+
    return ROK;
 }
 
 /*******************************************************************
-*
-* @brief Builds MAC LC Config
-*
-* @details
-*
-*    Function : BuildMacLCConfig 
-*
-*    Functionality: Builds MAC LC Config in BuildRlcBearerToAddModList 
-*
-* @params[in] struct LogicalChannelConfig macLcConfig
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
-{
-
-   macLcConfig->ul_SpecificParameters = NULLP;
-   CU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
-       if(!macLcConfig->ul_SpecificParameters)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacLCConfig");
-               return RFAILED;
-       }
-
-   macLcConfig->ul_SpecificParameters->priority = MAC_LC_PRIORITY;
-       macLcConfig->ul_SpecificParameters->prioritisedBitRate =        PRIORTISIED_BIT_RATE;
-       macLcConfig->ul_SpecificParameters->bucketSizeDuration =        BUCKET_SIZE_DURATION;
-   macLcConfig->ul_SpecificParameters->allowedServingCells = NULLP;
-       macLcConfig->ul_SpecificParameters->allowedSCS_List = NULLP;
-       macLcConfig->ul_SpecificParameters->maxPUSCH_Duration = NULLP;
+ *
+ * @brief Builds MAC LC Config
+ *
+ * @details
+ *
+ *    Function : BuildMacLCConfig 
+ *
+ *    Functionality: Builds MAC LC Config in BuildRlcBearerToAddModList 
+ *
+ * @params[in] struct LogicalChannelConfig macLcConfig
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
+{
+
+   macLcConfig->ul_SpecificParameters = NULLP;
+   CU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+   if(!macLcConfig->ul_SpecificParameters)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
+      return RFAILED;
+   }
+
+   macLcConfig->ul_SpecificParameters->priority = MAC_LC_PRIORITY;
+   macLcConfig->ul_SpecificParameters->prioritisedBitRate =    PRIORTISIED_BIT_RATE;
+   macLcConfig->ul_SpecificParameters->bucketSizeDuration =    BUCKET_SIZE_DURATION;
+   macLcConfig->ul_SpecificParameters->allowedServingCells = NULLP;
+   macLcConfig->ul_SpecificParameters->allowedSCS_List = NULLP;
+   macLcConfig->ul_SpecificParameters->maxPUSCH_Duration = NULLP;
    macLcConfig->ul_SpecificParameters->configuredGrantType1Allowed = NULLP;
 
    macLcConfig->ul_SpecificParameters->logicalChannelGroup = NULLP;
    CU_ALLOC(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
    if(!macLcConfig->ul_SpecificParameters->logicalChannelGroup)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacLCConfig");
-               return RFAILED;
-       }
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
+      return RFAILED;
+   }
    *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = LC_GRP;
 
    macLcConfig->ul_SpecificParameters->schedulingRequestID = NULLP;
-       CU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID,       sizeof(SchedulingRequestId_t));
-       if(!macLcConfig->ul_SpecificParameters->schedulingRequestID)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildMacLCConfig");
-               return RFAILED;
-       }
+   CU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
+   if(!macLcConfig->ul_SpecificParameters->schedulingRequestID)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
+      return RFAILED;
+   }
    *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = SCH_REQ_ID;
 
-       macLcConfig->ul_SpecificParameters->logicalChannelSR_Mask = false;
-       macLcConfig->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = false;
-       macLcConfig->ul_SpecificParameters->bitRateQueryProhibitTimer = NULLP;
+   macLcConfig->ul_SpecificParameters->logicalChannelSR_Mask = false;
+   macLcConfig->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = false;
+   macLcConfig->ul_SpecificParameters->bitRateQueryProhibitTimer = NULLP;
 
    return ROK;
 }
 /*******************************************************************
-*
-* @brief Builds RLC Bearer to Add/Mod list
-*
-* @details
-*
-*    Function :BuildRlcBearerToAddModList 
-*
-*    Functionality: Builds RLC Bearer to Add/Mod list in DuToCuRrcContainer
-*
-* @params[in] rlc_BearerToAddModList
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
+ *
+ * @brief Builds RLC Bearer to Add/Mod list
+ *
+ * @details
+ *
+ *    Function :BuildRlcBearerToAddModList 
+ *
+ *    Functionality: Builds RLC Bearer to Add/Mod list in DuToCuRrcContainer
+ *
+ * @params[in] rlc_BearerToAddModList
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
 {
    uint8_t                     idx, elementCnt;
 
    elementCnt = 1;
    rlcBearerList->list.count = elementCnt;
-       rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
+   rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
 
    rlcBearerList->list.array = NULLP;
-       CU_ALLOC(rlcBearerList->list.array, rlcBearerList->list.size);
-       if(!rlcBearerList->list.array)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-               return RFAILED;
-       }
+   CU_ALLOC(rlcBearerList->list.array, rlcBearerList->list.size);
+   if(!rlcBearerList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+      return RFAILED;
+   }
 
    for(idx=0; idx<rlcBearerList->list.count; idx++)
-       {
-          rlcBearerList->list.array[idx] = NULLP;
-               CU_ALLOC(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
-               if(!rlcBearerList->list.array[idx])
-               {
-                       DU_LOG("\nF1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-                       return RFAILED;
-               }
-       }
+   {
+      rlcBearerList->list.array[idx] = NULLP;
+      CU_ALLOC(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
+      if(!rlcBearerList->list.array[idx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+        return RFAILED;
+      }
+   }
 
    idx = 0;
-       rlcBearerList->list.array[idx]->logicalChannelIdentity = RLC_LCID;
+   rlcBearerList->list.array[idx]->logicalChannelIdentity = RLC_LCID;
 
-       CU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
-       if(!rlcBearerList->list.array[idx]->servedRadioBearer)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-               return RFAILED;
-       }
+   CU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+   if(!rlcBearerList->list.array[idx]->servedRadioBearer)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+      return RFAILED;
+   }
 
-       rlcBearerList->list.array[idx]->servedRadioBearer->present = RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
+   rlcBearerList->list.array[idx]->servedRadioBearer->present = RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
    rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = SRB_ID_1;
 
    rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
    rlcBearerList->list.array[idx]->rlc_Config = NULLP;
    CU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
-       if(!rlcBearerList->list.array[idx]->rlc_Config)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-               return RFAILED;
-       }
+   if(!rlcBearerList->list.array[idx]->rlc_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+      return RFAILED;
+   }
 
    if(BuildRlcConfig(rlcBearerList->list.array[idx]->rlc_Config) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildRlcConfig failed");
-               return RFAILED;
-       }
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+      return RFAILED;
+   }
 
    rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
    CU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
-       if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
-       {
-               DU_LOG("\nF1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-               return RFAILED;
-       }
-
-       if(BuildMacLCConfig(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
-       {
-               DU_LOG("\nF1AP : BuildMacLCConfig failed");
-               return RFAILED;
-       }
-
-       return ROK;
+   if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+      return RFAILED;
+   }
+
+   if(BuildMacLCConfig(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+      return RFAILED;
+   }
+
+   return ROK;
 }
 
 /*******************************************************************
@@ -5522,12 +5641,12 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
       CU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
       if(!cellGrpCfg.rlc_BearerToAddModList)
       {
-        DU_LOG("\nF1AP : Memory allocation failure in CellGrpConfig");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in CellGrpConfig");
         break;
       }
       if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK)
       {
-        DU_LOG("\nF1AP : fillCellGrpCfg failed");
+        DU_LOG("\nERROR  -->  F1AP : fillCellGrpCfg failed");
         break;
       }
 
@@ -5536,12 +5655,12 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
       CU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
       if(!cellGrpCfg.mac_CellGroupConfig)
       {
-        DU_LOG("\nF1AP : Memory allocation failure in fillCellGrpCfg");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in fillCellGrpCfg");
         break;
       }
       if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK)
       {
-        DU_LOG("\nF1AP : BuildMacCellGrpCfg failed");
+        DU_LOG("\nERROR  -->  F1AP : BuildMacCellGrpCfg failed");
         break;
       }
 
@@ -5550,12 +5669,12 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
       CU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
       if(!cellGrpCfg.physicalCellGroupConfig)
       {
-        DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
         break;
       }
       if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK)
       {
-        DU_LOG("\nF1AP : BuildPhyCellGrpCfg failed");
+        DU_LOG("\nERROR  -->  F1AP : BuildPhyCellGrpCfg failed");
         break;
       }
 
@@ -5563,12 +5682,12 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
       CU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
       if(!cellGrpCfg.spCellConfig)
       {
-        DU_LOG("\nF1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
         break;
       }
       if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK)
       {
-        DU_LOG("\nF1AP : BuildSpCellCfg failed");
+        DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfg failed");
         break;
       }
 
@@ -5584,16 +5703,16 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
-        DU_LOG( "\n F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
+        DU_LOG( "\nERROR  -->  F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
         break;
       }
       else
       {
-        DU_LOG("\n F1AP : Created APER encoded buffer for DuToCuRrcContainer\n");
+        DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for DuToCuRrcContainer\n");
         for(int i=0; i< encBufSize; i++)
         {
-           printf("%x",encBuf[i]);
+           DU_LOG("%x",encBuf[i]);
         }
       }
 
@@ -5601,7 +5720,7 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
       CU_ALLOC(cellGrp->buf, cellGrp->size);
       if(!cellGrp->buf)
       {
-        DU_LOG("\nF1AP : Memory allocation failed in BuildDuToCuRrcContainer");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDuToCuRrcContainer");
         break;
       }
       memcpy(cellGrp->buf, encBuf, cellGrp->size);
@@ -5736,7 +5855,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
    CU_ALLOC(featureSets->featureSetsDownlinkPerCC, sizeof(struct FeatureSets__featureSetsDownlinkPerCC));
    if(!featureSets->featureSetsDownlinkPerCC)
    {
-      DU_LOG("\nMemory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
 
@@ -5746,7 +5865,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
    CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array, featureSets->featureSetsDownlinkPerCC->list.size);
    if(!featureSets->featureSetsDownlinkPerCC->list.array)
    {
-      DU_LOG("\nMemory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
 
@@ -5755,7 +5874,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
       CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array[idx], sizeof(struct FeatureSetDownlinkPerCC));
       if(!featureSets->featureSetsDownlinkPerCC->list.array[idx])
       {
-        DU_LOG("\nMemory allocation failed in fillFeatureSets");
+        DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
         return RFAILED;
       }
    }
@@ -5770,7 +5889,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
    CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL, sizeof(ModulationOrder_t));
    if(!featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL)
    {
-      DU_LOG("\nMemory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
    *(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL) = ModulationOrder_qam64;
@@ -5779,7 +5898,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
    CU_ALLOC(featureSets->featureSetsUplinkPerCC, sizeof(struct FeatureSets__featureSetsUplinkPerCC));
    if(!featureSets->featureSetsUplinkPerCC)
    {
-      DU_LOG("\nMemory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
 
@@ -5789,7 +5908,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
    CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array, featureSets->featureSetsUplinkPerCC->list.size);
    if(!featureSets->featureSetsUplinkPerCC->list.array)
    {
-      DU_LOG("\nMemory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
 
@@ -5798,7 +5917,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
       CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array[idx], sizeof(struct FeatureSetUplinkPerCC));
       if(!featureSets->featureSetsUplinkPerCC->list.array[idx])
       {
-         DU_LOG("\nMemory allocation failed in fillFeatureSets");
+         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
          return RFAILED;
       }
    }
@@ -5814,7 +5933,7 @@ uint8_t fillFeatureSets(FeatureSets_t *featureSets)
    CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL, sizeof(ModulationOrder_t));
    if(!featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL)
    {
-      DU_LOG("\nMemory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
    *(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL) = ModulationOrder_qam16;
@@ -5884,7 +6003,7 @@ uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
       CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array, ueNrCap.rf_Parameters.supportedBandListNR.list.size);
       if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array)
       {
-         DU_LOG("\nMemory allocation failed in fillUeCapRatCont");
+         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillUeCapRatCont");
          ret = RFAILED;
          break;
       }
@@ -5916,14 +6035,14 @@ uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
       CU_ALLOC(ueNrCap.featureSets, sizeof(struct FeatureSets));
       if(!ueNrCap.featureSets)
       {
-         DU_LOG("\nMemory allocation failed in fillUeCapRatCont");
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapRatCont");
         ret = RFAILED;
         break;
       }
 
       if(fillFeatureSets(ueNrCap.featureSets) != ROK)
       {
-         DU_LOG("\nfillDLFeatureSets() failed ");
+         DU_LOG("\nERROR  -->  fillDLFeatureSets() failed ");
          ret = RFAILED;
          break;
       }
@@ -5941,16 +6060,16 @@ uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
-         DU_LOG( "\n F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
             encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
          break;
       }
       else
       {
-         DU_LOG("\n F1AP : Created APER encoded buffer for UE Capability RAT Container\n");
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
          for(int i=0; i< encBufSize; i++)
          {
-            printf("%x",encBuf[i]);
+            DU_LOG("%x",encBuf[i]);
          }
       }
 
@@ -5958,7 +6077,7 @@ uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
       CU_ALLOC(ueCapRatContBuf->buf, ueCapRatContBuf->size);
       if(!ueCapRatContBuf->buf)
       {
-         DU_LOG("\nF1AP : Memory allocation failed in fillUeCapabilityContainer");
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
          break;
       }
       memcpy(ueCapRatContBuf->buf, encBuf, ueCapRatContBuf->size);
@@ -6001,7 +6120,7 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu
        CU_ALLOC(ueCapablityList.list.array, ueCapablityList.list.size);
        if(!ueCapablityList.list.array)
        {
-          DU_LOG("\nMemory allocation failed in fillUeCapRatContList");
+          DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
          ret = RFAILED;
          break;
        }
@@ -6011,7 +6130,7 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu
           CU_ALLOC(ueCapablityList.list.array[idx], sizeof(UE_CapabilityRAT_Container_t));
           if(ueCapablityList.list.array[idx] == NULLP)
           {
-            DU_LOG("\nMemory allocation failed in fillUeCapRatContList");
+            DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
              ret = RFAILED;
             break;
           }
@@ -6030,16 +6149,16 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu
        /* Encode results */
        if(encRetVal.encoded == ENCODE_FAIL)
        {
-          DU_LOG( "\n F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
+          DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
           break;
        }
        else
        {
-          DU_LOG("\n F1AP : Created APER encoded buffer for UE Capability RAT Container\n");
+          DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
           for(int i=0; i< encBufSize; i++)
           {
-             printf("%x",encBuf[i]);
+             DU_LOG("%x",encBuf[i]);
           }
        }
     
@@ -6047,7 +6166,7 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu
        CU_ALLOC(ueCapablityListBuf->buf, ueCapablityListBuf->size);
        if(!ueCapablityListBuf->buf)
        {
-          DU_LOG("\nF1AP : Memory allocation failed in fillUeCapabilityContainer");
+          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
           break;
        }
        memcpy(ueCapablityListBuf->buf, encBuf, ueCapablityListBuf->size);
@@ -6084,7 +6203,7 @@ uint8_t fillCuToDuContainer(CUtoDURRCInformation_t *rrcMsg)
    CU_ALLOC(rrcMsg->uE_CapabilityRAT_ContainerList, sizeof(UE_CapabilityRAT_ContainerList_t));
    if(!rrcMsg->uE_CapabilityRAT_ContainerList)
    {
-      DU_LOG(" F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
       return RFAILED;
    }
    ret = fillUeCapRatContList(rrcMsg->uE_CapabilityRAT_ContainerList);
@@ -6101,24 +6220,24 @@ uint8_t fillCuToDuContainer(CUtoDURRCInformation_t *rrcMsg)
 
       if(rrcMsg->iE_Extensions->list.array == NULLP)
       {
-         DU_LOG(" F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
-         ret = RFAILED;
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
+        ret = RFAILED;
       }
 
       for(idx=0; idx<elementCnt; idx++)
       {
-         CU_ALLOC(rrcMsg->iE_Extensions->list.array[idx], sizeof(CUtoDURRCInformation_ExtIEs_t));
-         if(rrcMsg->iE_Extensions->list.array[idx] == NULLP)
-         {
-            ret = RFAILED;
-         }
+        CU_ALLOC(rrcMsg->iE_Extensions->list.array[idx], sizeof(CUtoDURRCInformation_ExtIEs_t));
+        if(rrcMsg->iE_Extensions->list.array[idx] == NULLP)
+        {
+           ret = RFAILED;
+        }
       }
       idx = 0;
       /* Filling CellGroupConfig_t IE */
       rrcMsg->iE_Extensions->list.array[idx]->id = ProtocolIE_ID_id_CellGroupConfig;
       rrcMsg->iE_Extensions->list.array[idx]->criticality = Criticality_ignore; 
       rrcMsg->iE_Extensions->list.array[idx]->extensionValue.present  =\
-      CUtoDURRCInformation_ExtIEs__extensionValue_PR_CellGroupConfig;
+                                                                      CUtoDURRCInformation_ExtIEs__extensionValue_PR_CellGroupConfig;
       ret = fillCellGrpCfg(&rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig);
    }
    return ret;
@@ -6155,33 +6274,33 @@ void FreeCuToDuInfo(CUtoDURRCInformation_t *rrcMsg)
    {
       if(rrcMsg->iE_Extensions->list.array)
       {
-         for(idx= 0; idx < rrcMsg->iE_Extensions->list.count; idx++)
-         {
-            if(rrcMsg->iE_Extensions->list.array[idx])
+        for(idx= 0; idx < rrcMsg->iE_Extensions->list.count; idx++)
+        {
+           if(rrcMsg->iE_Extensions->list.array[idx])
            {
               switch(rrcMsg->iE_Extensions->list.array[idx]->id)
               {
-                  case ProtocolIE_ID_id_CellGroupConfig:
-                     if(rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig.buf != NULLP)
+                 case ProtocolIE_ID_id_CellGroupConfig:
+                    if(rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig.buf != NULLP)
                     {
-                        CU_FREE(rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig.buf,\
-                       rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig.size);
+                       CU_FREE(rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig.buf,\
+                             rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig.size);
 
                     }
-                  break;
-                  default:
-                    DU_LOG("\nF1AP:Invalid Event type %ld at FreeCuToDuInfo()", \
-                       rrcMsg->iE_Extensions->list.array[idx]->id);
+                    break;
+                 default:
+                    DU_LOG("\nERROR  -->  F1AP : Invalid Event type %ld at FreeCuToDuInfo()", \
+                          rrcMsg->iE_Extensions->list.array[idx]->id);
                     break;
               }
            }
            break;
-         }
+        }
         for(idx2 = 0; idx2 < idx; idx2++)
         {
-            CU_FREE(rrcMsg->iE_Extensions->list.array[idx2], sizeof(CUtoDURRCInformation_ExtIEs_t));
+           CU_FREE(rrcMsg->iE_Extensions->list.array[idx2], sizeof(CUtoDURRCInformation_ExtIEs_t));
         }
-         CU_FREE(rrcMsg->iE_Extensions->list.array, rrcMsg->iE_Extensions->list.size);
+        CU_FREE(rrcMsg->iE_Extensions->list.array, rrcMsg->iE_Extensions->list.size);
 
       }
 
@@ -6206,7 +6325,7 @@ void FreeCuToDuInfo(CUtoDURRCInformation_t *rrcMsg)
  *
  * ****************************************************************/
 uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
-   uint16_t rrcContLen, uint8_t *rrcContainer)
+      uint16_t rrcContLen, uint8_t *rrcContainer)
 {
    uint8_t   Nrcgiret;
    uint8_t   SplCellListret;
@@ -6222,28 +6341,28 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
    uint8_t ret1;
    while(true)
    {
-      DU_LOG("\n F1AP : Building UE Context Setup Request\n");
+      DU_LOG("\nINFO  -->  F1AP : Building UE Context Setup Request\n");
 
       CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
       if(f1apMsg == NULLP)
       {
-        DU_LOG(" F1AP : Memory allocation for F1AP-PDU failed");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
         break;
       }
 
       f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
-      CU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+      CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
       if(f1apMsg->choice.initiatingMessage == NULLP)
       {
-        DU_LOG(" F1AP : Memory allocation for  F1AP-PDU failed");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for     F1AP-PDU failed");
         break;
       }
 
       f1apMsg->choice.initiatingMessage->procedureCode = \
-        ProcedureCode_id_UEContextSetup;
+                                                        ProcedureCode_id_UEContextSetup;
       f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
       f1apMsg->choice.initiatingMessage->value.present = \
-         InitiatingMessage__value_PR_UEContextSetupRequest;
+                                                        InitiatingMessage__value_PR_UEContextSetupRequest;
       ueSetReq =
         &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
 
@@ -6257,7 +6376,7 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
 
       if(ueSetReq->protocolIEs.list.array == NULLP)
       {
-        DU_LOG(" F1AP : Memory allocation for UE Context SetupRequest failed");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE Context SetupRequest failed");
         break;
       }
 
@@ -6331,9 +6450,9 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
                                                             UEContextSetupRequestIEs__value_PR_CUtoDURRCInformation;
       if(fillCuToDuContainer(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation))
       {
-         break;
+        break;
       }
-      
+
       /*Special Cells to be SetupList*/
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id        = \
@@ -6375,16 +6494,16 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
       ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCContainer;
       ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = \
-         UEContextSetupRequestIEs__value_PR_RRCContainer;
+                                                            UEContextSetupRequestIEs__value_PR_RRCContainer;
       char secModeBuf[9]={0x00, 0x02, 0x22, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00};
       bufLen =9;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size = bufLen;
       CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf,
-          ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
+           ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
       if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf)
       {
-         DU_LOG(" F1AP : Memory allocation for BuildAndSendUeContextSetupReq failed");
-         break;
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for BuildAndSendUeContextSetupReq failed");
+        break;
       }
       memset(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, 0, bufLen);
       memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, secModeBuf, bufLen);
@@ -6392,29 +6511,29 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
       /* RRC delivery status request */
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id = \
-         ProtocolIE_ID_id_RRCDeliveryStatusRequest;
+                                                 ProtocolIE_ID_id_RRCDeliveryStatusRequest;
       ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
       ueSetReq->protocolIEs.list.array[idx]->value.present = \
-         UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest;
+                                                            UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = \
-         RRCDeliveryStatusRequest_true;
+                                                                                    RRCDeliveryStatusRequest_true;
 
       /* Bit Rate hardcoded as in reference logs */
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id = \
-         ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL;
+                                                 ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL;
       ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
       ueSetReq->protocolIEs.list.array[idx]->value.present = \
-         UEContextSetupRequestIEs__value_PR_BitRate;
+                                                            UEContextSetupRequestIEs__value_PR_BitRate;
       char bitRateBuf[4]= {0x3B, 0x37, 0xF4, 0xCD};
       bufLen = 4;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size = bufLen;
       CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf,\
-         ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size);
+           ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size);
       if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf)
       {
-         DU_LOG(" F1AP : Failed to allocate memory for Bit Rate in BuildAndSendUeContextSetupReq()");
-         break;
+        DU_LOG("\nERROR  -->  F1AP : Failed to allocate memory for Bit Rate in BuildAndSendUeContextSetupReq()");
+        break;
       }
       memset(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf, 0, bufLen);
       memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf, bitRateBuf, bufLen);
@@ -6429,23 +6548,23 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
-        DU_LOG( "\n F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\
+        DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\
               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
         break;
       }
       else
       {
-        DU_LOG("\n F1AP : Created APER encoded buffer for UE Context Setup Request\n");
+        DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Context Setup Request\n");
         for(int i=0; i< encBufSize; i++)
         {
-           printf("%x",encBuf[i]);
+           DU_LOG("%x",encBuf[i]);
         }
       }
 
       /* Sending  msg  */
       if(SendF1APMsg(CU_APP_MEM_REG,CU_POOL)   !=      ROK)
       {
-        DU_LOG("\n F1AP : Sending UE Context Setup Request Failed");
+        DU_LOG("\nERROR  -->  F1AP : Sending UE Context Setup Request Failed");
         break;
       }
       ret = ROK;
@@ -6456,6 +6575,27 @@ uint8_t BuildAndSendUeContextSetupReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
    return ret;
 }/* End of BuildAndSendUeContextSetupReq*/
 
+
+uint8_t procUeContextSetupResponse(F1AP_PDU_t *f1apMsg)
+{
+   uint8_t idx, duUeF1apId;
+   UEContextSetupResponse_t *ueCtxtSetupRsp;
+   ueCtxtSetupRsp = &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
+   
+   for(idx=0; idx < ueCtxtSetupRsp->protocolIEs.list.count; idx++)
+   {
+      switch(ueCtxtSetupRsp->protocolIEs.list.array[idx]->id)
+      {
+          case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+             {
+                duUeF1apId = ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
+                break;
+             }
+      }
+   }
+   ueCb[duUeF1apId-1].f1apMsgDb.dlRrcMsgCount++; /* keeping DL RRC Msg Count */
+}
+
 /****************************************************************
  * @brief Function to process Ul Rrc Msg received from DU 
  *
@@ -6504,46 +6644,51 @@ uint8_t procUlRrcMsg(F1AP_PDU_t *f1apMsg)
            {
               rrcContLen = ulRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size;
               CU_ALLOC(rrcContainer, rrcContLen)
-              if(!rrcContainer)
-              {
-                 DU_LOG("\nCU_STUB: Failed to allocated memory in procUlRrcMsg");
-                 return RFAILED;
-              }
+                 if(!rrcContainer)
+                 {
+                    DU_LOG("\nERROR  -->  F1AP : Failed to allocated memory in procUlRrcMsg");
+                    return RFAILED;
+                 }
               memcpy(rrcContainer, ulRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf,\
                     rrcContLen);
               break;
            }
 
         default:
-           DU_LOG("\n Invalid Event %ld", ulRrcMsg->protocolIEs.list.array[idx]->id);
+           DU_LOG("\nERROR  -->  F1AP : Invalid Event %ld", ulRrcMsg->protocolIEs.list.array[idx]->id);
            break;
       }
    }
    if(srbId == 1)
    {
-      f1apMsgDb.dlRrcMsgCount++;
-      rrcMsgType = setDlRRCMsgType();
+      ueCb[duUeF1apId-1].f1apMsgDb.dlRrcMsgCount++;
+      rrcMsgType = setDlRRCMsgType(duUeF1apId);
       if(rrcMsgType == REGISTRATION_ACCEPT)
       {
-         DU_LOG("\nF1AP: Sending DL RRC MSG for RRC Registration Accept"); 
-         ret = BuildAndSendDLRRCMessageTransfer(srbId, rrcMsgType);
+         DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for RRC Registration Accept"); 
+         ret = BuildAndSendDLRRCMessageTransfer(duUeF1apId, srbId, rrcMsgType);
       }
       if(rrcMsgType == UE_CONTEXT_SETUP_REQ)
       {
-         DU_LOG("\nF1AP: Sending Ue Context Setup Req"); 
-         ret = BuildAndSendUeContextSetupReq(cuUeF1apId, duUeF1apId,\
-           rrcContLen, rrcContainer);
+        DU_LOG("\nINFO  -->  F1AP: Sending Ue Context Setup Req"); 
+        ret = BuildAndSendUeContextSetupReq(cuUeF1apId, duUeF1apId,\
+              rrcContLen, rrcContainer);
       }
       if(rrcMsgType == SECURITY_MODE_COMPLETE)
       {
          /* To trigger the DL RRC Msg for RRC Reconfig */
-         f1apMsgDb.dlRrcMsgCount++;
-         rrcMsgType = setDlRRCMsgType();
-        if(rrcMsgType == RRC_RECONFIG)
-        {
-            DU_LOG("\nF1AP: Sending DL RRC MSG for RRC Reconfig");
-            BuildAndSendDLRRCMessageTransfer(srbId, rrcMsgType);
-        }
+         ueCb[duUeF1apId-1].f1apMsgDb.dlRrcMsgCount++;
+         rrcMsgType = setDlRRCMsgType(duUeF1apId);
+         if(rrcMsgType == RRC_RECONFIG)
+         {
+            DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for RRC Reconfig");
+            BuildAndSendDLRRCMessageTransfer(duUeF1apId, srbId, rrcMsgType);
+         }
+      }
+      if(rrcMsgType == UE_CONTEXT_MOD_REQ)
+      {
+         DU_LOG("\nINFO  -->  F1AP: Sending UE Context Modification Request");
+         BuildAndSendUeContextModificationReq(duUeF1apId);
       }
    }
    return ret;
@@ -6566,295 +6711,1257 @@ uint8_t procUlRrcMsg(F1AP_PDU_t *f1apMsg)
  * ****************************************************************/
 void FreeF1ResetAck(F1AP_PDU_t *f1apMsg)
 {
-    uint8_t idx;
-    ResetAcknowledge_t *f1ResetAck;
+   uint8_t idx;
+   ResetAcknowledge_t *f1ResetAck;
 
-    if(f1apMsg)
-    {
-       if(f1apMsg->choice.successfulOutcome)
-       {
-          f1ResetAck= &f1apMsg->choice.successfulOutcome->value.choice.ResetAcknowledge;
+   if(f1apMsg)
+   {
+      if(f1apMsg->choice.successfulOutcome)
+      {
+        f1ResetAck= &f1apMsg->choice.successfulOutcome->value.choice.ResetAcknowledge;
 
-          if(f1ResetAck->protocolIEs.list.array)
-          {
-             for(idx=0; idx<f1ResetAck->protocolIEs.list.count ; idx++)
-             {
-                if(f1ResetAck->protocolIEs.list.array[idx])
-                {
-                   CU_FREE(f1ResetAck->protocolIEs.list.array[idx], sizeof(ResetAcknowledgeIEs_t));
-                }
-             }
-             CU_FREE(f1ResetAck->protocolIEs.list.array, f1ResetAck->protocolIEs.list.size );
-          }
-          CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
-       }
-       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
-    }
+        if(f1ResetAck->protocolIEs.list.array)
+        {
+           for(idx=0; idx<f1ResetAck->protocolIEs.list.count ; idx++)
+           {
+              if(f1ResetAck->protocolIEs.list.array[idx])
+              {
+                 CU_FREE(f1ResetAck->protocolIEs.list.array[idx], sizeof(ResetAcknowledgeIEs_t));
+              }
+           }
+           CU_FREE(f1ResetAck->protocolIEs.list.array, f1ResetAck->protocolIEs.list.size );
+        }
+        CU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
+      }
+      CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
 }
 
 /****************************************************************
-* @brief Build And Send F1ResetAck
-*
-* @details
-*
-*    Function : BuildAndSendF1ResetAck
-*
-*    Functionality:
-*         - Build And Send  F1ResetRSP
-*
-*  @params[in]
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-
-uint8_t BuildAndSendF1ResetAck()
-{
-   uint8_t                idx = 0;
-   uint8_t               elementCnt = 0;
-   uint8_t                ret = RFAILED;
-   F1AP_PDU_t             *f1apMsg = NULL;
-   ResetAcknowledge_t     *f1ResetAck = NULLP;
-   asn_enc_rval_t         encRetVal;
-   DU_LOG("\nF1AP : Building F1 Reset Acknowledgment \n");
-
-   do{
-        /* Allocate the memory for F1ResetRequest_t */
-        CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
-        if(f1apMsg == NULLP)
-        {
-          DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed");
-          break;
-        }
-
-        f1apMsg->present =  F1AP_PDU_PR_successfulOutcome;
-
-        CU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
-        if(f1apMsg->choice.successfulOutcome == NULLP)
-        {
-          DU_LOG("\nF1AP : Memory allocation for F1AP-PDU failed");
-          break;
-        }
-
-        f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_Reset;
-        f1apMsg->choice.successfulOutcome->criticality   = Criticality_reject;
-        f1apMsg->choice.successfulOutcome->value.present = SuccessfulOutcome__value_PR_ResetAcknowledge;
-        f1ResetAck = &f1apMsg->choice.successfulOutcome->value.choice.ResetAcknowledge;
-
-        elementCnt = 1;
-
-        f1ResetAck->protocolIEs.list.count = elementCnt;
-        f1ResetAck->protocolIEs.list.size = elementCnt*sizeof(ResetAcknowledgeIEs_t *);
-
-        CU_ALLOC(f1ResetAck->protocolIEs.list.array, f1ResetAck->protocolIEs.list.size ); 
-        if(f1ResetAck->protocolIEs.list.array == NULLP) 
-        {
-          DU_LOG("\nF1AP : Memory allocation for F1ResetAckIEs failed");
-          break;
-        }
-
-        for(idx=0; idx<elementCnt; idx++)     
-        {
-          CU_ALLOC(f1ResetAck->protocolIEs.list.array[idx], sizeof(ResetAcknowledgeIEs_t));
-          if(f1ResetAck->protocolIEs.list.array[idx] == NULLP)
-          {
-             break;
-          }
-        }
-        /*TransactionID*/
-        idx = 0;
-        f1ResetAck->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_TransactionID;
-        f1ResetAck->protocolIEs.list.array[idx]->criticality = Criticality_reject;
-        f1ResetAck->protocolIEs.list.array[idx]->value.present = ResetAcknowledgeIEs__value_PR_TransactionID;
-        f1ResetAck->protocolIEs.list.array[idx]->value.choice.TransactionID = TRANS_ID;
-
-        xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
-
-        /* Encode the F1SetupRequest type as UPER */
-        memset(encBuf, 0, ENC_BUF_MAX_LEN);
-        encBufSize = 0;
-        encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
-
-        /* Check encode results */
-        if(encRetVal.encoded == ENCODE_FAIL)
-        {
-          DU_LOG("\nF1AP : Could not encode F1ResetAck structure (at %s)\n",\
-              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-          break;
-        }
-        else
-        {
-          DU_LOG("\nF1AP : Created APER encoded buffer for F1ResetAck \n");
-          for(int i=0; i< encBufSize; i++)
-          {
-             printf("%x",encBuf[i]);
-          }
-        }
-        /* Sending msg */
-        if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
-        {
-          DU_LOG("\nF1AP : Sending F1 Reset Response failed");
-          break;
-        }
-
-        ret = ROK;
-        break;
-   }while(true);
-   
-   FreeF1ResetAck(f1apMsg);
-   return ret;
-}
-
-/*******************************************************************
- *
- * @brief Handles received F1AP message and sends back response  
+ * @brief Build And Send F1ResetAck
  *
  * @details
  *
- *    Function : F1APMsgHdlr
+ *    Function : BuildAndSendF1ResetAck
  *
  *    Functionality:
- *         - Decodes received F1AP control message
- *         - Prepares response message, encodes and sends to SCTP
+ *         - Build And Send  F1ResetRSP
  *
- * @params[in] 
+ *  @params[in]
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-void F1APMsgHdlr(Buffer *mBuf)
+
+uint8_t BuildAndSendF1ResetAck()
 {
-   int i;
-   char *recvBuf;
-   MsgLen copyCnt;
-   MsgLen recvBufLen;
-   F1AP_PDU_t *f1apMsg = NULLP;
-   asn_dec_rval_t rval; /* Decoder return value */
-   F1AP_PDU_t f1apasnmsg ;
+   uint8_t                idx = 0;
+   uint8_t               elementCnt = 0;
+   uint8_t                ret = RFAILED;
+   F1AP_PDU_t             *f1apMsg = NULL;
+   ResetAcknowledge_t     *f1ResetAck = NULLP;
+   asn_enc_rval_t         encRetVal;
+   DU_LOG("\nINFO  -->  F1AP : Building F1 Reset Acknowledgment \n");
 
-   DU_LOG("\nF1AP : Received F1AP message buffer");
-   ODU_PRINT_MSG(mBuf, 0,0);
+   do{
+      /* Allocate the memory for F1ResetRequest_t */
+      CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
+        break;
+      }
 
-   /* Copy mBuf into char array to decode it */
-   ODU_GET_MSG_LEN(mBuf, &recvBufLen);
-   CU_ALLOC(recvBuf, (Size)recvBufLen);
+      f1apMsg->present =  F1AP_PDU_PR_successfulOutcome;
 
-   if(recvBuf == NULLP)
-   {
-      DU_LOG("\nF1AP : Memory allocation failed");
-      return;
-   }
-   if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, &copyCnt) != ROK)
-   {
-      DU_LOG("\nF1AP : Failed while copying %d", copyCnt);
-      return;
-   }
+      CU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
+      if(f1apMsg->choice.successfulOutcome == NULLP)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
+        break;
+      }
 
-   printf("\nF1AP : Received flat buffer to be decoded : ");
-   for(i=0; i< recvBufLen; i++)
-   {
-      printf("%x",recvBuf[i]);
-   }
+      f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_Reset;
+      f1apMsg->choice.successfulOutcome->criticality   = Criticality_reject;
+      f1apMsg->choice.successfulOutcome->value.present = SuccessfulOutcome__value_PR_ResetAcknowledge;
+      f1ResetAck = &f1apMsg->choice.successfulOutcome->value.choice.ResetAcknowledge;
 
-   /* Decoding flat buffer into F1AP messsage */
-   f1apMsg = &f1apasnmsg;
-   memset(f1apMsg, 0, sizeof(F1AP_PDU_t));
+      elementCnt = 1;
 
-   rval = aper_decode(0, &asn_DEF_F1AP_PDU, (void **)&f1apMsg, recvBuf, recvBufLen, 0, 0);
-   CU_FREE(recvBuf, (Size)recvBufLen);
+      f1ResetAck->protocolIEs.list.count = elementCnt;
+      f1ResetAck->protocolIEs.list.size = elementCnt*sizeof(ResetAcknowledgeIEs_t *);
 
-   if(rval.code == RC_FAIL || rval.code == RC_WMORE)
-   {
-      DU_LOG("\nF1AP : ASN decode failed");
-      return;
-   }
-   printf("\n");
-   xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+      CU_ALLOC(f1ResetAck->protocolIEs.list.array, f1ResetAck->protocolIEs.list.size ); 
+      if(f1ResetAck->protocolIEs.list.array == NULLP) 
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1ResetAckIEs failed");
+        break;
+      }
 
-   switch(f1apMsg->present)
-   {
-      case F1AP_PDU_PR_initiatingMessage:
+      for(idx=0; idx<elementCnt; idx++)     
       {
-         switch(f1apMsg->choice.initiatingMessage->value.present)
-         {
-            case InitiatingMessage__value_PR_Reset:
-           {
-               DU_LOG("\nF1AP : F1 reset request received ");
-               BuildAndSendF1ResetAck();
-               break;
-           }
+        CU_ALLOC(f1ResetAck->protocolIEs.list.array[idx], sizeof(ResetAcknowledgeIEs_t));
+        if(f1ResetAck->protocolIEs.list.array[idx] == NULLP)
+        {
+           break;
+        }
+      }
+      /*TransactionID*/
+      idx = 0;
+      f1ResetAck->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_TransactionID;
+      f1ResetAck->protocolIEs.list.array[idx]->criticality = Criticality_reject;
+      f1ResetAck->protocolIEs.list.array[idx]->value.present = ResetAcknowledgeIEs__value_PR_TransactionID;
+      f1ResetAck->protocolIEs.list.array[idx]->value.choice.TransactionID = TRANS_ID;
 
-           case InitiatingMessage__value_PR_F1SetupRequest:
-            {
-               DU_LOG("\nF1AP : F1 setup request received");
-               BuildAndSendF1SetupRsp();
-              break;
-            }
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
-            case InitiatingMessage__value_PR_GNBDUConfigurationUpdate:
-            {
-               DU_LOG("\nF1AP : GNB-DU config update received");
-               BuildAndSendDUUpdateAck();
-              DU_LOG("\nF1AP : Sending F1 reset request");
-              BuildAndSendF1ResetReq();
-               break;
-            }
-            case InitiatingMessage__value_PR_InitialULRRCMessageTransfer:
-            {
-               DU_LOG("\nF1AP : Received InitialULRRCMessageTransfer");
-               procInitULRRCMsg(f1apMsg);
-               break;
-            }
-           case InitiatingMessage__value_PR_ULRRCMessageTransfer:
-           {
-              DU_LOG("\nF1AP : Received ULRRCMessageTransfer");
-              procUlRrcMsg(f1apMsg);
-              break;
-           }
-           
-           case InitiatingMessage__value_PR_RRCDeliveryReport:
-           {
-              DU_LOG("\nF1AP : Received RRC delivery report");
-               break;
+      /* Encode the F1SetupRequest type as UPER */
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
+
+      /* Check encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Could not encode F1ResetAck structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for F1ResetAck \n");
+        for(int i=0; i< encBufSize; i++)
+        {
+           DU_LOG("%x",encBuf[i]);
+        }
+      }
+      /* Sending msg */
+      if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Sending F1 Reset Response failed");
+        break;
+      }
+
+      ret = ROK;
+      break;
+   }while(true);
+
+   FreeF1ResetAck(f1apMsg);
+   return ret;
+}
+void FreeUlTnlInfoforDrb2(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
+{
+   uint8_t arrIdx =0;
+
+   if(ulInfo->list.array)
+   {
+      for(arrIdx=0; arrIdx<ulInfo->list.count ; arrIdx++)
+      {
+         if(ulInfo->list.array[arrIdx])
+        {
+           if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel )
+           {
+              if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf)
+              {
+                 if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf)
+                 {
+                    CU_FREE(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+                    gTP_TEID.buf,ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.\
+                    gTPTunnel->gTP_TEID.size);
+                 }
+                 CU_FREE(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+                 transportLayerAddress.buf,ulInfo->list.array[arrIdx]->\
+                 uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
+              }
+              CU_FREE(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel,\
+              sizeof(GTPTunnel_t));
            }
-            default:
-            {
-               DU_LOG("\nF1AP : Invalid type of intiating message [%d]",f1apMsg->choice.initiatingMessage->value.present);
-               return;
-            }
-         }/* End of switch(initiatingMessage) */
-         break;
+           CU_FREE(ulInfo->list.array[arrIdx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
+        }
       }
-      
-      case F1AP_PDU_PR_successfulOutcome:
+      CU_FREE(ulInfo->list.array,ulInfo->list.size);
+   }
+}
+/*******************************************************************
+*
+* @brief Builds the Uplink Tunnel Info
+*
+* @details
+*
+*    Function : BuildUlTnlInfoforDrb2 
+*
+*    Functionality: Constructs the UL TnlInfo For DRB list
+*
+* @params[in] ULUPTNLInformation_ToBeSetup_List_t *ulInfo
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t BuildUlTnlInfoforDrb2(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
+{
+   uint8_t arrIdx;
+   uint8_t ulCnt;
+
+   ulCnt = 1;
+   ulInfo->list.count = ulCnt;
+   ulInfo->list.size = ulCnt * sizeof(ULUPTNLInformation_ToBeSetup_Item_t *);
+   CU_ALLOC(ulInfo->list.array,ulInfo->list.size);
+   if(ulInfo->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildUlTnlInfoforDrb2");
+      return RFAILED;
+   }
+   for(arrIdx=0; arrIdx<ulCnt; arrIdx++)
+   {
+      CU_ALLOC(ulInfo->list.array[arrIdx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
+      if(ulInfo->list.array[arrIdx] == NULLP)
       {
-         switch(f1apMsg->choice.successfulOutcome->value.present)
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildUlTnlInfoforDrb2");
+        return RFAILED;
+      }
+   }
+   
+   arrIdx = 0;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.present = \
+   UPTransportLayerInformation_PR_gTPTunnel;
+   
+   /*GTP TUNNEL*/
+   CU_ALLOC(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel,\
+        sizeof(GTPTunnel_t));
+   if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildUlTnlInfoforDrb2");
+      return RFAILED;
+   }
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      transportLayerAddress.size        = 4*sizeof(uint8_t);
+   CU_ALLOC(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+        transportLayerAddress.buf,ulInfo->list.array[arrIdx]->\
+        uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
+   if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+        transportLayerAddress.buf == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildUlTnlInfoforDrb2");
+      return RFAILED;
+   }
+   
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      transportLayerAddress.buf[0] = 192;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      transportLayerAddress.buf[1] = 168;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      transportLayerAddress.buf[2] = 130;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      transportLayerAddress.buf[3] = 82;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      transportLayerAddress.bits_unused = 0;
+   
+   /*GTP TEID*/
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size\
+      = 4 * sizeof(uint8_t);
+   CU_ALLOC(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+        gTP_TEID.buf,ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.\
+        gTPTunnel->gTP_TEID.size);
+   if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
+        == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildUlTnlInfoforDrb2");
+      return RFAILED;
+   }
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      gTP_TEID.buf[0] = 0;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      gTP_TEID.buf[1] = 0;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      gTP_TEID.buf[2] = 0;
+   ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+      gTP_TEID.buf[3] = cuCfgParams.egtpParams.currTunnelId++;
+
+   return ROK;
+}/*End of BuildULTnlInfo*/
+/*******************************************************************
+*
+* @brief freeing the DRB 2 item
+*
+* @details
+*
+*    Function : FreeDrb2Item 
+*
+*    Functionality: freeing the DRB 2 item
+*
+* @params[in] DRBs_ToBeSetupMod_Item_t *drbItem
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+
+void FreeDrb2Item(DRBs_ToBeSetupMod_Item_t *drbItem)
+{
+   uint8_t arrIdx =0;
+   SNSSAI_t *snssai =NULLP;
+   Flows_Mapped_To_DRB_List_t *flowMap = NULLP;
+
+   drbItem->qoSInformation.present = QoSInformation_PR_choice_extension;
+   switch(drbItem->qoSInformation.present)
+   {
+      case QoSInformation_PR_NOTHING:
+        break;
+      case QoSInformation_PR_eUTRANQoS:
         {
-           case SuccessfulOutcome__value_PR_ResetAcknowledge:
-            {
-              DU_LOG("\nF1Reset Acknowledgement is received successfully ");
-              break;
+           if(drbItem->qoSInformation.choice.eUTRANQoS)
+           {
+              CU_FREE(drbItem->qoSInformation.choice.eUTRANQoS, sizeof(EUTRANQoS_t));
            }
-            case SuccessfulOutcome__value_PR_UEContextSetupResponse:
+           break;
+        }
+      case QoSInformation_PR_choice_extension:
+        {
+           if(drbItem->qoSInformation.choice.choice_extension)
            {
-               DU_LOG("\nF1AP : UE ContextSetupResponse received");
-               f1apMsgDb.dlRrcMsgCount++; /* keeping DL RRC Msg Count */
-               break;
+              FreeQOSInfo(&drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS);
+
+              snssai = &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI;
+              if(snssai->sST.buf)
+              {
+                 CU_FREE(snssai->sST.buf,snssai->sST.size);
+              }
+              if(snssai->sD)
+              {
+                 if(snssai->sD->buf)
+                 {
+                    CU_FREE(snssai->sD->buf,snssai->sD->size);
+                 }
+                 CU_FREE(snssai->sD,sizeof(OCTET_STRING_t));
+              }
+
+              flowMap = &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List;
+              if(flowMap->list.array)
+              {
+                 for(arrIdx=0; arrIdx<flowMap->list.count; arrIdx++)
+                 {
+                    if(flowMap->list.array[arrIdx] )
+                    {
+                       FreeQOSInfo(&flowMap->list.array[arrIdx]->qoSFlowLevelQoSParameters);
+                       CU_FREE(flowMap->list.array[arrIdx],sizeof(Flows_Mapped_To_DRB_Item_t));
+                    }
+                 }
+                 CU_FREE(flowMap->list.array,flowMap->list.size);
+              }
+
+              CU_FREE(drbItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
            }
-            default:
-            {
-               DU_LOG("\nF1AP : Invalid type of successful outcome message [%d]",\
-                 f1apMsg->choice.successfulOutcome->value.present);
-               return;
-            }
-        }/* End of switch(successfulOutcome) */
+           break;
+        }
+
+   }
+   FreeUlTnlInfoforDrb2(&drbItem->uLUPTNLInformation_ToBeSetup_List);
+   if(drbItem->uLConfiguration)
+   {
+      CU_FREE(drbItem->uLConfiguration,sizeof(ULConfiguration_t));
+   }
+}
+/*******************************************************************
+*
+* @brief filling the DRB 2 item 
+*
+* @details
+*
+*    Function : FillDrb2Item 
+*
+*    Functionality: filling the DRB 2 item 
+*
+* @params[in] DRBs_ToBeSetupMod_Item_t *drbItem 
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+
+uint8_t FillDrb2Item(DRBs_ToBeSetupMod_Item_t *drbItem)
+{
+   uint8_t ret = ROK;
+
+   /*Drb Id */
+   drbItem->dRBID = DRB2;
+   
+   /*qoSInformation*/
+   drbItem->qoSInformation.present = QoSInformation_PR_choice_extension;
+  
+   switch(drbItem->qoSInformation.present)
+   {
+      case QoSInformation_PR_NOTHING:
+      {
+         break;
+      }
+      case QoSInformation_PR_eUTRANQoS:
+      {
+
+        CU_ALLOC(drbItem->qoSInformation.choice.eUTRANQoS, sizeof(EUTRANQoS_t));
+        if(drbItem->qoSInformation.choice.eUTRANQoS)
+        {  
+           DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in FillDrb2Item");
+           return RFAILED;
+        }
+        drbItem->qoSInformation.choice.eUTRANQoS->qCI = QCI;
+        drbItem->qoSInformation.choice.eUTRANQoS->allocationAndRetentionPriority.priorityLevel =
+           PriorityLevel_no_priority;
+
+        drbItem->qoSInformation.choice.eUTRANQoS->allocationAndRetentionPriority.pre_emptionCapability =
+           Pre_emptionCapability_may_trigger_pre_emption;
+
+        drbItem->qoSInformation.choice.eUTRANQoS->allocationAndRetentionPriority.pre_emptionVulnerability =
+           Pre_emptionVulnerability_pre_emptable;
+
         break;
-      } 
-      default:
+      }
+      case QoSInformation_PR_choice_extension:
+      {
+        CU_ALLOC(drbItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
+        if(drbItem->qoSInformation.choice.choice_extension == NULLP)
+        {
+           DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in FillDrb2Item"); 
+           return RFAILED;
+        }
+
+        drbItem->qoSInformation.choice.choice_extension->id = ProtocolIE_ID_id_DRB_Information;
+        drbItem->qoSInformation.choice.choice_extension->criticality = Criticality_ignore;
+        drbItem->qoSInformation.choice.choice_extension->value.present = QoSInformation_ExtIEs__value_PR_DRB_Information;
+        ret =  BuildQOSInfo(&drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS);
+        if(ret != ROK)
+        {
+           DU_LOG("\nERROR  -->  F1AP : BuildQOSInfo failed");
+           return RFAILED;
+        }
+        
+        /*SNSSAI*/
+        ret = BuildSNSSAI(&drbItem->qoSInformation.choice.\
+              choice_extension->value.choice.DRB_Information.sNSSAI);
+        if(ret != ROK)
+        {
+           DU_LOG("\nERROR  -->  F1AP : BuildSNSSAI failed");
+           return RFAILED;
+        }
+        
+        /*Flows mapped to DRB List*/
+         ret = BuildFlowsMap(&drbItem->qoSInformation.choice.\
+              choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List);
+        if(ret != ROK)
+        {
+           DU_LOG("\nERROR  -->  F1AP : BuildFlowsMap failed");
+           return RFAILED;
+        }
+      }
+   }
+   
+   /*ULUPTNLInformation To Be Setup List*/
+   ret = BuildUlTnlInfoforDrb2(&drbItem->uLUPTNLInformation_ToBeSetup_List);
+   if(ret != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildUlTnlInfoforDrb2 failed");
+      return RFAILED;
+   }
+
+   /*RLCMode*/
+   drbItem->rLCMode = RLCMode_rlc_um_bidirectional;
+
+   /*UL Configuration*/
+   CU_ALLOC(drbItem->uLConfiguration,sizeof(ULConfiguration_t));
+   if(drbItem->uLConfiguration == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in FillDrb2Item");
+      return RFAILED;
+   }
+   drbItem->uLConfiguration->uLUEConfiguration = ULUEConfiguration_no_data;
+   return ROK;
+}
+/*******************************************************************
+*
+* @brief Builds the DRB to be Setup Mod ItemIes
+*
+* @details
+*
+*    Function : FillDrbItemList 
+*
+*    Functionality: Constructs the DRB to be Setup Mod Item Ies
+*
+* @params[in] struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe 
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+
+uint8_t FillDrbItemList(struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe)
+{
+   drbItemIe->id = ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item;
+   drbItemIe->criticality = Criticality_reject;
+   drbItemIe->value.present = DRBs_ToBeSetupMod_ItemIEs__value_PR_DRBs_ToBeSetupMod_Item;
+
+   if(FillDrb2Item(&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item)) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : FillDrb2Item failed"); 
+      return RFAILED;
+   }
+   return ROK;
+}
+/*******************************************************************
+*
+* @brief free the DRB to be Setup Mod list
+*
+* @details
+*
+*    Function : FreeDrbToBeSetupModList
+*
+*    Functionality: free the DRB to be Setup Mod list
+*
+* @params[in] DRBs_ToBeSetupMod_List_t *drbSet
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+void FreeDrbToBeSetupModList(DRBs_ToBeSetupMod_List_t *drbSet)
+{
+   uint8_t arrIdx =0;
+   struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe;
+
+   if(drbSet->list.array)
+   {
+      for(arrIdx=0; arrIdx<drbSet->list.count ; arrIdx++)
+      {
+        if(drbSet->list.array[arrIdx] != NULLP)
         {
-           DU_LOG("\nF1AP : Invalid type of f1apMsg->present [%d]",f1apMsg->present);
-           return;
+           if(arrIdx == 0)
+           {
+              drbItemIe = (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx];
+              FreeDrb2Item(&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item));
+           }
+           CU_FREE(drbSet->list.array[arrIdx], sizeof(DRBs_ToBeSetupMod_ItemIEs_t));
         }
+      }
+      CU_FREE(drbSet->list.array, drbSet->list.size);
+   }
+   
+}
+
+
+/*******************************************************************
+*
+* @brief Builds the DRB to be Setup Mod list 
+*
+* @details
+*
+*    Function : BuildDrbToBeSetupModList 
+*
+*    Functionality: Constructs the DRB to be Setup Mod list
+*
+* @params[in] DRBs_ToBeSetupMod_List_t *drbSet 
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+
+uint8_t BuildDrbToBeSetupModList(DRBs_ToBeSetupMod_List_t *drbSet)
+{
+   uint8_t ret = ROK;
+   uint8_t arrIdx =0;
+   uint8_t drbCnt =0;
+
+   drbCnt = 1;
+   drbSet->list.count = drbCnt;
+   drbSet->list.size = drbCnt * sizeof(DRBs_ToBeSetupMod_ItemIEs_t *);
+   CU_ALLOC(drbSet->list.array, drbSet->list.size);
+   if(drbSet->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDrbToBeSetupModList");
+      return  RFAILED;
+   }
+   for(arrIdx=0; arrIdx<drbCnt; arrIdx++)
+   {
+      CU_ALLOC(drbSet->list.array[arrIdx], sizeof(DRBs_ToBeSetupMod_ItemIEs_t));
+      if(drbSet->list.array[arrIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDrbToBeSetupModList");
+        return  RFAILED;
+      }
+   }
+
+   arrIdx=0;
+   ret = FillDrbItemList((DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx]);
+   if(ret != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : FillDrbItemList failed");
+   }
+
+   return ret;
+}
+/*******************************************************************
+ *
+ * @brief  free the UeContextModification Request 
+ *
+ * @details
+ *
+ *    Function : FreeUeContextModicationRequest 
+ *
+ *    Functionality : deallocation of memory allocated in UeContextModiification
+ request
+ *
+ * @params[in] F1AP_PDU_t *f1apMsg 
+ *
+ * @return void 
+*
+* ****************************************************************/
+void FreeUeContextModicationRequest(F1AP_PDU_t *f1apMsg)
+{
+   uint8_t arrIdx =0 , ieId=0; 
+   UEContextModificationRequest_t *UeContextModifyReq = NULLP;
+
+   if(f1apMsg)
+   {
+      if(f1apMsg->choice.initiatingMessage)
+      {
+        UeContextModifyReq =&f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
+        if(UeContextModifyReq->protocolIEs.list.array)
+        {
+           for( arrIdx = 0 ; arrIdx<UeContextModifyReq->protocolIEs.list.count ; arrIdx++)
+           {
+              if(UeContextModifyReq->protocolIEs.list.array[arrIdx])
+              {
+                 ieId = UeContextModifyReq->protocolIEs.list.array[arrIdx]->id;
+                 switch(ieId)
+                 {
+                    case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+                       break;
+                    case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+                       break;
+                    case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
+                       {
+                          FreeDrbToBeSetupModList(&UeContextModifyReq->protocolIEs.list.array[arrIdx]->value.\
+                          choice.DRBs_ToBeSetupMod_List);
+                          break;
+                       }
+                 }
+                 CU_FREE(UeContextModifyReq->protocolIEs.list.array[arrIdx], sizeof(UEContextModificationRequest_t));
+              }          
+           }
+           CU_FREE(UeContextModifyReq->protocolIEs.list.array, UeContextModifyReq->protocolIEs.list.size);
+        }
+        CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      }
+      CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
+}
+/*******************************************************************
+ *
+ * @brief Builds the Ue Context Modification Req 
+ *
+ * @details
+ *
+ *    Function : BuildAndSendUeContextModificationReq 
+ *
+ *    Functionality: Constructs the Ue Context Modification Req
+ *
+ * @params[in] 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendUeContextModificationReq(uint8_t ueId)
+{
+   uint8_t    ieIdx = 0;
+   uint8_t    elementCnt = 0;
+   uint8_t    ret = RFAILED;
+   F1AP_PDU_t *f1apMsg = NULLP;
+   UEContextModificationRequest_t *ueContextModifyReq = NULLP;
+
+   asn_enc_rval_t         encRetVal;
+   DU_LOG("\nINFO  -->  F1AP : Building Ue context modification request\n");
+
+   while(1)
+   {
+      CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed Ue context modification");
+        break;
+      }
+
+      f1apMsg->present =  F1AP_PDU_PR_initiatingMessage;
+
+      CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      if(f1apMsg->choice.initiatingMessage == NULLP)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed Ue context modification");
+        break;
+      }
+      f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_UEContextModification;
+      f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
+      f1apMsg->choice.initiatingMessage->value.present = InitiatingMessage__value_PR_UEContextModificationRequest;
+
+      ueContextModifyReq =&f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
+
+      elementCnt = 3;
+      ueContextModifyReq->protocolIEs.list.count = elementCnt;
+      ueContextModifyReq->protocolIEs.list.size = elementCnt*sizeof(UEContextModificationRequest_t *);
+
+      /* Initialize the UE context modification members */
+      CU_ALLOC(ueContextModifyReq->protocolIEs.list.array, ueContextModifyReq->protocolIEs.list.size);
+      if(ueContextModifyReq->protocolIEs.list.array == NULLP)
+      { 
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE context modifcation Request failed");
+        break;
+      }
+
+      for(ieIdx=0 ; ieIdx<elementCnt; ieIdx++)
+      {
+        CU_ALLOC(ueContextModifyReq->protocolIEs.list.array[ieIdx], sizeof(UEContextModificationRequest_t));
+        if(ueContextModifyReq->protocolIEs.list.array[ieIdx] == NULLP)
+        {
+           DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE context modifcation Request failed");
+           break;
+        }
+      }
+
+
+      ieIdx=0;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = \
+                                                                         UEContextModificationRequestIEs__value_PR_GNB_CU_UE_F1AP_ID;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID = ueId;
+
+      ieIdx++;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present=\
+                                                                       UEContextModificationRequestIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = ueId;
+
+      ieIdx++;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_ToBeSetupMod_List;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present =\
+         UEContextModificationRequestIEs__value_PR_DRBs_ToBeSetupMod_List;
+      ret = BuildDrbToBeSetupModList(&(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
+         value.choice.DRBs_ToBeSetupMod_List));
+      if(ret != ROK)
+      {
+         break;
+      }
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the F1SetupRequest type as APER */
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
+           encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Could not encode ueContextModifyReq structure (at %s)\n",\
+              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+        break;
+      }
+      else
+      {
+        DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for ueContextModifyReq\n");
+        for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
+        {
+           DU_LOG("%x",encBuf[ieIdx]);
+        }
+      }
+
+      if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Sending Ue context modification request  failed");
+        break;
+      }
+
+      ret = ROK;
+      break;
+
+   }
+   FreeUeContextModicationRequest(f1apMsg);
+   return ret;
+}
+/*****************************************************************i
+*
+* @brief Free memory allocated for UE Context Release Command  
+*
+* @details
+*
+*    Function : FreeUeContextReleaseCommand
+*
+*    Functionality:
+*         - Free memory allocated for UE Context Release Command 
+*
+* @params[in] F1AP_PDU_t *f1apMsg
+* @return void
+*
+* *************************************************************/
+void FreeUeContextReleaseCommand(F1AP_PDU_t *f1apMsg)
+{
+   uint8_t ieIdx;
+   UEContextReleaseCommand_t *ueReleaseCommand = NULLP;
+
+   if(f1apMsg)
+   {
+      if(f1apMsg->choice.initiatingMessage)
+      {
+         ueReleaseCommand =&f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseCommand;
+         if(ueReleaseCommand->protocolIEs.list.array)
+         {
+            for(ieIdx=0 ; ieIdx<ueReleaseCommand->protocolIEs.list.count; ieIdx++)
+            {
+               CU_FREE(ueReleaseCommand->protocolIEs.list.array[ieIdx], sizeof(UEContextReleaseCommand_t));
+            }
+            CU_FREE(ueReleaseCommand->protocolIEs.list.array, ueReleaseCommand->protocolIEs.list.size);
+         }
+         CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      }
+      CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
+}
+/*******************************************************************
+ *
+ * @brief Builds the Ue Context Release Command 
+ *
+ * @details
+*
+*    Function : BuildAndSendUeContextReleaseCommand
+*
+*    Functionality: Constructs the Ue Context Release Command 
+*
+* @params[in]
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t BuildAndSendUeContextReleaseCommand(uint8_t cuUeF1apId, uint8_t duUeF1apId)
+{
+   bool       memAllocFailed = false;
+   uint8_t    ieIdx = 0,elementCnt = 0, ret = RFAILED, bufLen=0;
+   F1AP_PDU_t *f1apMsg = NULLP;
+   UEContextReleaseCommand_t *ueContextReleaseCommand = NULLP;
+
+   asn_enc_rval_t         encRetVal;
+   DU_LOG("\nINFO  -->  F1AP : Building Ue context release command\n");
+
+   while(true)
+   {
+      CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseCommand(): Memory allocation for F1AP-PDU");
+         break;
+      }
+
+      f1apMsg->present =  F1AP_PDU_PR_initiatingMessage;
+
+      CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      if(f1apMsg->choice.initiatingMessage == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseCommand(): Memory allocation for F1AP-PDU failed ");
+         break;
+      }
+      f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_UEContextRelease;
+      f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
+      f1apMsg->choice.initiatingMessage->value.present = InitiatingMessage__value_PR_UEContextReleaseCommand;
+
+      ueContextReleaseCommand =&f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseCommand;
+
+      elementCnt = 4;
+      ueContextReleaseCommand->protocolIEs.list.count = elementCnt;
+      ueContextReleaseCommand->protocolIEs.list.size = elementCnt*sizeof(UEContextReleaseCommand_t*);
+
+      /* Initialize the UE context modification members */
+      CU_ALLOC(ueContextReleaseCommand->protocolIEs.list.array, ueContextReleaseCommand->protocolIEs.list.size);
+      if(ueContextReleaseCommand->protocolIEs.list.array == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseCommand():Memory allocation failed");
+         break;
+      }
+
+      for(ieIdx=0 ; ieIdx<elementCnt; ieIdx++)
+      {
+         CU_ALLOC(ueContextReleaseCommand->protocolIEs.list.array[ieIdx], sizeof(UEContextReleaseCommand_t));
+         if(ueContextReleaseCommand->protocolIEs.list.array[ieIdx] == NULLP)
+         {
+            DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseCommand(): Memory allocation failed ");
+            memAllocFailed = true;  
+            break;
+         }
+      }
+      
+      if(memAllocFailed == true)
+      {
+         break;
+      }
+      ieIdx=0;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.present = \
+      UEContextReleaseCommandIEs__value_PR_GNB_CU_UE_F1AP_ID;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID =cuUeF1apId;
+
+      ieIdx++;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.present=\
+      UEContextReleaseCommandIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID =duUeF1apId;
+
+      ieIdx++;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_Cause;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.present=\
+      UEContextReleaseCommandIEs__value_PR_Cause;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.Cause.present = Cause_PR_radioNetwork;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.Cause.choice.radioNetwork=\
+      CauseRadioNetwork_normal_release;
+     
+      /* RRC Container for RRC release */
+      ieIdx++;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_RRCContainer;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.present = \
+      UEContextReleaseCommandIEs__value_PR_RRCContainer;
+      char secModeBuf[7]={ 0x00, 0x05, 0x13, 0x00, 0x00, 0x00, 0x00};
+      bufLen =7;
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size = bufLen;
+      CU_ALLOC(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,
+      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
+      if(!ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
+      {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for BuildAndSendUeContextSetupReq failed");
+      break;
+      }
+      memset(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, 0, bufLen);
+      memcpy(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, secModeBuf, bufLen);
+      
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the UE Context Release Command type as APER */
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
+            encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Could not encode Release Command structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for Ue Context Release Command\n");
+         for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
+         {
+            DU_LOG("%x",encBuf[ieIdx]);
+         }
+      }
+
+      if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Sending Ue context Release Command failed");
+         break;
+      }
+
+      ret = ROK;
+      break;
+
+   }
+   FreeUeContextReleaseCommand(f1apMsg);
+   return ret;
+}
+/*******************************************************************
+*
+* @brief process Ue context release request 
+*
+* @details
+*
+*    Function : procUeContextReleaseReq 
+*
+*    Functionality:
+*         - process Ue context release request 
+*
+* @params[in] F1AP_PDU_t *f1apMsg
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t procUeContextReleaseReq(F1AP_PDU_t *f1apMsg) 
+{
+   uint8_t ieIdx=0, duUeF1apId=0,cuUeF1apId=0;
+
+   UEContextReleaseRequest_t *ueReleaseReq = NULLP;
+   ueReleaseReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseRequest;
+   
+   for(ieIdx=0; ieIdx < ueReleaseReq->protocolIEs.list.count; ieIdx++)
+   {
+      switch(ueReleaseReq->protocolIEs.list.array[ieIdx]->id)
+      {
+         case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+            {
+               cuUeF1apId = ueReleaseReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
+               break;
+            }
+         case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+            {
+               duUeF1apId = ueReleaseReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
+               break;
+            }
+         default:
+              break;
+      }
+   }
+   if(BuildAndSendUeContextReleaseCommand(cuUeF1apId, duUeF1apId) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : procUeContextReleaseReq(): Failed to build Ue Context Release Command ");
+      return RFAILED;
+   }
+   return ROK;
+}
+/*******************************************************************
+*
+* @brief processing of Gnb-DU config update 
+*
+* @details
+*
+*    Function : procGnbDuUpdate 
+*
+*    Functionality:
+*         - processing of Gnb-DU config update 
+*
+* @params[in] F1AP_PDU_t *f1apMsg
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t procGnbDuUpdate(F1AP_PDU_t *f1apMsg)
+{
+   bool cellToBeDelete = false;
+   uint8_t ieIdx = 0, ueIdx = 0;
+   GNBDUConfigurationUpdate_t *duCfgUpdate = NULLP;
+
+   duCfgUpdate = &f1apMsg->choice.initiatingMessage->value.choice.GNBDUConfigurationUpdate;
+
+   for(ieIdx=0; ieIdx < duCfgUpdate->protocolIEs.list.count; ieIdx++)
+   {
+      switch(duCfgUpdate->protocolIEs.list.array[ieIdx]->id)
+      {
+         case ProtocolIE_ID_id_TransactionID:
+            break;
+         case ProtocolIE_ID_id_Served_Cells_To_Modify_List:
+            break;
+         case ProtocolIE_ID_id_Served_Cells_To_Delete_List:
+            {
+               cellToBeDelete = true;
+               break;
+            }
+         case ProtocolIE_ID_id_gNB_DU_ID:
+            break;
+      }
+   }
+   if(BuildAndSendDUUpdateAck() != ROK)
+   {
+      DU_LOG("ERROR  -->  F1AP : Failed to build and send DUUpdateAck");  
+      return RFAILED;
+   }
+
+   if(cellToBeDelete == false)
+   {
+      DU_LOG("\nINFO  -->  F1AP : Sending F1 reset request");
+      if(BuildAndSendF1ResetReq() != ROK)
+      {
+         DU_LOG("ERROR  -->  F1AP : Failed to build and send F1 reset request");
+         return RFAILED;
+      }
+   }
+   else
+   {
+      for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
+      {
+         CU_FREE(ueCb[ueIdx].f1apMsgDb.duToCuContainer.buf, ueCb[ueIdx].f1apMsgDb.duToCuContainer.size);
+         memset(&ueCb[ueIdx], 0, sizeof(UeCb));
+      }
+   }
+
+   return ROK;
+}
+/*******************************************************************
+ *
+ * @brief Handles received F1AP message and sends back response  
+ *
+ * @details
+ *
+ *    Function : F1APMsgHdlr
+ *
+ *    Functionality:
+ *         - Decodes received F1AP control message
+ *         - Prepares response message, encodes and sends to SCTP
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void F1APMsgHdlr(Buffer *mBuf)
+{
+   int i;
+   char *recvBuf;
+   MsgLen copyCnt;
+   MsgLen recvBufLen;
+   F1AP_PDU_t *f1apMsg = NULLP;
+   asn_dec_rval_t rval; /* Decoder return value */
+   F1AP_PDU_t f1apasnmsg ;
+
+   DU_LOG("\nINFO  -->  F1AP : Received F1AP message buffer");
+   ODU_PRINT_MSG(mBuf, 0,0);
+
+   /* Copy mBuf into char array to decode it */
+   ODU_GET_MSG_LEN(mBuf, &recvBufLen);
+   CU_ALLOC(recvBuf, (Size)recvBufLen);
+
+   if(recvBuf == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed");
+      return;
+   }
+   if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, recvBufLen, (Data *)recvBuf, &copyCnt) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed while copying %d", copyCnt);
+      return;
+   }
+
+   DU_LOG("\nDEBUG  -->  F1AP : Received flat buffer to be decoded : ");
+   for(i=0; i< recvBufLen; i++)
+   {
+      DU_LOG("%x",recvBuf[i]);
+   }
+
+   /* Decoding flat buffer into F1AP messsage */
+   f1apMsg = &f1apasnmsg;
+   memset(f1apMsg, 0, sizeof(F1AP_PDU_t));
+
+   rval = aper_decode(0, &asn_DEF_F1AP_PDU, (void **)&f1apMsg, recvBuf, recvBufLen, 0, 0);
+   CU_FREE(recvBuf, (Size)recvBufLen);
+
+   if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+   {
+      DU_LOG("\nERROR  -->  F1AP : ASN decode failed");
+      return;
+   }
+   DU_LOG("\n");
+   xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+   switch(f1apMsg->present)
+   {
+      case F1AP_PDU_PR_initiatingMessage:
+         {
+            switch(f1apMsg->choice.initiatingMessage->value.present)
+            {
+               case InitiatingMessage__value_PR_Reset:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : F1 reset request received ");
+                     BuildAndSendF1ResetAck();
+                     break;
+                  }
+
+               case InitiatingMessage__value_PR_F1SetupRequest:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : F1 setup request received");
+                     BuildAndSendF1SetupRsp();
+                     break;
+                  }
+
+               case InitiatingMessage__value_PR_GNBDUConfigurationUpdate:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : GNB-DU config update received");
+                     procGnbDuUpdate(f1apMsg);
+                     break;
+                  }
+               case InitiatingMessage__value_PR_InitialULRRCMessageTransfer:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : Received InitialULRRCMessageTransfer");
+                     procInitULRRCMsg(f1apMsg);
+                     break;
+                  }
+               case InitiatingMessage__value_PR_ULRRCMessageTransfer:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : Received ULRRCMessageTransfer");
+                     procUlRrcMsg(f1apMsg);
+                     break;
+                  }
+
+               case InitiatingMessage__value_PR_RRCDeliveryReport:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : Received RRC delivery report");
+                     break;
+                  }
+               case InitiatingMessage__value_PR_UEContextReleaseRequest:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : Received UE Context Release Request");
+                     procUeContextReleaseReq(f1apMsg);
+                     break;
+                  }
+               default:
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : Invalid type of intiating message [%d]",\
+                           f1apMsg->choice.initiatingMessage->value.present);
+                     return;
+                  }
+            }/* End of switch(initiatingMessage) */
+            break;
+         }
+
+      case F1AP_PDU_PR_successfulOutcome:
+         {
+            switch(f1apMsg->choice.successfulOutcome->value.present)
+            {
+               case SuccessfulOutcome__value_PR_ResetAcknowledge:
+                  {
+                     DU_LOG("\nINFO  -->  F1Reset Acknowledgement is received successfully ");
+                     break;
+                  }
+               case SuccessfulOutcome__value_PR_UEContextSetupResponse:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : UE ContextSetupResponse received");
+                     procUeContextSetupResponse(f1apMsg);
+                     break;
+                  }
+               case SuccessfulOutcome__value_PR_UEContextModificationResponse:
+                  {
+                     DU_LOG("\nINFO  -->  F1AP : UE Context Modification Response received");
+                     break;
+                  }
+               case SuccessfulOutcome__value_PR_UEContextReleaseComplete:
+                  {
+                      DU_LOG("\nINFO  -->  F1AP : UE Context release complete received");
+                      break;
+                  }
+               default:
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : Invalid type of successful outcome message [%d]",\
+                           f1apMsg->choice.successfulOutcome->value.present);
+                     return;
+                  }
+            }/* End of switch(successfulOutcome) */
+            break;
+         } 
+      default:
+         {
+            DU_LOG("\nERROR  -->  F1AP : Invalid type of f1apMsg->present [%d]",f1apMsg->present);
+            return;
+         }
    }/* End of switch(f1apMsg->present) */
 
 } /* End of F1APMsgHdlr */