[Epic-ID: ODUHIGH-406][Task-ID: ODUHIGH-423] UE context setup request from CU to... 22/7922/5
authorlal.harshita <Harshita.Lal@radisys.com>
Fri, 11 Mar 2022 11:07:55 +0000 (16:37 +0530)
committerlal.harshita <Harshita.Lal@radisys.com>
Mon, 21 Mar 2022 11:24:00 +0000 (16:54 +0530)
Signed-off-by: lal.harshita <Harshita.Lal@radisys.com>
Change-Id: I7d69974779849ddb24429321a6eaaa3c9bbca126
Signed-off-by: lal.harshita <Harshita.Lal@radisys.com>
13 files changed:
src/cm/du_app_rlc_inf.h
src/cu_stub/cu_f1ap_msg_hdl.c
src/cu_stub/cu_f1ap_msg_hdl.h
src/cu_stub/cu_stub.c
src/cu_stub/cu_stub.h
src/du_app/du_cell_mgr.c
src/du_app/du_cfg.c
src/du_app/du_cfg.h
src/du_app/du_f1ap_conversions.c
src/du_app/du_f1ap_conversions.h
src/du_app/du_f1ap_msg_hdl.c
src/du_app/du_mgr.h
src/du_app/du_ue_mgr.c

index 5dd9f6c..debc8b0 100644 (file)
@@ -195,6 +195,7 @@ typedef struct rlcBearerCfg
       UmUniDirUlBearerCfg *umUniDirUlCfg;
       UmUniDirDlBearerCfg *umUniDirDlCfg;
    }u;
+   bool isLcAddModRspSent;
 }RlcBearerCfg;
 
 typedef struct rlcUeCfg
index fdf6168..563ea45 100644 (file)
 /* This file contains F1AP message handler functions */
 #include "common_def.h"
 #include "OCTET_STRING.h"
-#include "cu_stub_sctp.h"
-#include "cu_stub_egtp.h"
-#include "cu_f1ap_msg_hdl.h"
-#include "cu_stub.h"
-
 #include "BIT_STRING.h"
 #include "odu_common_codec.h"
 #include "ProtocolIE-Field.h"
@@ -35,6 +30,8 @@
 #include "UE-CapabilityRAT-Container.h"
 #include "UE-CapabilityRAT-ContainerList.h"
 #include "UE-CapabilityRAT-ContainerListRRC.h"
+#include "HandoverPreparationInformationRrc-IEs.h"
+#include "HandoverPreparationInformationRrc.h"
 #include "SupportedBandwidth.h"
 #include "FeatureSetUplinkPerCC.h"
 #include "FeatureSetDownlinkPerCC.h"
 #include "DRB-ToAddModList.h"
 #include "DRB-ToAddMod.h"
 #include "SDAP-Config.h"
+#include "SSB-MTC.h"
+#include "MeasTiming.h"
+#include "MeasTimingList.h"
+#include "MeasurementTimingConfigurationRrc-IEs.h"
+#include "MeasurementTimingConfigurationRrc.h"
+#include "PDCP-Config.h"
+#include "RSRP-Range.h"
+#include "RSRQ-Range.h"
+#include "SINR-Range.h"
+#include "ThresholdNR.h"
+#include "MeasObjectToAddMod.h"
+#include "MeasObjectNR.h"
+#include "MeasObjectToAddModList.h"
+#include "EventTriggerConfig.h"
+#include "ReportConfigNR.h"
+#include "ReportConfigToAddMod.h"
+#include "ReportConfigToAddModList.h"
+#include "MeasIdToAddMod.h"
+#include "MeasIdToAddModList.h"
+#include "FilterCoefficient.h"
+#include "QuantityConfigNR.h"
+#include "QuantityConfig.h"
+#include "MeasConfigRrc.h"
+#include "AS-Config.h"
+#include "RRCReconfiguration-v1530-IEs.h"
+
+#include "cu_stub_sctp.h"
+#include "cu_stub_egtp.h"
+#include "cu_f1ap_msg_hdl.h"
+#include "cu_stub.h"
 
-/* MACRO for CUtoDURRCInformation */
-#define CELL_GRP_ID 1
-#define FREQ_DOM_RSRC_SIZE 6
-#define CORESET0_END_PRB   48
-#define CORESET1_NUM_PRB   24
-#define PDCCH_CTRL_RSRC_SET_ONE_ID  1
-#define PDCCH_CTRL_RSRC_SET_ONE_DURATION 2  /* Duration for control resource set id i */
-#define PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY 1   /* Precoded granularity */
-#define PDCCH_SRCH_SPC_TWO_ID 2
-#define NR_PCI 1
-#define SCRAMBLING_ID  NR_PCI
-#define DMRS_ADDITIONAL_POS  0          /* DMRS Additional poistion */
-#define PDCCH_SYMBOL_WITHIN_SLOT 128     /* Symbol within Slot Value */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE 7   /* Num of candidate at aggregation level 1 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE 7   /* Num of candidate at aggregation level 2 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE 4   /* Num of candidate at aggregation level 4 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE 2   /* Num of candidate at aggregation level 8 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE 1  /* Num of candidate at aggregation level 16 */
-#define PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT  0  /* format 0-0 and 1-0 */
-#define PDCCH_SERACH_SPACE_DCI_FORMAT 0
-
-/* MACRO Ddefine for PDSCH Configuration */
-#define PDSCH_K0  0
-#define PDSCH_RES_ALLOC_TYPE       1          /* Resource allocation type */
-#define PDSCH_MAX_CODEWORD_SCH_BY_DCI 0       /* Max num of codewords scheduled by DCI */
-#define PDSCH_RBG_SIZE   0                    /* 0: config1 */
-#define PDSCH_NUM_HARQ_PROC 5
-#define PDSCH_MAPPING_TYPE_A 0
-#define PDSCH_MAPPING_TYPE_B 1
-
-/* MACRO Define for PUSCH Configuration */
-#define PUSCH_K2_CFG1  1
-#define PUSCH_K2_CFG2  2
-#define PUSCH_START_SYMBOL 3
-
-#define PUSCH_MSG3_DELTA_PREAMBLE 0
-#define PUSCH_P0_NOMINAL_WITH_GRANT -70
-#define PUSCH_TRANSFORM_PRECODER    1      /* 1: Disabled */
-#define PUSCH_MAX_MIMO_LAYERS       1
-#define PUSCH_PROCESS_TYPE2_ENABLED false
-#define PUSCH_MAPPING_TYPE_A        0
-#define PUSCH_MAPPING_TYPE_B        1
-
-/* MACRO defines for SRC config */
-#define SRS_RSRC_ID  1
-#define SRS_RSET_ID  1
-#define SRS_COMB_OFFSET_N2   0
-#define SRS_CYCLIC_SHIFT_N2  0
-#define SRS_FREQ_DOM_POS     0
-#define SRS_FREQ_DOM_SHIFT   0
-#define C_SRS 0
-#define B_SRS 0
-#define B_HOP 0
-#define SRS_SEQ_ID 0
-#define APERIODIC_SRS_RESRC_TRIGGER 1 
-
-/* Macro definitions for DUtoCuRrcContainer */
-#define CELL_GRP_ID 1
-#define SCH_REQ_ID  0
-#define SR_PROHIBIT_TMR 5
-#define SR_TRANS_MAX 2
-#define PERIODIC_BSR_TMR 2
-#define RETX_BSR_TMR     5
-#define SR_DELAY_TMR     6
-#define TAG_ID 0
-#define TIME_ALIGNMENT_TMR 7
-#define PHR_PERIODIC_TMR 7
-#define PHR_PROHIBHIT_TMR 0
-#define PHR_PWR_FACTOR_CHANGE 3
-#define PHR_MODE_OTHER_CG 0
-#define RLC_LCID 1 
-#define SRB_ID_1 1
-#define SN_FIELD_LEN 0
-#define T_POLL_RETRANSMIT 8 
-#define POLL_PDU 0
-#define POLL_BYTE 43
-#define MAX_RETX_THRESHOLD 5
-#define T_REASSEMBLY 8
-#define T_STATUS_PROHIBHIT 7
-#define MAC_LC_PRIORITY 1
-#define PRIORTISIED_BIT_RATE 15
-#define BUCKET_SIZE_DURATION 5
-#define LC_GRP 0
-#define P_NR_FR1 0
-#define PDSCH_HARQ_ACK_CODEBOOK 1
-#define SERV_CELL_IDX 0
-#define RLM_SYNC_OUT_SYNC_THRESHOLD 0
-#define ACTIVE_DL_BWP_ID 0
-#define ACTIVE_UL_BWP_ID 0
-#define SCRAMBLING_ID  NR_PCI
-#define DMRS_ADDITIONAL_POS  0          /* DMRS Additional poistion */
-#define RES_ALLOC_TYPE       1          /* Resource allocation type */
-#define FIVE_QI_VALUE9 9  /*spec 23.501, Table 5.7.4-1*/
-#define FIVE_QI_VALUE8 8  /*spec 23.501, Table 5.7.4-1*/
-#define PDU_SESSION_ID_1 1
-#define PDU_SESSION_ID_2 2
-#define INVALID_PDU_SESSION_ID -1
+uint8_t fillCellGrpCfg(CuUeCb *ueCb, OCTET_STRING_t *cellGrp, bool updateAllRbCfg);
+uint8_t fillRrcReconfig(CuUeCb *ueCb, RRCReconfiguration_t *rrcReconfig, bool updateAllRbCfg);
 
 /*******************************************************************
  *
@@ -1000,39 +932,50 @@ uint8_t BuildAndSendF1ResetReq()
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t fillSrbCfg(uint8_t srbId, SRB_ToAddModList_t *bearerCfg)
+uint8_t fillSrbCfg(CuUeCb *ueCb, SRB_ToAddModList_t *bearerCfg)
 {
-   uint8_t elementCnt;
-   uint8_t idx, ieId;
+   uint8_t elementCnt = 0;
+   uint8_t idx, ieId, srbIdx = 0;
+
+   for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+   {
+      if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+         elementCnt++;
+   }
+
    if(bearerCfg != NULLP)
    {
-      elementCnt = 1;
       bearerCfg->list.count = elementCnt;
-      bearerCfg->list.size =\
-                           elementCnt * sizeof(SRB_ToAddMod_t *);
+      bearerCfg->list.size = 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;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for bearer list arry in fillSrbCfg");
+         return RFAILED;
       }
+
       idx = 0;
-      bearerCfg->list.array[idx]->srb_Identity = srbId;
+      for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+      {
+         if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+            bearerCfg->list.array[idx++]->srb_Identity = ueCb->srbList[srbIdx].srbId;
+      }
    }
    return ROK;
 }
@@ -1098,23 +1041,31 @@ uint8_t fillMasterCellGroup(CuUeCb *ueCb, OCTET_STRING_t *masterCellGroup)
 
 uint8_t fillRRCSetupIE(CuUeCb *ueCb, RRCSetup_IEs_t *rrcSetupIE)
 {
-   uint8_t ret = ROK;
+   uint8_t ret = ROK, srbIdx = 0;
    if(rrcSetupIE)
    {
       CU_ALLOC(rrcSetupIE->radioBearerConfig.srb_ToAddModList, sizeof(SRB_ToAddModList_t));
       if(rrcSetupIE->radioBearerConfig.srb_ToAddModList != NULLP)
       {
-         ret = fillSrbCfg(SRB1, rrcSetupIE->radioBearerConfig.srb_ToAddModList);
+         ret = fillSrbCfg(ueCb, rrcSetupIE->radioBearerConfig.srb_ToAddModList);
       }                
       if(ret == ROK)
       {
-         ret = fillMasterCellGroup(ueCb, &rrcSetupIE->masterCellGroup);
+         ret = fillCellGrpCfg(ueCb, &rrcSetupIE->masterCellGroup, false);
       }
       else
       {
          CU_FREE(rrcSetupIE->radioBearerConfig.srb_ToAddModList, sizeof(SRB_ToAddModList_t));
          ret = RFAILED;
       }
+      
+      /* If SRB configuration are filled successfully in RRC Setup, mark these
+       * configurartion as sent to UE */
+      for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+      {
+         if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+            ueCb->srbList[srbIdx].cfgSentToUe = true;
+      }
    }
    return ret;
 }
@@ -1448,10 +1399,10 @@ uint8_t fillRrcReconfigIE(RRCReconfiguration_IEs_t *rrcReconfigMsg)
  *
  * ****************************************************************/
 
-uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
+uint8_t fillDlDcchRrcMsg(CuUeCb *ueCb, RRCContainer_t *rrcContainer)
 {
    uint8_t ret = ROK;
-   uint16_t idx2;
+   uint16_t idx2 = 0, drbIdx = 0, srbIdx = 0;
    DL_DCCH_Message_t dl_DCCH_Msg;
    memset(&dl_DCCH_Msg, 0, sizeof(DL_DCCH_Message_t));
    asn_enc_rval_t        encRetVal;
@@ -1463,76 +1414,69 @@ uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
       CU_ALLOC(dl_DCCH_Msg.message.choice.c1 , sizeof(DL_DCCH_MessageType_t));
       if(dl_DCCH_Msg.message.choice.c1 != NULLP)
       {
-        dl_DCCH_Msg.message.choice.c1->present = DL_DCCH_MessageType__c1_PR_rrcReconfiguration;
-        CU_ALLOC(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration, sizeof(RRCReconfiguration_t));
-        if(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration != NULLP)
-        {
-           dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->rrc_TransactionIdentifier = 0;
-           dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->criticalExtensions.\
-              present = RRCReconfiguration__criticalExtensions_PR_rrcReconfiguration;
-           /* Fill RRC Reconfig IE */
-           CU_ALLOC(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->\
-                 criticalExtensions.choice.rrcReconfiguration, sizeof(RRCReconfiguration_IEs_t));
-           if(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->\
-                 criticalExtensions.choice.rrcReconfiguration != NULLP)
-           {
-              ret = fillRrcReconfigIE(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->\
-                    criticalExtensions.choice.rrcReconfiguration);
+         dl_DCCH_Msg.message.choice.c1->present = DL_DCCH_MessageType__c1_PR_rrcReconfiguration;
+         CU_ALLOC(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration, sizeof(RRCReconfiguration_t));
+         if(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration != NULLP)
+         {
+            DU_LOG("\nDEBUG --> F1AP : Filling DL DCCH RRC Reconfiguration Message ");
+            fillRrcReconfig(ueCb, dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration, false);
+            if(ret == ROK)
+            {
+               /* If RB configuration are filled successfully in RRC Reconfiguration, mark these
+                * configurartion as sent to UE */
+               for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+               {     
+                  if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+                     ueCb->srbList[srbIdx].cfgSentToUe = true; 
+               }
+               for(drbIdx=0; drbIdx < ueCb->numDrb; drbIdx++)
+               {
+                  if(ueCb->drbList[drbIdx].cfgSentToUe == false)
+                     ueCb->drbList[drbIdx].cfgSentToUe = true;
+               }
 
-              if(ret == ROK)
-              {
-                 /* encode DL-DCCH message into RRC Container */
-                 xer_fprint(stdout, &asn_DEF_DL_DCCH_MessageType, &dl_DCCH_Msg);
-                 memset(encBuf, 0, ENC_BUF_MAX_LEN);
-                 encBufSize = 0;
-                 encRetVal = aper_encode(&asn_DEF_DL_DCCH_MessageType, 0, &dl_DCCH_Msg, PrepFinalEncBuf, encBuf);
-                 /* Encode results */
-                 if(encRetVal.encoded == ENCODE_FAIL)
-                 {
-                    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("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRCContainer for DL-DCCH 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
-              {
-                 DU_LOG("\nERROR  -->  F1AP: Failed to fill RrcReconfig IE at fillDlDcchRrcMsg()");
-              }
-           }
-           else
-           {
-              DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Reconfig at fillDlDcchRrcMsg()");
-              ret = RFAILED;
-           }
-        }
-        else
-        {
-           DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Msg at fillDlDcchRrcMsg()");
-           ret = RFAILED;
-        }
+               /* encode DL-DCCH message into RRC Container */
+               xer_fprint(stdout, &asn_DEF_DL_DCCH_MessageType, &dl_DCCH_Msg);
+               memset(encBuf, 0, ENC_BUF_MAX_LEN);
+               encBufSize = 0;
+               encRetVal = aper_encode(&asn_DEF_DL_DCCH_MessageType, 0, &dl_DCCH_Msg, PrepFinalEncBuf, encBuf);
+               /* Encode results */
+               if(encRetVal.encoded == ENCODE_FAIL)
+               {
+                  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("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRCContainer for DL-DCCH 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
+         {
+            DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Msg at fillDlDcchRrcMsg()");
+            ret = RFAILED;
+         }
       }
       else
       {
-        DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for DL Dcch Msg choice at fillDlDcchRrcMsg()");
-        ret = RFAILED;
+         DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for DL Dcch Msg choice at fillDlDcchRrcMsg()");
+         ret = RFAILED;
       }
    }
    else
@@ -1592,34 +1536,10 @@ uint8_t BuildDLRRCContainer(CuUeCb *ueCb, uint8_t rrcMsgType, RRCContainer_t *rr
    }
    else if(rrcMsgType == RRC_RECONFIG)
    {
-      /*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};
-      bufLen =196;
-      rrcContainer->size = bufLen;
-      CU_ALLOC(rrcContainer->buf, rrcContainer->size);
-      if(rrcContainer->buf != NULLP)
-      {
-         memset(rrcContainer->buf, 0, bufLen);
-         memcpy(rrcContainer->buf, buf, bufLen);
-      }
-      else
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure for RRC Container buffer");
-         ret = RFAILED;
-      }
+      DU_LOG("\nDEBUG --> F1AP : Filling DL DCCH RRC Message ");
+      ret = fillDlDcchRrcMsg(ueCb, rrcContainer);
+      if(ret == RFAILED)
+         DU_LOG("\nERROR  -->  F1AP: Failed to fill DL-DCCH Msg for RRC Reconfiguration");
    }
 
    return ret;
@@ -1854,6 +1774,197 @@ uint8_t setDlRRCMsgType(CuUeCb *ueCb)
    return rrcMsgType;   
 }
 
+/*******************************************************************
+ *
+ * @brief Extract configuration from CellGroupConfig
+ *
+ * @details
+ *
+ *    Function : extractCellGroupConfig
+ *
+ *    Functionality: Extract configuration from CellGroupConfig
+ *        and store in local database
+ *
+ * @params[in] UE control block
+ *             Cell Group Config 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t extractCellGroupConfig(CuUeCb *ueCb, CellGroupConfigRrc_t *cellGrpCfg)
+{
+   uint8_t rbIdx, srbIdx, drbIdx;
+   bool    srbFound, drbFound;
+   SrbInfo *srbCfgDb = NULLP;
+   DrbInfo *drbCfgDb = NULLP;
+   RlcLcCfg *rlcLcCfgDb = NULLP;
+   MacLcCfg *macLcCfgDb = NULLP;
+   RLC_BearerConfig_t *rlcCfg = NULLP;
+   RLC_Config_t *rlcLcCfg = NULLP;
+   LogicalChannelConfig_t *macLcCfg = NULLP;
+
+   if(ueCb == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP: extractCellGroupConfig(): UE Cb is NULL");
+      return RFAILED;
+   }
+
+   if(cellGrpCfg == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP: extractCellGroupConfig(): cellGrpCfg is NULL");
+      return RFAILED;
+   }
+
+   for(rbIdx = 0; rbIdx < cellGrpCfg->rlc_BearerToAddModList->list.count; rbIdx++)
+   {
+      srbFound = false;
+      drbFound = false;
+
+      rlcCfg = cellGrpCfg->rlc_BearerToAddModList->list.array[rbIdx];
+
+      /* Update SRB configuration in local DB */
+      if(rlcCfg->servedRadioBearer->present == RLC_BearerConfig__servedRadioBearer_PR_srb_Identity)
+      {
+         /* Search if SRB entry is already present in DB */
+         for(srbIdx = 0; srbIdx < ueCb->numSrb; srbIdx++)
+         {
+            if(ueCb->srbList[srbIdx].srbId == rlcCfg->servedRadioBearer->choice.srb_Identity)
+            {
+              srbCfgDb = &ueCb->srbList[srbIdx];
+              srbFound = true; 
+              break;
+            }
+         }
+
+         /* If not, add SRB to UE CB's SRB list */
+         if(!srbFound)
+         {
+            ueCb->srbList[ueCb->numSrb].srbId = rlcCfg->servedRadioBearer->choice.srb_Identity;
+            srbCfgDb = &ueCb->srbList[ueCb->numSrb];
+            ueCb->numSrb++;
+         }
+
+         srbCfgDb->lcId = rlcCfg->logicalChannelIdentity;
+         srbCfgDb->cfgSentToUe = false;
+         rlcLcCfgDb = &srbCfgDb->rlcLcCfg;
+         macLcCfgDb = &srbCfgDb->macLcCfg;
+      }
+
+      /* Update DRB configuration in local DB */
+      if(rlcCfg->servedRadioBearer->present == RLC_BearerConfig__servedRadioBearer_PR_drb_Identity)
+      {     
+         /* Search if DRB entry is already present in DB */
+         for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
+         {
+            if(ueCb->drbList[drbIdx].drbId == rlcCfg->servedRadioBearer->choice.drb_Identity)
+            {
+              drbCfgDb = &ueCb->drbList[drbIdx];
+              drbFound = true; 
+              break;
+            }
+         }
+
+         /* If not, add DRB to UE CB's SRB list */
+         if(!drbFound)
+         {
+            ueCb->drbList[ueCb->numDrb].drbId = rlcCfg->servedRadioBearer->choice.drb_Identity;
+            drbCfgDb = &ueCb->drbList[ueCb->numDrb];
+            ueCb->numDrb++;
+         }
+
+         drbCfgDb->lcId = rlcCfg->logicalChannelIdentity;
+         drbCfgDb->cfgSentToUe = false;
+         rlcLcCfgDb = &drbCfgDb->rlcLcCfg;
+         macLcCfgDb = &drbCfgDb->macLcCfg;
+      }
+
+
+      /* Update RLC configuration for this RB */
+      rlcLcCfg = rlcCfg->rlc_Config;
+      rlcLcCfgDb->rlcMode = rlcLcCfg->present;
+      switch(rlcLcCfgDb->rlcMode)
+      {
+         case RLC_Config_PR_am:
+            {
+               rlcLcCfgDb->u.amCfg.ulAmCfg.snLenUl = *(rlcLcCfg->choice.am->ul_AM_RLC.sn_FieldLength);
+               rlcLcCfgDb->u.amCfg.ulAmCfg.pollRetxTmr = rlcLcCfg->choice.am->ul_AM_RLC.t_PollRetransmit ;
+               rlcLcCfgDb->u.amCfg.ulAmCfg.pollPdu = rlcLcCfg->choice.am->ul_AM_RLC.pollPDU ;
+               rlcLcCfgDb->u.amCfg.ulAmCfg.pollByte = rlcLcCfg->choice.am->ul_AM_RLC.pollByte ;
+               rlcLcCfgDb->u.amCfg.ulAmCfg.maxRetxTh = rlcLcCfg->choice.am->ul_AM_RLC.maxRetxThreshold ;
+
+               rlcLcCfgDb->u.amCfg.dlAmCfg.snLenDl = *(rlcLcCfg->choice.am->dl_AM_RLC.sn_FieldLength);
+               rlcLcCfgDb->u.amCfg.dlAmCfg.reAssemTmr = rlcLcCfg->choice.am->dl_AM_RLC.t_Reassembly;
+               rlcLcCfgDb->u.amCfg.dlAmCfg.statProhTmr = rlcLcCfg->choice.am->dl_AM_RLC.t_StatusProhibit;
+               break;
+            }
+
+         case RLC_Config_PR_um_Bi_Directional:
+            {
+               rlcLcCfgDb->u.umBiDirCfg.ulUmCfg.snLenUlUm = *(rlcLcCfg->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength);
+
+               rlcLcCfgDb->u.umBiDirCfg.dlUmCfg.snLenDlUm = *(rlcLcCfg->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength);
+               rlcLcCfgDb->u.umBiDirCfg.dlUmCfg.reAssemTmr = rlcLcCfg->choice.um_Bi_Directional->dl_UM_RLC.t_Reassembly;
+               break;
+            }
+      }
+
+      /* Update MAC configuration for this LC */
+      macLcCfg = rlcCfg->mac_LogicalChannelConfig;
+      macLcCfgDb->priority = macLcCfg->ul_SpecificParameters->priority ;
+      macLcCfgDb->lcGroup = *(macLcCfg->ul_SpecificParameters->logicalChannelGroup) ;
+      macLcCfgDb->schReqId = *(macLcCfg->ul_SpecificParameters->schedulingRequestID) ;
+      macLcCfgDb->pbr = macLcCfg->ul_SpecificParameters->prioritisedBitRate ;
+      macLcCfgDb->bsd = macLcCfg->ul_SpecificParameters->bucketSizeDuration ;
+   }
+   return ROK;   
+}
+
+/*******************************************************************
+ *
+ * @brief Function to decode DU to CU RRC container
+ *
+ * @details
+ *
+ *    Function : extractDuToCuRrcCont
+ *
+ *    Functionality: Function to decode DU to CU RRC container
+ *
+ * @params[in] UE Cb
+ *             RRC conatiner octect string to be decoded
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t extractDuToCuRrcCont(CuUeCb *ueCb, OCTET_STRING_t rrcCont)
+{
+   CellGroupConfigRrc_t  cellGrpCfg, *cellGrpCfgMsg = NULLP;
+   asn_dec_rval_t rval; /* Decoder return value */
+
+   /* Decoding DU to CU RRC container octet string to cell group config */
+   cellGrpCfgMsg = &cellGrpCfg;
+   memset(cellGrpCfgMsg, 0, sizeof(CellGroupConfigRrc_t));
+
+   rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfgMsg, rrcCont.buf, rrcCont.size, 0, 0);
+
+   if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+   {
+      DU_LOG("\nERROR  -->  F1AP : ASN decode failed");
+      return RFAILED;
+   }
+   printf("\n");
+   xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfgMsg);
+
+   if((extractCellGroupConfig(ueCb, cellGrpCfgMsg)) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed to extract cell group config");
+      return RFAILED;
+   }
+  
+   return ROK;
+}
+
 /*******************************************************************
  *
  * @brief Function to build Initial UL RRC Message
@@ -1937,6 +2048,11 @@ uint8_t procInitULRRCMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
                         initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.buf, \
                         ueCb->f1apMsgDb.duToCuContainer.size);
                   }
+                  if((extractDuToCuRrcCont(ueCb, initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer)) != ROK)
+                  {
+                     DU_LOG("\nERROR  --> F1AP : Failed to extract DU to CU RRC Container ");
+                     ret = RFAILED;
+                  }
                }
                else
                {
@@ -1950,6 +2066,8 @@ uint8_t procInitULRRCMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
             DU_LOG("\nERROR  -->  Invalid Event %ld", initULRRCMsg->protocolIEs.list.array[idx]->id);
             break;
       }
+      if(ret == RFAILED)
+         break;
    }
 
    if(ret == ROK)
@@ -2075,17 +2193,21 @@ uint8_t BuildSplCellList(CuUeCb *ueCb, SCell_ToBeSetup_List_t *spCellLst)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
+uint8_t BuildSRBSetup(CuUeCb *ueCb, SRBs_ToBeSetup_List_t *srbSet)
 {
    uint8_t idx;
    uint8_t srbCnt;
 
-   srbCnt = 1;
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      srbCnt = ueCb->numSrb;
+   else
+      srbCnt = 1;
    srbSet->list.count = srbCnt;
    srbSet->list.size = srbCnt*sizeof(SRBs_ToBeSetup_ItemIEs_t *);
    CU_ALLOC(srbSet->list.array,srbSet->list.size);
    if(srbSet->list.array == NULLP)
    {
+      DU_LOG("\nERROR  --> F1AP : BuildSRBSetup() : Memory allocation failed for SRB to be setup list's array");
       return RFAILED;
    }
 
@@ -2094,15 +2216,31 @@ uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
       CU_ALLOC(srbSet->list.array[idx],sizeof(SRBs_ToBeSetup_ItemIEs_t));
       if(srbSet->list.array[idx] == NULLP)
       {
-        return RFAILED;
+         DU_LOG("\nERROR  --> F1AP : BuildSRBSetup() : Memory allocation failed for SRB to be setup list's array element");
+         return RFAILED;
       }
    }
 
-   idx = 0;
-   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;
-   srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = 2;
+   if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+   {
+      idx = 0;
+      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;
+      srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = 2;
+      ueCb->srbList[ueCb->numSrb].srbId = srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID;
+      ueCb->numSrb++;
+   }
+   else
+   {
+      for(idx=0; idx<srbCnt; idx++)
+      {
+         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;
+         srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = ueCb->srbList[idx].srbId; 
+      }
+   }
    return ROK;
 }/* End of BuildSRBSetup*/
 
@@ -2123,8 +2261,7 @@ uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildQOSInfo(QoSFlowLevelQoSParameters_t *drbQos, uint8_t actionType, \
-                        int16_t pduSessionID)
+uint8_t BuildQOSInfo(QosInfo *qosInfo, QoSFlowLevelQoSParameters_t *drbQos, uint8_t actionType, int16_t pduSessionID, bool hoInProgress)
 {
    uint8_t elementCnt = 0, qosCntIdx = 0;
    ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
@@ -2136,84 +2273,111 @@ uint8_t BuildQOSInfo(QoSFlowLevelQoSParameters_t *drbQos, uint8_t actionType, \
    {
       return RFAILED;
    }
-   /*FiveQI*/
-   if(actionType == ProtocolIE_ID_id_DRBs_ToBeModified_Item)
-      drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE8;
+   
+   if(hoInProgress)
+      drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = qosInfo->nonDynFiveQI ;
    else
-      drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE9;
-
-   /*AveragingWindow*/
-   CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,\
-         sizeof(AveragingWindow_t));
-   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow == \
-         NULLP)
    {
-      return RFAILED;
+      /*FiveQI*/
+      if(actionType == ProtocolIE_ID_id_DRBs_ToBeModified_Item)
+         drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE8;
+      else
+         drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE9;
+
+      qosInfo->nonDynFiveQI = drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI;
    }
-   *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow) = 0;
-   /*MaxDataBurstVolume*/
-   CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
-         sizeof(MaxDataBurstVolume_t));
-   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume == \
-         NULLP)
+
+   if(!hoInProgress)
    {
-      return RFAILED;
+      /*AveragingWindow*/
+      CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow, sizeof(AveragingWindow_t));
+      if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow == NULLP)
+      {
+         return RFAILED;
+      }
+      *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow) = 0;
+      qosInfo->avgWindow = *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
+
+      /*MaxDataBurstVolume*/
+      CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume, sizeof(MaxDataBurstVolume_t));
+      if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume == NULLP)
+      {
+         return RFAILED;
+      }
+      *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume) = 0;
+      qosInfo->maxBurstDataVol = *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
    }
-   *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume) = 0;
 
    /*nRGRAN Allocation Retention Priority*/
-   drbQos->nGRANallocationRetentionPriority.priorityLevel = PriorityLevel_lowest;
-   drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = Pre_emptionCapability_may_trigger_pre_emption;
-   drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = Pre_emptionVulnerability_not_pre_emptable;
-
-   /*If PDU Session ID is INVALID thus not to be included in Qos IE, skip the PDU Session IE */
-   if(pduSessionID <= INVALID_PDU_SESSION_ID)
+   if(hoInProgress)
    {
-      DU_LOG("\nINFO  --> F1AP : Invalid PDU_SESSION_ID");
-      return ROK;
+      drbQos->nGRANallocationRetentionPriority.priorityLevel = qosInfo->priorityLevel;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = qosInfo->preemptionCapability;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = qosInfo->preemptionVulnerability;
    }
-
-   CU_ALLOC(drbQos->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
-   qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbQos->iE_Extensions;
-
-   if(qosIeExt)
+   else
    {
-      elementCnt = NUM_QOS_EXT;
-      qosIeExt->list.count = elementCnt;
-      qosIeExt->list.size = elementCnt * sizeof(QoSFlowLevelQoSParameters_ExtIEs_t *);
+      drbQos->nGRANallocationRetentionPriority.priorityLevel = PriorityLevel_lowest;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = Pre_emptionCapability_may_trigger_pre_emption;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = Pre_emptionVulnerability_not_pre_emptable;
 
-      /*Initialize QoSFlowLevelQoSParameters_ExtIEs_t*/
-      CU_ALLOC(qosIeExt->list.array, qosIeExt->list.size);
+      qosInfo->priorityLevel = PriorityLevel_lowest;
+      qosInfo->preemptionCapability = Pre_emptionCapability_may_trigger_pre_emption;
+      qosInfo->preemptionVulnerability = Pre_emptionVulnerability_not_pre_emptable;
+   }
 
-      if(qosIeExt->list.array == NULLP)
+   /* PDU session ID */
+   if(!hoInProgress)
+   {
+      /*If PDU Session ID is INVALID thus not to be included in Qos IE, skip the PDU Session IE */
+      if(pduSessionID <= INVALID_PDU_SESSION_ID)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t failed");
-         return  RFAILED;
+         DU_LOG("\nINFO  --> F1AP : Invalid PDU_SESSION_ID");
+         return ROK;
       }
 
-      for(qosCntIdx=0; qosCntIdx < elementCnt; qosCntIdx++)
+      CU_ALLOC(drbQos->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
+      qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbQos->iE_Extensions;
+
+      if(qosIeExt)
       {
-         CU_ALLOC(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
-         if(qosIeExt->list.array[qosCntIdx] == NULLP)
+         elementCnt = NUM_QOS_EXT;
+         qosIeExt->list.count = elementCnt;
+         qosIeExt->list.size = elementCnt * sizeof(QoSFlowLevelQoSParameters_ExtIEs_t *);
+
+         /*Initialize QoSFlowLevelQoSParameters_ExtIEs_t*/
+         CU_ALLOC(qosIeExt->list.array, qosIeExt->list.size);
+
+         if(qosIeExt->list.array == NULLP)
          {
-            DU_LOG("\nERROR  -->       F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t array failed");
+            DU_LOG("\nERROR  -->       F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t failed");
             return  RFAILED;
          }
-         /*Filling QoSFlowLevelQoSParameters_ExtIEs_t*/
-         qosIeExt->list.array[qosCntIdx]->id = ProtocolIE_ID_id_PDUSessionID;
-         /*Below Criticality mentioned in Spec38.473, 15.4.1 and later*/
-         qosIeExt->list.array[qosCntIdx]->criticality = Criticality_ignore; 
-         qosIeExt->list.array[qosCntIdx]->extensionValue.present = \
-                                                                   QoSFlowLevelQoSParameters_ExtIEs__extensionValue_PR_PDUSessionID;
-         qosIeExt->list.array[qosCntIdx]->extensionValue.choice.PDUSessionID = (PDUSessionID_t)pduSessionID;
+
+         for(qosCntIdx=0; qosCntIdx < elementCnt; qosCntIdx++)
+         {
+            CU_ALLOC(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
+            if(qosIeExt->list.array[qosCntIdx] == NULLP)
+            {
+               DU_LOG("\nERROR  -->    F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t array failed");
+               return  RFAILED;
+            }
+            /*Filling QoSFlowLevelQoSParameters_ExtIEs_t*/
+            qosIeExt->list.array[qosCntIdx]->id = ProtocolIE_ID_id_PDUSessionID;
+            /*Below Criticality mentioned in Spec38.473, 15.4.1 and later*/
+            qosIeExt->list.array[qosCntIdx]->criticality = Criticality_ignore; 
+            qosIeExt->list.array[qosCntIdx]->extensionValue.present = \
+                                                                      QoSFlowLevelQoSParameters_ExtIEs__extensionValue_PR_PDUSessionID;
+            qosIeExt->list.array[qosCntIdx]->extensionValue.choice.PDUSessionID = (PDUSessionID_t)pduSessionID;
+            qosInfo->pduSessionId = pduSessionID;
+         }
+      }
+      else
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation for QosIE_extension failed");
+         return RFAILED;
       }
    }
-   else
-   {
-      DU_LOG("\nERROR  -->     F1AP : Memory allocation for QosIE_extension failed");
-      return RFAILED;
-   }
-
    return ROK;
 }/*End of BuildQOSInfo*/
 
@@ -2234,30 +2398,40 @@ uint8_t BuildQOSInfo(QoSFlowLevelQoSParameters_t *drbQos, uint8_t actionType, \
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSNSSAI(SNSSAI_t *snssai, Snssai *snssaiToCopy)
+uint8_t BuildSNSSAI(DrbInfo *drbInfo, SNSSAI_t *snssai, Snssai *snssaiToCopy, bool hoInProgress)
 {
    /*SNSSAI*/
    /*ssT*/
    snssai->sST.size = sizeof(uint8_t);
-   CU_ALLOC(snssai->sST.buf,snssai->sST.size);
+   CU_ALLOC(snssai->sST.buf, snssai->sST.size);
    if(snssai->sST.buf == NULLP)
    {
       return RFAILED;
    }
-   memcpy(snssai->sST.buf, &snssaiToCopy->sst, snssai->sST.size);
+   if(!hoInProgress)
+      memcpy(snssai->sST.buf, &snssaiToCopy->sst, snssai->sST.size);
+   else
+      memcpy(snssai->sST.buf, &drbInfo->snssai->sst, snssai->sST.size);
+
    /*sD*/
-   CU_ALLOC(snssai->sD,sizeof(OCTET_STRING_t));
+   CU_ALLOC(snssai->sD, sizeof(OCTET_STRING_t));
    if(snssai->sD == NULLP)
    {
       return RFAILED;
    }
-   snssai->sD->size = 3*sizeof(uint8_t);
-   CU_ALLOC(snssai->sD->buf,snssai->sD->size);
+   snssai->sD->size = 3 * sizeof(uint8_t);
+   CU_ALLOC(snssai->sD->buf, snssai->sD->size);
    if(snssai->sD->buf == NULLP)
    {
       return RFAILED;
    }
-   memcpy(snssai->sD->buf, snssaiToCopy->sd, snssai->sD->size);
+   if(!hoInProgress)
+      memcpy(snssai->sD->buf, snssaiToCopy->sd, snssai->sD->size);
+   else
+      memcpy(snssai->sD->buf, drbInfo->snssai->sd, snssai->sD->size);
+
+   if(!hoInProgress)
+      drbInfo->snssai = snssaiToCopy;
    return ROK;
 }/*End of BuildSNSSAI*/
 
@@ -2277,11 +2451,15 @@ uint8_t BuildSNSSAI(SNSSAI_t *snssai, Snssai *snssaiToCopy)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildFlowsMap(Flows_Mapped_To_DRB_List_t *flowMap , uint8_t actionType)
+uint8_t BuildFlowsMap(DrbInfo *drbInfo, Flows_Mapped_To_DRB_List_t *flowMap , uint8_t actionType, bool hoInProgress)
 {
-   uint8_t  ret = ROK, idx = 0, flowCnt = 0;
+   uint8_t  ret = ROK, idx = 0, flowCnt = 0, flowIdx = 0;
+   FlowsMapped *qosFlow;
 
-   flowCnt = 1;
+   if(!hoInProgress)
+      flowCnt = 1;
+   else
+      flowCnt = drbInfo->numFlowMap;
    flowMap->list.count = flowCnt;
    flowMap->list.size = flowCnt * sizeof(Flows_Mapped_To_DRB_Item_t *);
    CU_ALLOC(flowMap->list.array,flowMap->list.size);
@@ -2298,15 +2476,43 @@ uint8_t BuildFlowsMap(Flows_Mapped_To_DRB_List_t *flowMap , uint8_t actionType)
          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for arrayIdx[%d] in BuildFlowsMap()", idx);
          return RFAILED;
       }
-   }
-   idx = 0;
-   flowMap->list.array[idx]->qoSFlowIdentifier = 0;
-   ret = BuildQOSInfo(&flowMap->list.array[idx]->qoSFlowLevelQoSParameters,\
-         actionType, INVALID_PDU_SESSION_ID);
-   if(ret != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Failed to Build QOS Info in BuildFlowsMap()");
-      return RFAILED;
+      
+      if(!hoInProgress)
+      {
+         flowMap->list.array[idx]->qoSFlowIdentifier = 0;
+         if(actionType == ProtocolIE_ID_id_DRBs_ToBeModified_Item)
+         {
+            for(flowIdx =0; flowIdx < drbInfo->numFlowMap; flowIdx++)
+            {
+               if(drbInfo->flowMapList[flowIdx].qosFlowId == flowMap->list.array[idx]->qoSFlowIdentifier)
+               {
+                  qosFlow = &drbInfo->flowMapList[flowIdx];
+                  break;
+               }
+            }
+         }
+         else
+         {
+            qosFlow = &drbInfo->flowMapList[drbInfo->numFlowMap];
+            qosFlow->qosFlowId = flowMap->list.array[idx]->qoSFlowIdentifier;
+         }
+      }
+      else
+      {
+         qosFlow = &drbInfo->flowMapList[idx];
+         flowMap->list.array[idx]->qoSFlowIdentifier = qosFlow->qosFlowId;
+      }
+
+      ret = BuildQOSInfo(&qosFlow->qos, &flowMap->list.array[idx]->qoSFlowLevelQoSParameters,\
+            actionType, INVALID_PDU_SESSION_ID, hoInProgress);
+      if(ret != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Failed to Build QOS Info in BuildFlowsMap()");
+         return RFAILED;
+      }
+
+      if((!hoInProgress) && (actionType != ProtocolIE_ID_id_DRBs_ToBeModified_Item))
+         drbInfo->numFlowMap++;
    }
    return ROK;
 }/*End of BuildFlowsMap*/
@@ -2327,10 +2533,11 @@ uint8_t BuildFlowsMap(Flows_Mapped_To_DRB_List_t *flowMap , uint8_t actionType)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
+uint8_t BuildULTnlInfo(TnlInfo *ulUpTnlInfo, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, bool hoInProgress)
 {
    uint8_t idx;
    uint8_t ulCnt;
+
    ulCnt = 1;
    ulInfo->list.count = ulCnt;
    ulInfo->list.size = ulCnt * sizeof(ULUPTNLInformation_ToBeSetup_Item_t *);
@@ -2350,59 +2557,75 @@ uint8_t BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
       }
    }
    idx = 0;
-   ulInfo->list.array[idx]->uLUPTNLInformation.present = \
-                                                        UPTransportLayerInformation_PR_gTPTunnel;
+   ulInfo->list.array[idx]->uLUPTNLInformation.present = UPTransportLayerInformation_PR_gTPTunnel;
    /*GTP TUNNEL*/
-   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel,\
-        sizeof(GTPTunnel_t));
+   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel, sizeof(GTPTunnel_t));
    if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel == NULLP)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gTPTunnel in BuildULTnlInfo()");
       return RFAILED;
    }
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.size       = 4*sizeof(uint8_t);
-   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-        transportLayerAddress.buf,ulInfo->list.array[idx]->\
-        uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
-   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-        transportLayerAddress.buf == NULLP)
+   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size    = 4*sizeof(uint8_t);
+   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf, \
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
+   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf == NULLP)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gtp tunnel arrayIdx[%d] in BuildULTnlInfo()", idx);
       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] = 192;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[1] = 168;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[2] = 130;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[3] = 82;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.bits_unused = 0;
+
+   if(!hoInProgress)
+   {
+      /* NOTE: Below IP address must be changed if running on different IP configuration */
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0] = 192;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1] = 168;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2] = 130;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3] = 82;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.bits_unused = 0;
+
+      ulUpTnlInfo->address[0] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0];
+      ulUpTnlInfo->address[1] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1];
+      ulUpTnlInfo->address[2] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2];
+      ulUpTnlInfo->address[3] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3];
+   }
+   else
+   {
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0] = ulUpTnlInfo->address[0];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1] = ulUpTnlInfo->address[1];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2] = ulUpTnlInfo->address[2];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3] = ulUpTnlInfo->address[3];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.bits_unused = 0;
+   }
+
    /*GTP TEID*/
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size\
-      = 4 * sizeof(uint8_t);
-   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-        gTP_TEID.buf,ulInfo->list.array[idx]->uLUPTNLInformation.choice.\
-        gTPTunnel->gTP_TEID.size);
-   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
-        == NULLP)
+   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size = 4 * sizeof(uint8_t);
+   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf, \
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size);
+   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf == NULLP)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gtp tunnel buffer in BuildULTnlInfo()");
       return RFAILED;
    }
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-     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] = cuCb.cuCfgParams.egtpParams.currTunnelId++;
+   
+   if(!hoInProgress)
+   {
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->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] = cuCb.cuCfgParams.egtpParams.currTunnelId++;
 
+      ulUpTnlInfo->teId[0] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[0];
+      ulUpTnlInfo->teId[1] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[1];
+      ulUpTnlInfo->teId[2] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[2];
+      ulUpTnlInfo->teId[3] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3];
+   }
+   else
+   {
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[0] = ulUpTnlInfo->teId[0];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[1] = ulUpTnlInfo->teId[1];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[2] = ulUpTnlInfo->teId[2];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3] = ulUpTnlInfo->teId[3];
+   }
    return ROK;
 }/*End of BuildULTnlInfo*/
 
@@ -2422,14 +2645,22 @@ uint8_t BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
+uint8_t BuildDRBSetup(CuUeCb *ueCb, DRBs_ToBeSetup_List_t *drbSet)
 {
-   uint8_t BuildQOSInforet = 0,BuildSNSSAIret = 0, idx = 0;
-   uint8_t BuildFlowsMapret =0, BuildULTnlInforet =0, drbCnt = 0;
+   uint8_t idx = 0, extIeIdx = 0;
+   uint8_t elementCnt = 0, drbCnt = 0;
+   uint8_t BuildQOSInforet = 0,BuildSNSSAIret = 0;
+   uint8_t BuildFlowsMapret =0, BuildULTnlInforet =0;
    DRBs_ToBeSetup_Item_t *drbSetItem;
+   ProtocolExtensionContainer_4624P33_t *drbToBeSetupExt;
+   DRBs_ToBeSetup_ItemExtIEs_t *drbToBeSetupExtIe = NULLP;
    
-   drbCnt = MAX_DRB_SET_UE_CONTEXT_SETUP_REQ;
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      drbCnt = ueCb->numDrb;
+   else
+      drbCnt = MAX_DRB_SET_UE_CONTEXT_SETUP_REQ;
    drbSet->list.count = drbCnt;
+
    drbSet->list.size = drbCnt*sizeof(DRBs_ToBeSetup_ItemIEs_t *);
    CU_ALLOC(drbSet->list.array,drbSet->list.size);
    if(drbSet->list.array == NULLP)
@@ -2437,22 +2668,29 @@ uint8_t BuildDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDRBSetup");
       return RFAILED;
    }
+
    for(idx=0; idx<drbCnt; idx++)
    {
       CU_ALLOC(drbSet->list.array[idx],sizeof(DRBs_ToBeSetup_ItemIEs_t));
       if(drbSet->list.array[idx] == NULLP)
       {
          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDRBSetup for arry idx [%d]", idx);
-             return RFAILED;
+         return RFAILED;
       }
 
       drbSet->list.array[idx]->id = ProtocolIE_ID_id_DRBs_ToBeSetup_Item;
       drbSet->list.array[idx]->criticality = Criticality_ignore;
-      drbSet->list.array[idx]->value.present = \
-                                           DRBs_ToBeSetup_ItemIEs__value_PR_DRBs_ToBeSetup_Item;
+      drbSet->list.array[idx]->value.present = DRBs_ToBeSetup_ItemIEs__value_PR_DRBs_ToBeSetup_Item;
       drbSetItem = &drbSet->list.array[idx]->value.choice.DRBs_ToBeSetup_Item;
       /*dRBID*/
-      drbSetItem->dRBID = idx + 1;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         drbSetItem->dRBID = idx + 1;
+         ueCb->drbList[ueCb->numDrb].drbId = drbSetItem->dRBID;
+      }
+      else
+         drbSetItem->dRBID = ueCb->drbList[idx].drbId;
+
       /*qoSInformation*/
       drbSetItem->qoSInformation.present = QoSInformation_PR_choice_extension;
       CU_ALLOC(drbSetItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
@@ -2461,47 +2699,113 @@ uint8_t BuildDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for QOS choice extension in BuildDRBSetup");
          return RFAILED;
       }
-      drbSetItem->qoSInformation.choice.choice_extension->id = \
-                                                           ProtocolIE_ID_id_DRB_Information;
-      drbSetItem->qoSInformation.choice.choice_extension->criticality = \
-                                                                    Criticality_ignore;
-      drbSetItem->qoSInformation.choice.choice_extension->value.present = \
-                                                                      QoSInformation_ExtIEs__value_PR_DRB_Information;
-      BuildQOSInforet =  BuildQOSInfo(&drbSetItem->qoSInformation.choice.\
-                             choice_extension->value.choice.DRB_Information.dRB_QoS,\
-                         ProtocolIE_ID_id_DRBs_ToBeSetup_Item, PDU_SESSION_ID_1);
+      drbSetItem->qoSInformation.choice.choice_extension->id = ProtocolIE_ID_id_DRB_Information;
+      drbSetItem->qoSInformation.choice.choice_extension->criticality = Criticality_ignore;
+      drbSetItem->qoSInformation.choice.choice_extension->value.present = QoSInformation_ExtIEs__value_PR_DRB_Information;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildQOSInforet =  BuildQOSInfo(&ueCb->drbList[ueCb->numDrb].qos, &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.dRB_QoS, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, PDU_SESSION_ID_1, FALSE);
+      else
+         BuildQOSInforet =  BuildQOSInfo(&ueCb->drbList[idx].qos, &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.dRB_QoS, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, PDU_SESSION_ID_1, TRUE);
       if(BuildQOSInforet != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : Failed to build QOS Info in BuildDRBSetup");
          return RFAILED;
       }
+
       /*SNSSAI*/
-      BuildSNSSAIret = BuildSNSSAI(&drbSetItem->qoSInformation.choice.\
-                              choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0]);
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildSNSSAIret = BuildSNSSAI(&ueCb->drbList[ueCb->numDrb], &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0], FALSE);
+      else
+         BuildSNSSAIret = BuildSNSSAI(&ueCb->drbList[idx], &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0], TRUE);
       if(BuildSNSSAIret != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : Failed to build SNSSAI Info in BuildDRBSetup");
          return RFAILED;
       }
+
       /*Flows mapped to DRB List*/
-      BuildFlowsMapret = BuildFlowsMap(&drbSetItem->qoSInformation.choice.\
-                  choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List,\
-              ProtocolIE_ID_id_DRBs_ToBeSetup_Item);
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildFlowsMapret = BuildFlowsMap(&ueCb->drbList[ueCb->numDrb], &drbSetItem->qoSInformation.choice.choice_extension->\
+               value.choice.DRB_Information.flows_Mapped_To_DRB_List, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, FALSE);
+      else
+         BuildFlowsMapret = BuildFlowsMap(&ueCb->drbList[idx], &drbSetItem->qoSInformation.choice.choice_extension->\
+               value.choice.DRB_Information.flows_Mapped_To_DRB_List, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, TRUE);
       if(BuildFlowsMapret != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : Failed to build Flow Map Info in BuildDRBSetup");
          return RFAILED;
       }
+
       /*ULUPTNLInformation To Be Setup List*/
-      BuildULTnlInforet = BuildULTnlInfo(&drbSetItem->uLUPTNLInformation_ToBeSetup_List);
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildULTnlInforet = BuildULTnlInfo(&ueCb->drbList[ueCb->numDrb].ulUpTnlInfo, &drbSetItem->uLUPTNLInformation_ToBeSetup_List,\
+               FALSE);
+      else
+         BuildULTnlInforet = BuildULTnlInfo(&ueCb->drbList[idx].ulUpTnlInfo, &drbSetItem->uLUPTNLInformation_ToBeSetup_List,\
+               TRUE);
       if(BuildULTnlInforet != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : Failed to build tunnel Info in BuildDRBSetup");
          return RFAILED;
       }
+
       /*RLCMode*/
-      drbSetItem->rLCMode = RLCMode_rlc_um_bidirectional;
-  }
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         drbSetItem->rLCMode = RLCMode_rlc_um_bidirectional;
+         ueCb->drbList[ueCb->numDrb].rlcMode = drbSetItem->rLCMode;
+      }
+      else
+         drbSetItem->rLCMode = ueCb->drbList[idx].rlcMode;
+
+      /* DL PDCP SN Length */
+      if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      {
+         CU_ALLOC(drbToBeSetupExt, sizeof(ProtocolExtensionContainer_4624P33_t));
+         if(!drbToBeSetupExt)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Failed to allocate memory for extension IE list in BuildDRBSetup");
+            return RFAILED;
+         }
+
+         elementCnt = 1;
+         drbToBeSetupExt->list.count = elementCnt;
+         drbToBeSetupExt->list.size = drbToBeSetupExt->list.count * sizeof(DRBs_ToBeSetup_ItemExtIEs_t *);
+
+         CU_ALLOC(drbToBeSetupExt->list.array, drbToBeSetupExt->list.size);
+         if(!drbToBeSetupExt->list.array)
+         {
+             DU_LOG("\nERROR  -->  F1AP : Failed to allocated memory for extension array in BuildDRBSetup");
+             return RFAILED;
+         }
+
+         for(extIeIdx=0; extIeIdx < drbToBeSetupExt->list.count; extIeIdx++)
+         {
+            CU_ALLOC(drbToBeSetupExt->list.array[extIeIdx], sizeof(DRBs_ToBeSetup_ItemExtIEs_t));
+            if(!drbToBeSetupExt->list.array[extIeIdx])
+            {
+               DU_LOG("\nERROR  -->  F1AP : Failed to allocated memory for extension array element in BuildDRBSetup");
+               return RFAILED;
+            }
+         }
+         extIeIdx = 0;
+         drbToBeSetupExtIe = drbToBeSetupExt->list.array[extIeIdx];
+
+         drbToBeSetupExtIe->id = ProtocolIE_ID_id_DLPDCPSNLength;
+         drbToBeSetupExtIe->criticality = Criticality_ignore;
+         drbToBeSetupExtIe->extensionValue.present = DRBs_ToBeSetup_ItemExtIEs__extensionValue_PR_PDCPSNLength;
+         drbToBeSetupExtIe->extensionValue.choice.PDCPSNLength = PDCPSNLength_twelve_bits;
+         drbSetItem->iE_Extensions = drbToBeSetupExt;
+      }
+
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         ueCb->numDrb++;
+   }
    return ROK;
 }/* End of BuildDRBSetup*/
 
@@ -2911,6 +3215,10 @@ void FreeUeContextSetupReq(F1AP_PDU_t  *f1apMsg)
                                  ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
                         }
                         break;
+                     case ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL:
+                        CU_FREE(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf,\
+                              ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size);
+                        break;
                      default:
                         DU_LOG("\nERROR  -->  F1AP: Invalid event type %ld", ueSetReq->protocolIEs.list.array[idx]->id);
                         break;
@@ -5578,45 +5886,84 @@ void FreeBWPDlDedPdcchCfg(BWP_DownlinkDedicated_t *dlBwp)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildRlcConfig(struct RLC_Config *rlcConfig)
+uint8_t BuildRlcConfig(RlcLcCfg rlcLcCfgDb, struct RLC_Config *rlcConfig)
 {
+   rlcConfig->present = rlcLcCfgDb.rlcMode;
 
-   rlcConfig->present = RLC_Config_PR_am;
-
-   rlcConfig->choice.am = NULLP;
-   CU_ALLOC(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
-   if(!rlcConfig->choice.am)
+   switch(rlcConfig->present)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
-      return RFAILED;
-   }
+      case RLC_Config_PR_am:
+         {
+            rlcConfig->choice.am = NULLP;
+            CU_ALLOC(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
+            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;
-   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("\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;
+            /* UL */
+            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("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = rlcLcCfgDb.u.amCfg.ulAmCfg.snLenUl;
+            rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit  = rlcLcCfgDb.u.amCfg.ulAmCfg.pollRetxTmr;
+            rlcConfig->choice.am->ul_AM_RLC.pollPDU           = rlcLcCfgDb.u.amCfg.ulAmCfg.pollPdu;
+            rlcConfig->choice.am->ul_AM_RLC.pollByte          = rlcLcCfgDb.u.amCfg.ulAmCfg.pollByte;
+            rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold  = rlcLcCfgDb.u.amCfg.ulAmCfg.maxRetxTh;
+
+            /* 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("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = rlcLcCfgDb.u.amCfg.dlAmCfg.snLenDl;
+            rlcConfig->choice.am->dl_AM_RLC.t_Reassembly      = rlcLcCfgDb.u.amCfg.dlAmCfg.reAssemTmr;
+            rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit  = rlcLcCfgDb.u.amCfg.dlAmCfg.statProhTmr;
 
-   /* 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("\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;
+            break;
+         }
+
+      case RLC_Config_PR_um_Bi_Directional:
+         {
+            rlcConfig->choice.um_Bi_Directional = NULLP;
+            CU_ALLOC(rlcConfig->choice.um_Bi_Directional, sizeof(struct RLC_Config__um_Bi_Directional));
+            if(!rlcConfig->choice.um_Bi_Directional)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+
+            /* UL */
+            rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength = NULLP;
+            CU_ALLOC(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+            if(!rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength) = rlcLcCfgDb.u.umBiDirCfg.ulUmCfg.snLenUlUm;
 
+            /* DL */
+            rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength = NULLP;
+            CU_ALLOC(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+            if(!rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength) = rlcLcCfgDb.u.umBiDirCfg.dlUmCfg.snLenDlUm;
+            rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.t_Reassembly = rlcLcCfgDb.u.umBiDirCfg.dlUmCfg.reAssemTmr;
+            break;
+         }
+   }
    return ROK;
 }
 
@@ -5636,7 +5983,7 @@ uint8_t BuildRlcConfig(struct RLC_Config *rlcConfig)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
+uint8_t BuildMacLCConfig(MacLcCfg macLcCfgDb, struct LogicalChannelConfig *macLcConfig)
 {
 
    macLcConfig->ul_SpecificParameters = NULLP;
@@ -5647,9 +5994,9 @@ uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
       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->priority = macLcCfgDb.priority;
+   macLcConfig->ul_SpecificParameters->prioritisedBitRate =    macLcCfgDb.pbr;
+   macLcConfig->ul_SpecificParameters->bucketSizeDuration =    macLcCfgDb.bsd;
    macLcConfig->ul_SpecificParameters->allowedServingCells = NULLP;
    macLcConfig->ul_SpecificParameters->allowedSCS_List = NULLP;
    macLcConfig->ul_SpecificParameters->maxPUSCH_Duration = NULLP;
@@ -5662,7 +6009,7 @@ uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
-   *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = LC_GRP;
+   *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = macLcCfgDb.lcGroup;
 
    macLcConfig->ul_SpecificParameters->schedulingRequestID = NULLP;
    CU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
@@ -5671,7 +6018,7 @@ uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
-   *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = SCH_REQ_ID;
+   *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = macLcCfgDb.schReqId;
 
    macLcConfig->ul_SpecificParameters->logicalChannelSR_Mask = false;
    macLcConfig->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = false;
@@ -5695,11 +6042,27 @@ uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
+uint8_t BuildRlcBearerToAddModList(CuUeCb *ueCb, struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList, bool updateAllRbCfg)
 {
-   uint8_t                     idx, elementCnt;
+   uint8_t idx, srbIdx = 0, drbIdx = 0, elementCnt=0;
+
+   if(updateAllRbCfg)
+      elementCnt = ueCb->numSrb + ueCb->numDrb;
+   else
+   {
+      for(srbIdx = 0; srbIdx< ueCb->numSrb; srbIdx++)
+      {
+         if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+            elementCnt++;
+      }
+
+      for(drbIdx = 0; drbIdx< ueCb->numDrb; drbIdx++)
+      {
+         if(ueCb->drbList[drbIdx].cfgSentToUe == false)
+            elementCnt++;
+      }
+   }
 
-   elementCnt = 1;
    rlcBearerList->list.count = elementCnt;
    rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
 
@@ -5717,53 +6080,108 @@ uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddMod
       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;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
       }
    }
 
    idx = 0;
-   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)
+   for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-      return RFAILED;
-   }
+      if(!updateAllRbCfg && ueCb->srbList[srbIdx].cfgSentToUe)
+         continue;
 
-   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]->logicalChannelIdentity = ueCb->srbList[srbIdx].lcId;
 
-   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("\nERROR  -->  F1AP : 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;
+      }
 
-   if(BuildRlcConfig(rlcBearerList->list.array[idx]->rlc_Config) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
-      return RFAILED;
-   }
+      rlcBearerList->list.array[idx]->servedRadioBearer->present = RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
+      rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = ueCb->srbList[srbIdx].srbId;
 
-   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("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-      return RFAILED;
+      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("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
+
+      if(BuildRlcConfig(ueCb->srbList[srbIdx].rlcLcCfg, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+      {
+         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("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
+
+      if(BuildMacLCConfig(ueCb->srbList[srbIdx].macLcCfg, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+         return RFAILED;
+      }
+      idx++;
    }
 
-   if(BuildMacLCConfig(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+   for(drbIdx=0; drbIdx < ueCb->numDrb; drbIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
-      return RFAILED;
-   }
+      if(!updateAllRbCfg && ueCb->srbList[srbIdx].cfgSentToUe)
+         continue;
+
+      rlcBearerList->list.array[idx]->logicalChannelIdentity = ueCb->drbList[drbIdx].lcId;
 
+      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_drb_Identity;
+      rlcBearerList->list.array[idx]->servedRadioBearer->choice.drb_Identity = ueCb->drbList[drbIdx].drbId;
+
+      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("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
+
+      if(BuildRlcConfig(ueCb->drbList[drbIdx].rlcLcCfg, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+      {
+         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("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
+
+      if(BuildMacLCConfig(ueCb->drbList[drbIdx].macLcCfg, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+         return RFAILED;
+      }
+      idx++;
+   }
    return ROK;
 }
 
@@ -5983,7 +6401,7 @@ uint8_t FreeMemCellGrpCfg(CellGroupConfigRrc_t *cellGrpCfg)
  *
  ******************************************************************/
 
-uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
+uint8_t fillCellGrpCfg(CuUeCb *ueCb, OCTET_STRING_t *cellGrp, bool updateAllRbCfg)
 {
    uint8_t               ret = RFAILED;
    CellGroupConfigRrc_t  cellGrpCfg;
@@ -6000,7 +6418,7 @@ uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
          DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in CellGrpConfig");
          break;
       }
-      if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK)
+      if(BuildRlcBearerToAddModList(ueCb, cellGrpCfg.rlc_BearerToAddModList, updateAllRbCfg) != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : fillCellGrpCfg failed");
          break;
@@ -6187,6 +6605,38 @@ void freeUeCapRatContList(UE_CapabilityRAT_ContainerListRRC_t *ueCapablityList)
    }
 }
 
+/*******************************************************************
+ *
+ * @brief Free Handover preparation information
+ *
+ * @details
+ *
+ *    Function : freeHOPreparationInfo
+ *
+ *    Functionality: Free Handover preparation information
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void freeHOPreparationInfo(HandoverPreparationInformationRrc_t *hoPrep)
+{
+   HandoverPreparationInformationRrc_IEs_t *hoPrepInfoIe;
+
+   if(hoPrep->criticalExtensions.choice.c1)
+   {
+      if(hoPrep->criticalExtensions.choice.c1->choice.handoverPreparationInformation)
+      {
+         hoPrepInfoIe = hoPrep->criticalExtensions.choice.c1->choice.handoverPreparationInformation;
+         freeUeCapRatContList(&hoPrepInfoIe->ue_CapabilityRAT_List);
+         CU_FREE(hoPrep->criticalExtensions.choice.c1->choice.handoverPreparationInformation , \
+               sizeof(HandoverPreparationInformationRrc_IEs_t));
+      }
+      CU_FREE(hoPrep->criticalExtensions.choice.c1, sizeof(struct HandoverPreparationInformationRrc__criticalExtensions__c1));
+   }
+}
+
 /*******************************************************************
  *
  * @brief Fill feature sets
@@ -6351,72 +6801,1840 @@ uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
       ueNrCap.phy_Parameters.phy_ParametersFR1 = NULLP;
       ueNrCap.phy_Parameters.phy_ParametersFR2 = NULLP;
 
-      /* Filling RF parameters */
-      elementCnt = 1;
-      ueNrCap.rf_Parameters.supportedBandListNR.list.count = elementCnt;
-      ueNrCap.rf_Parameters.supportedBandListNR.list.size = elementCnt * sizeof(struct BandNR *);
-      CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array, ueNrCap.rf_Parameters.supportedBandListNR.list.size);
-      if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array)
+      /* Filling RF parameters */
+      elementCnt = 1;
+      ueNrCap.rf_Parameters.supportedBandListNR.list.count = elementCnt;
+      ueNrCap.rf_Parameters.supportedBandListNR.list.size = elementCnt * sizeof(struct BandNR *);
+      CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array, ueNrCap.rf_Parameters.supportedBandListNR.list.size);
+      if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array)
+      {
+         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillUeCapRatCont");
+         ret = RFAILED;
+         break;
+      }
+
+      for(idx = 0; idx < elementCnt; idx++)
+      {
+         CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx], sizeof(struct BandNR));
+         if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx])
+         {
+            ret = RFAILED;
+            break;
+         }
+      }
+      if(ret == RFAILED)
+         break;
+      
+      idx = 0;
+      ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx]->bandNR = 1;
+      ueNrCap.rf_Parameters.supportedBandCombinationList = NULLP;
+      ueNrCap.rf_Parameters.appliedFreqBandListFilter = NULLP;
+
+      ueNrCap.measAndMobParameters = NULLP;
+      ueNrCap.fdd_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.tdd_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.fr1_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.fr2_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.featureSets = NULLP;
+
+      CU_ALLOC(ueNrCap.featureSets, sizeof(struct FeatureSets));
+      if(!ueNrCap.featureSets)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapRatCont");
+        ret = RFAILED;
+        break;
+      }
+
+      if(fillFeatureSets(ueNrCap.featureSets) != ROK)
+      {
+         DU_LOG("\nERROR  -->  fillDLFeatureSets() failed ");
+         ret = RFAILED;
+         break;
+      }
+
+      ueNrCap.featureSetCombinations = NULLP;
+      ueNrCap.lateNonCriticalExtension = NULLP;
+      ueNrCap.nonCriticalExtension = NULLP;
+
+      /* encode UE Capability RAT Container List into duToCuRrcContainer */
+      xer_fprint(stdout, &asn_DEF_UE_NR_Capability, &ueNrCap);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_UE_NR_Capability, 0, &ueNrCap, PrepFinalEncBuf, encBuf);
+   
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         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("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }
+
+      ueCapRatContBuf->size = encBufSize;
+      CU_ALLOC(ueCapRatContBuf->buf, ueCapRatContBuf->size);
+      if(!ueCapRatContBuf->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
+         break;
+      }
+      memcpy(ueCapRatContBuf->buf, encBuf, ueCapRatContBuf->size);
+      ret = ROK;
+      break;
+   }
+   freeUeCapRatCont(&ueNrCap);
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill UE Capability RAT container list
+ *
+ * @details
+ *
+ *    Function : fillUeCapRatContList
+ *
+ *    Functionality: Fill UE Capability RAT container list
+ *
+ * @params[in] UE capability RAT container list
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerListRRC_t  *ueCapablityList)
+{
+    uint8_t          ret = RFAILED;
+    uint8_t          idx, elementCnt;
+
+    while(true)
+    {
+       elementCnt = 1;
+       ueCapablityList->list.count = elementCnt;
+       ueCapablityList->list.size = elementCnt * sizeof(UE_CapabilityRAT_Container_t *);
+
+       CU_ALLOC(ueCapablityList->list.array, ueCapablityList->list.size);
+       if(!ueCapablityList->list.array)
+       {
+          DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
+          ret = RFAILED;
+          break;
+       }
+
+       for(idx=0; idx<elementCnt; idx++)
+       {
+          CU_ALLOC(ueCapablityList->list.array[idx], sizeof(UE_CapabilityRAT_Container_t));
+          if(ueCapablityList->list.array[idx] == NULLP)
+          {
+             DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
+             ret = RFAILED;
+             break;
+          }
+       }
+       idx = 0;
+       ueCapablityList->list.array[idx]->rat_Type = RAT_Type_nr;
+       if(fillUeCapRatCont(&ueCapablityList->list.array[idx]->ue_CapabilityRAT_Container) != ROK)
+       {
+          DU_LOG("\nERROR  -->  F1AP : Failed to fill UE capability RAT Conatiner");
+          ret = RFAILED;
+          break;
+       }
+
+       ret = ROK;
+       break;
+    }
+    return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill UE Capability RAT container list octet string
+ *
+ * @details
+ *
+ *    Function : fillUeCapRatContListBuf
+ *
+ *    Functionality: Fill UE Capability RAT container list octet string
+ *
+ * @params[in] UE capability RAT container list buffer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillUeCapRatContListBuf(UE_CapabilityRAT_ContainerList_t *ueCapablityListBuf)
+{
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   UE_CapabilityRAT_ContainerListRRC_t  ueCapablityList;
+
+   while(true)
+   {
+      ret = fillUeCapRatContList(&ueCapablityList);
+      if(ret != ROK)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill UE Capability RAT container list");
+         break;
+      }
+
+      /* encode UE Capability RAT Container List into duToCuRrcContainer */
+      xer_fprint(stdout, &asn_DEF_UE_CapabilityRAT_ContainerListRRC, &ueCapablityList);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_UE_CapabilityRAT_ContainerListRRC, 0, \
+            &ueCapablityList, PrepFinalEncBuf, encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         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("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }
+
+      ueCapablityListBuf->size = encBufSize;
+      CU_ALLOC(ueCapablityListBuf->buf, ueCapablityListBuf->size);
+      if(!ueCapablityListBuf->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
+         break;
+      }
+      memcpy(ueCapablityListBuf->buf, encBuf, ueCapablityListBuf->size);
+      ret = ROK;
+      break;
+   }
+   freeUeCapRatContList(&ueCapablityList);
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Free Measurement Timing Configuration
+ *
+ * @details
+ *
+ *    Function : freeMeasuementTimingConfig
+ *
+ *    Functionality: Free Measurement Timing Configuration
+ *
+ * @params[in] MeasurementTimingConfiguration_IEs_t measTimingCfg
+ * @return void
+ *
+ * ****************************************************************/
+void freeMeasuementTimingConfig(MeasurementTimingConfigurationRrc_t measTimingConfig)
+{
+   uint8_t measCfgIdx;
+   MeasurementTimingConfigurationRrc_IEs_t *measTimingCfg = NULLP;
+   MeasTiming_t *measTiming = NULLP;
+
+   if(measTimingConfig.criticalExtensions.choice.c1)
+   {
+      if(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf)
+      {
+         measTimingCfg = measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf;
+         if(measTimingCfg->measTiming)
+         {
+            if(measTimingCfg->measTiming->list.array)
+            {
+               for(measCfgIdx = 0; measCfgIdx < measTimingCfg->measTiming->list.count; measCfgIdx++)
+               {
+                  measTiming = measTimingCfg->measTiming->list.array[measCfgIdx];
+                  CU_FREE(measTiming->frequencyAndTiming, sizeof(struct MeasTiming__frequencyAndTiming));
+                  CU_FREE(measTimingCfg->measTiming->list.array[measCfgIdx], sizeof(MeasTiming_t));
+               }
+               CU_FREE(measTimingCfg->measTiming->list.array, measTimingCfg->measTiming->list.size);
+            }
+            CU_FREE(measTimingCfg->measTiming, sizeof(MeasTimingList_t));
+         }
+         CU_FREE(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf, sizeof(struct MeasurementTimingConfigurationRrc_IEs));
+      }
+      CU_FREE(measTimingConfig.criticalExtensions.choice.c1, sizeof(struct MeasurementTimingConfigurationRrc__criticalExtensions__c1));
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Fill Measurement Timing Configuration
+ *
+ * @details
+ *
+ *    Function : fillMeasTimingCfg
+ *
+ *    Functionality: Fill Measurement Timing Configuration
+ *
+ * @params[in] MeasurementTimingConfiguration_IEs_t measTimingCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillMeasTimingCfg(MeasurementTimingConfigurationRrc_IEs_t *measTimingCfg)
+{
+   uint8_t elementCnt = 0;
+   uint8_t measCfgIdx = 0; 
+   MeasTiming_t *measTiming;
+   SSB_MTC_t *smtc;
+
+   CU_ALLOC(measTimingCfg->measTiming, sizeof(MeasTimingList_t));
+   if(!measTimingCfg->measTiming)
+   {
+      DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory  for measTiming in fillMeasTimingCfg");
+      return RFAILED;
+   }
+
+   elementCnt = 1;
+   measTimingCfg->measTiming->list.count = elementCnt;
+   measTimingCfg->measTiming->list.size = measTimingCfg->measTiming->list.count * sizeof(MeasTiming_t *);
+   CU_ALLOC(measTimingCfg->measTiming->list.array, measTimingCfg->measTiming->list.size);
+   if(!measTimingCfg->measTiming->list.array)
+   {
+      DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measTiming array in fillMeasTimingCfg");
+      return RFAILED;
+   }
+
+   for(measCfgIdx = 0; measCfgIdx < measTimingCfg->measTiming->list.count; measCfgIdx++)
+   {
+      CU_ALLOC(measTimingCfg->measTiming->list.array[measCfgIdx], sizeof(MeasTiming_t));
+      if(!measTimingCfg->measTiming->list.array[measCfgIdx])
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measTiming array element in fillMeasTimingCfg");
+         return RFAILED;
+      }
+   }
+
+   measCfgIdx = 0;
+   measTiming = measTimingCfg->measTiming->list.array[measCfgIdx];
+   CU_ALLOC(measTiming->frequencyAndTiming, sizeof(struct MeasTiming__frequencyAndTiming));
+   if(!measTiming->frequencyAndTiming)
+   {
+      DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for frequency and timing IE in fillMeasTimingCfg");
+      return RFAILED;
+   }
+
+   measTiming->frequencyAndTiming->carrierFreq =  623800; /* This is a randomly chosen value since ARFCN configured in DU is 623400 */
+   measTiming->frequencyAndTiming->ssbSubcarrierSpacing = SubcarrierSpacing_kHz15;
+
+   smtc = &measTiming->frequencyAndTiming->ssb_MeasurementTimingConfiguration;
+   smtc->periodicityAndOffset.present = SSB_MTC__periodicityAndOffset_PR_sf20;
+   smtc->periodicityAndOffset.choice.sf20 = 0;
+   smtc->duration = SSB_MTC__duration_sf1;
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill Measurement Timing Configuration Octet string
+ *
+ * @details
+ *
+ *    Function : fillMeasConfigBuf
+ *
+ *    Functionality: Fill Measurement Timing Configuration Octet string
+ *
+ * @params[in] MeasConfig_t *measConfgBuf
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillMeasTimingConfigBuf(MeasConfig_t *measTimingConfigBuf)
+{
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   MeasurementTimingConfigurationRrc_t measTimingConfig;
+
+   while(true)
+   {
+      measTimingConfig.criticalExtensions.present = MeasurementTimingConfigurationRrc__criticalExtensions_PR_c1;
+      CU_ALLOC(measTimingConfig.criticalExtensions.choice.c1, sizeof(struct MeasurementTimingConfigurationRrc__criticalExtensions__c1));
+      if(!measTimingConfig.criticalExtensions.choice.c1)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measurement configuration extension");
+         return RFAILED;
+      } 
+      measTimingConfig.criticalExtensions.choice.c1->present = MeasurementTimingConfigurationRrc__criticalExtensions__c1_PR_measTimingConf;
+
+      CU_ALLOC(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf, sizeof(struct MeasurementTimingConfigurationRrc_IEs));
+      if(!measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measurement timing configuration IE");
+         return RFAILED;
+      }
+
+      ret = fillMeasTimingCfg(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf);
+      if(ret != ROK)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill measurement timing configuration IE");
+         break;
+      }
+
+      /* Encode measurement timing configuration into octet string */
+      xer_fprint(stdout, &asn_DEF_MeasurementTimingConfigurationRrc, &measTimingConfig);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_MeasurementTimingConfigurationRrc, 0, &measTimingConfig, PrepFinalEncBuf, encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode Measurement Timing Configuration (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for Measurement timing configuration\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }
+
+      measTimingConfigBuf->size = encBufSize;
+      CU_ALLOC(measTimingConfigBuf->buf, measTimingConfigBuf->size);
+      if(!measTimingConfigBuf->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed fillMeasTimingConfigBuf");
+         break;
+      }
+      memcpy(measTimingConfigBuf->buf, encBuf, measTimingConfigBuf->size);
+      ret = ROK;
+      break;
+   }
+   freeMeasuementTimingConfig(measTimingConfig);
+   return ret;
+}
+
+/******************************************************************
+ *
+ * @brief Free RRC reconfiguration non-critical extension
+ *
+ * @details
+ *
+ *    Function : freeRrcReconfigNonCriticalExt
+ *
+ *    Functionality: Free RRC reconfiguration non-critical extension
+ *
+ * @params[in] RRC reconfiguration IE
+ * @return void
+ *
+ * ****************************************************************/
+void freeRrcReconfigNonCriticalExt(RRCReconfiguration_v1530_IEs_t *rrcRecfg)
+{
+   if(rrcRecfg->masterCellGroup)
+   {
+      CU_FREE(rrcRecfg->masterCellGroup, sizeof(OCTET_STRING_t));
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Free measurement object addmod list
+ *
+ * @details
+ *
+ *    Function : freeMeasObjToAddModList
+ *
+ *    Functionality: Free measurement object add mod list
+ *
+ * @params[in] Measurement object add/mod list
+ * @return void
+ *
+ * ****************************************************************/
+void freeMeasObjToAddModList(MeasObjectToAddModList_t *measObjList)
+{
+   uint8_t objIdx;
+   MeasObjectNR_t *measObject;
+
+   if(measObjList->list.array)
+   {
+      for(objIdx = 0; objIdx < measObjList->list.size; objIdx++)
+      {
+         if(measObjList->list.array[objIdx])
+         {
+            if(measObjList->list.array[objIdx]->measObject.choice.measObjectNR)
+            {
+               measObject = measObjList->list.array[objIdx]->measObject.choice.measObjectNR;
+               CU_FREE(measObject->ssbFrequency, sizeof(ARFCN_ValueNR_t));
+               CU_FREE(measObject->ssbSubcarrierSpacing, sizeof(SubcarrierSpacing_t));
+               CU_FREE(measObject->smtc1 , sizeof(SSB_MTC_t));
+               if(measObject->absThreshSS_BlocksConsolidation)
+               {
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation->thresholdRSRP, sizeof(RSRP_Range_t));
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ, sizeof(RSRQ_Range_t));
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation->thresholdSINR, sizeof(SINR_Range_t));
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation, sizeof(ThresholdNR_t));
+               }
+               CU_FREE(measObject->nrofSS_BlocksToAverage, sizeof(long));
+               CU_FREE(measObject->offsetMO.rsrpOffsetSSB, sizeof(Q_OffsetRange_t));
+               CU_FREE(measObject->offsetMO.rsrqOffsetSSB, sizeof(Q_OffsetRange_t));
+               CU_FREE(measObject->offsetMO.sinrOffsetSSB, sizeof(Q_OffsetRange_t));
+               CU_FREE(measObjList->list.array[objIdx]->measObject.choice.measObjectNR, sizeof(MeasObjectNR_t));
+            }
+            CU_FREE(measObjList->list.array[objIdx], sizeof(MeasObjectToAddMod_t));
+         }
+      }
+      CU_FREE(measObjList->list.array, measObjList->list.size);
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Free report config add mod list
+ *
+ * @details
+ *
+ *    Function : freeReportCfgToAddModList
+ *
+ *    Functionality: Free report config add mod list
+ *
+ * @params[in] Report config list
+ * @return void
+ *
+ * ****************************************************************/
+void freeReportCfgToAddModList(ReportConfigToAddModList_t *reportCfgList)
+{
+   uint8_t reportCfgIdx;
+   ReportConfigToAddMod_t *reportCfg;
+   ReportConfigNR_t *reportCfgNr;
+   EventTriggerConfig_t *eventTriggCfg;
+
+   if(reportCfgList->list.array)
+   {
+      for(reportCfgIdx=0; reportCfgIdx < reportCfgList->list.count; reportCfgIdx++)
+      {
+         if(reportCfgList->list.array[reportCfgIdx])
+         {
+            reportCfg = reportCfgList->list.array[reportCfgIdx];
+            if(reportCfg->reportConfig.choice.reportConfigNR)
+            {
+               reportCfgNr = reportCfg->reportConfig.choice.reportConfigNR;
+               if(reportCfgNr->reportType.choice.eventTriggered)
+               {
+                  eventTriggCfg = reportCfgNr->reportType.choice.eventTriggered;
+                  CU_FREE(eventTriggCfg->eventId.choice.eventA3, sizeof(struct EventTriggerConfig__eventId__eventA3));
+                  CU_FREE(eventTriggCfg->reportQuantityRS_Indexes, sizeof(MeasReportQuantity_t));
+                  CU_FREE(eventTriggCfg->maxNrofRS_IndexesToReport, sizeof(long));
+                  CU_FREE(reportCfgNr->reportType.choice.eventTriggered, sizeof(EventTriggerConfig_t));
+               }
+            }
+         }
+         CU_FREE(reportCfgList->list.array[reportCfgIdx], sizeof(ReportConfigToAddMod_t));
+      }
+      CU_FREE(reportCfgList->list.array, reportCfgList->list.size);
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Free measurement id to add mod list
+ *
+ * @details
+ *
+ *    Function : freeMeasIdToAddModList
+ *
+ *    Functionality: Free measurement id to add mod list
+ *
+ * @params[in] Measurement id to add mod list
+ * @return void
+ *
+ * ****************************************************************/
+void freeMeasIdToAddModList(MeasIdToAddModList_t *measIdList)
+{
+   uint8_t measIdIdx;
+   if(measIdList->list.array)
+   {
+      for(measIdIdx=0; measIdIdx < measIdList->list.count; measIdIdx++)
+      {
+         CU_FREE(measIdList->list.array[measIdIdx], sizeof(MeasIdToAddMod_t));
+      }
+      CU_FREE(measIdList->list.array, measIdList->list.size);
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Free quantity config
+ *
+ * @details
+ *
+ *    Function : freeQunatityConfig
+ *
+ *    Functionality: Free quantity config
+ *
+ * @params[in] Quantity Config
+ * @return void
+ *
+ * ****************************************************************/
+uint8_t freeQuantityConfig(QuantityConfig_t *quantityCfg)
+{
+   uint8_t quanCfgIdx;
+   QuantityConfigNR_t *quantityCfgNr;
+
+   if(quantityCfg->quantityConfigNR_List)
+   {
+      if(quantityCfg->quantityConfigNR_List->list.array)
+      {
+         for(quanCfgIdx = 0; quanCfgIdx < quantityCfg->quantityConfigNR_List->list.count; quanCfgIdx++)
+         {
+            if(quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx])
+            {
+               quantityCfgNr = quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx];
+               CU_FREE(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+               CU_FREE(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+               CU_FREE(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+               if(quantityCfgNr->quantityConfigRS_Index)
+               {
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index, sizeof(QuantityConfigRS_t));
+               }
+               CU_FREE(quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx], sizeof(QuantityConfigNR_t));
+            }
+         }
+         CU_FREE(quantityCfg->quantityConfigNR_List->list.array, quantityCfg->quantityConfigNR_List->list.size);
+      }
+      CU_FREE(quantityCfg->quantityConfigNR_List, sizeof(struct QuantityConfig__quantityConfigNR_List));
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Free measurement Config
+ *
+ * @details
+ *
+ *    Function : freeMeasConfig
+ *
+ *    Functionality: Free measurement config
+ *
+ * @params[in] Measurement config
+ * @return void
+ *
+ * ****************************************************************/
+void freeMeasConfig(MeasConfigRrc_t *measConfig)
+{
+   if(measConfig->measObjectToAddModList)
+   {
+      freeMeasObjToAddModList(measConfig->measObjectToAddModList);
+      CU_FREE(measConfig->measObjectToAddModList, sizeof(MeasObjectToAddModList_t));
+   }
+   if(measConfig->reportConfigToAddModList)
+   {
+      freeReportCfgToAddModList(measConfig->reportConfigToAddModList);
+      CU_FREE(measConfig->reportConfigToAddModList, sizeof(ReportConfigToAddModList_t));
+   }
+   if(measConfig->measIdToAddModList)
+   {
+      freeMeasIdToAddModList(measConfig->measIdToAddModList);
+      CU_FREE(measConfig->measIdToAddModList, sizeof(MeasIdToAddModList_t));
+   }
+   if(measConfig->s_MeasureConfig)
+   {
+      CU_FREE(measConfig->s_MeasureConfig, sizeof(struct MeasConfigRrc__s_MeasureConfig));
+   }
+   if(measConfig->quantityConfig)
+   {
+      freeQuantityConfig(measConfig->quantityConfig);
+      CU_FREE(measConfig->quantityConfig, sizeof(QuantityConfig_t));
+   }
+}
+/******************************************************************
+ *
+ * @brief Free DRB to AddMod List
+ *
+ * @details
+ *
+ *    Function : freeDrbToAddModList
+ *
+ *    Functionality: Free SRB to AddMod List
+ *
+ * @params[in] SBR to add/mod list
+ * @return void
+ *
+ * ****************************************************************/
+void freeDrbToAddModList(DRB_ToAddModList_t *drbToAddList)
+{
+   uint8_t drbIdx;
+   if(drbToAddList->list.array)
+   {
+      for(drbIdx = 0; drbIdx < drbToAddList->list.count; drbIdx++)
+      {
+         if(drbToAddList->list.array[drbIdx]->pdcp_Config)
+         {
+            if(drbToAddList->list.array[drbIdx]->pdcp_Config->drb)
+            {
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer, sizeof(long));
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL, sizeof(long));
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL, sizeof(long));
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb, sizeof(struct PDCP_Config__drb));
+            }
+            CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+            CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+         }
+         CU_FREE(drbToAddList->list.array[drbIdx], sizeof(DRB_ToAddMod_t));
+      }
+      CU_FREE(drbToAddList->list.array, drbToAddList->list.size);
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Free SRB to AddMod List
+ *
+ * @details
+ *
+ *    Function : freeSrbToAddModList
+ *
+ *    Functionality: Free SRB to AddMod List
+ *
+ * @params[in] SBR to add/mod list
+ * @return void
+ *
+ * ****************************************************************/
+void freeSrbToAddModList(SRB_ToAddModList_t *srbToAddList)
+{
+   uint8_t srbIdx;
+   if(srbToAddList->list.array)
+   {
+      for(srbIdx = 0; srbIdx < srbToAddList->list.count; srbIdx++)
+      {
+         CU_FREE(srbToAddList->list.array[srbIdx]->reestablishPDCP, sizeof(long));
+         if(srbToAddList->list.array[srbIdx]->pdcp_Config)
+         {
+            CU_FREE(srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+            CU_FREE(srbToAddList->list.array[srbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+         }
+
+         CU_FREE(srbToAddList->list.array[srbIdx], sizeof(SRB_ToAddMod_t));
+      }
+      CU_FREE(srbToAddList->list.array, srbToAddList->list.size);
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Free Radio Bearer Config
+ *
+ * @details
+ *
+ *    Function : fillRadioBearerConfig
+ *
+ *    Functionality: Free Radio Bearer config
+ *
+ * @params[in] Radio bearer config
+ * @return void
+ *
+ * ****************************************************************/
+void freeRadioBearerConfig(RadioBearerConfig_t *radioBearerConfig)
+{
+   if(radioBearerConfig->srb_ToAddModList)
+   {
+      freeSrbToAddModList(radioBearerConfig->srb_ToAddModList);
+      CU_FREE(radioBearerConfig->srb_ToAddModList, sizeof(SRB_ToAddModList_t));
+   }
+   if(radioBearerConfig->drb_ToAddModList)
+   {
+      freeDrbToAddModList(radioBearerConfig->drb_ToAddModList);
+      CU_FREE(radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Free reconfiguration message
+ *
+ * @details
+ *
+ *    Function : freeRrcReconfig
+ *
+ *    Functionality: Free reconfiguration message
+ *
+ * @params[in] RRC Reconfiguration message
+ * @return void
+ *
+ * ****************************************************************/
+void freeRrcReconfig(RRCReconfiguration_t *rrcReconfig)
+{
+   if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration)
+   {
+      if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig)
+      {
+         freeRadioBearerConfig(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig);
+         CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig, sizeof(RadioBearerConfig_t));
+      }
+      if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig)
+      {
+         freeMeasConfig(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig);
+         CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig, sizeof(MeasConfigRrc_t));
+      }
+      if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension)
+      {
+         freeRrcReconfigNonCriticalExt(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension);
+         CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension, sizeof(struct RRCReconfiguration_v1530_IEs));
+      }
+      CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration, sizeof(RRCReconfiguration_IEs_t));
+   }
+}
+
+/******************************************************************
+ *
+ * @brief Fill SRB To Add Mod list
+ *
+ * @details
+ *
+ *    Function : fillSrbToAddModList
+ *
+ *    Functionality: fill SRB to Add Mod list
+ *
+ * @params[in] UE control block
+ *             SRB to Add/Mod list
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillSrbToAddModList(CuUeCb *ueCb, SRB_ToAddModList_t *srbToAddList, bool updateAllRbCfg)
+{
+   uint8_t srbIdx, srbDbIdx;
+
+   if(updateAllRbCfg)
+      srbToAddList->list.count = ueCb->numSrb;
+   else
+   {
+      srbToAddList->list.count = 0;
+      for(srbDbIdx=0; srbDbIdx < ueCb->numSrb; srbDbIdx++)
+      {
+         if(ueCb->srbList[srbDbIdx].cfgSentToUe == false)
+            srbToAddList->list.count++;
+      }
+   }
+   srbToAddList->list.size = srbToAddList->list.count * sizeof(SRB_ToAddMod_t *);
+
+   CU_ALLOC(srbToAddList->list.array, srbToAddList->list.size);
+   if(!srbToAddList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SRB to AddMod list array in fillSrbToAddModList");
+      return RFAILED;
+   }
+
+   srbIdx = 0;
+   for(srbDbIdx = 0; srbDbIdx < ueCb->numSrb; srbDbIdx++)
+   {
+      if(!updateAllRbCfg && ueCb->srbList[srbDbIdx].cfgSentToUe)
+         continue;
+
+      CU_ALLOC(srbToAddList->list.array[srbIdx], sizeof(SRB_ToAddMod_t));
+      if(!srbToAddList->list.array[srbIdx])
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SRB to AddMod list element in fillSrbToAddModList");
+         return RFAILED;
+      }
+
+      srbToAddList->list.array[srbIdx]->srb_Identity = ueCb->srbList[srbDbIdx].srbId;
+
+      /* Reestablish PDCP */
+      CU_ALLOC(srbToAddList->list.array[srbIdx]->reestablishPDCP, sizeof(long));
+      if(!srbToAddList->list.array[srbIdx]->reestablishPDCP)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for reestablish PDCP IE in fillSrbToAddModList");
+         return RFAILED;
+      }
+      *(srbToAddList->list.array[srbIdx]->reestablishPDCP) = SRB_ToAddMod__reestablishPDCP_true;
+
+      /* PDCP configuration */
+      CU_ALLOC(srbToAddList->list.array[srbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+      if(!srbToAddList->list.array[srbIdx]->pdcp_Config)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for PDCP config IE in fillSrbToAddModList");
+         return RFAILED;
+      }
+
+      /* Reordering timer */
+      CU_ALLOC(srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+      if(!srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for reordering timer in fillSrbToAddModList");
+         return RFAILED;
+      }
+      *(srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering) = PDCP_Config__t_Reordering_ms40;
+      
+      srbIdx++;
+   }
+   return ROK;
+}
+
+/******************************************************************
+ *
+ * @biief Fill DRBeTo Add Mod list
+ *
+ * @details
+ *
+ *    Function : fillDrbToAddModList
+ *
+ *    Functionality: fill DRB to Add Mod list
+ *
+ * @params[in] UE control block
+ *             DRB to Add/Mod list
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillDrbToAddModList(CuUeCb *ueCb, DRB_ToAddModList_t *drbToAddList, bool updateAllRbCfg)
+{
+   uint8_t drbIdx, drbDbIdx;
+
+   if(updateAllRbCfg)
+      drbToAddList->list.count = ueCb->numDrb;
+   else
+   {
+      drbToAddList->list.count = 0;
+      for(drbDbIdx=0; drbDbIdx < ueCb->numDrb; drbDbIdx++)
+      {     
+         if(ueCb->drbList[drbDbIdx].cfgSentToUe == false)
+            drbToAddList->list.count++;
+      }     
+   }
+   drbToAddList->list.size = drbToAddList->list.count * sizeof(DRB_ToAddMod_t *);
+
+   CU_ALLOC(drbToAddList->list.array, drbToAddList->list.size);
+   if(!drbToAddList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB to AddMod list array in fillDrbToAddModList");
+      return RFAILED;
+   }
+
+   drbIdx = 0;
+   for(drbDbIdx=0; drbDbIdx < ueCb->numDrb; drbDbIdx++)
+   {
+      if(!updateAllRbCfg && ueCb->drbList[drbDbIdx].cfgSentToUe)
+         continue;
+
+      CU_ALLOC(drbToAddList->list.array[drbIdx], sizeof(DRB_ToAddMod_t));
+      if(!drbToAddList->list.array[drbIdx])
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB to AddMod list elements in fillDrbToAddModList");
+         return RFAILED;
+      }
+
+      /* DRB Id */
+      drbToAddList->list.array[drbIdx]->drb_Identity = ueCb->drbList[drbDbIdx].drbId;
+
+      /* PDCP Config */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for PDCP config IE in fillDrbToAddModList");
+         return RFAILED;
+      }
+
+      /* PDCP Config -> DRB */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb, sizeof(struct PDCP_Config__drb));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for PDCP config drb in fillDrbToAddModList");
+         return RFAILED;
+      }
+
+      /* DRB -> Discard Timer */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB discard timer in fillDrbToAddModList");
+         return RFAILED;
+      }
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer) = PDCP_Config__drb__discardTimer_infinity;
+
+      /* UL PDCP SN length */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for UL SN length in fillDrbToAddModList");
+         return RFAILED;
+      }
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL) = PDCP_Config__drb__pdcp_SN_SizeUL_len12bits;
+
+      /* DL PDCP SN length */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DL SN length in fillDrbToAddModList");
+         return RFAILED;
+      }
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL) = PDCP_Config__drb__pdcp_SN_SizeDL_len12bits;
+
+      /* Header Compression */
+      drbToAddList->list.array[drbIdx]->pdcp_Config->drb->headerCompression.present = PDCP_Config__drb__headerCompression_PR_notUsed;
+       drbToAddList->list.array[drbIdx]->pdcp_Config->drb->headerCompression.choice.notUsed = NULLP;
+
+      /* Reordering timer */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for reordering timer in fillDrbToAddModList");
+         return RFAILED;
+      }
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering) = PDCP_Config__t_Reordering_ms40;
+
+      drbIdx++;
+   }
+
+   return ROK;
+}
+
+/******************************************************************
+ *
+ * @brief Fill Radio bearer configuration
+ *
+ * @details
+ *
+ *    Function : fillRadioBearerConfig
+ *
+ *    Functionality: Fill Radio bearer configuration
+ *
+ * @params[in] UE control block
+ *             Radio bearer config pointer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillRadioBearerConfig(CuUeCb *ueCb, RadioBearerConfig_t *radioBearerConfig, bool updateAllRbCfg)
+{
+   /* SRB To Add/Mod List */
+   CU_ALLOC(radioBearerConfig->srb_ToAddModList, sizeof(SRB_ToAddModList_t));
+   if(!radioBearerConfig->srb_ToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SRB to AddMod List in fillRadioBearerConfig");
+      return RFAILED;
+   }
+   if(fillSrbToAddModList(ueCb, radioBearerConfig->srb_ToAddModList, updateAllRbCfg) != ROK)
+   {
+      return RFAILED;
+   }
+
+   /* DRB To Add/Mod List */
+   CU_ALLOC(radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
+   if(!radioBearerConfig->drb_ToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB to AddMod List in fillRadioBearerConfig");
+      return RFAILED;
+   }
+   if(fillDrbToAddModList(ueCb, radioBearerConfig->drb_ToAddModList, updateAllRbCfg) != ROK)
+   {
+      return RFAILED;
+   }
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill measurement object to add/mod list
+ *
+ * @details
+ *
+ *    Function : fillMeasObjToAddModList
+ *
+ *    Functionality: Fill measurement object to add/mod list
+ *
+ * @params[in] Measurement object to add/mod list
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillMeasObjToAddModList(MeasObjectToAddModList_t *measObjList)
+{
+   uint8_t elementCnt, objIdx;
+   MeasObjectNR_t *measObject;
+
+   elementCnt = 1;
+   measObjList->list.count = elementCnt;
+   measObjList->list.size = measObjList->list.count * sizeof(MeasObjectToAddMod_t *);
+
+   CU_ALLOC(measObjList->list.array, measObjList->list.size);
+   if(!measObjList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measurement object list's array");
+      return RFAILED;
+   }
+
+   for(objIdx = 0; objIdx < measObjList->list.size; objIdx++)
+   {
+      CU_ALLOC(measObjList->list.array[objIdx], sizeof(MeasObjectToAddMod_t));
+      if(!measObjList->list.array[objIdx])
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measurement object list's array element");
+         return RFAILED;
+      }
+   }
+
+   objIdx = 0;
+   measObjList->list.array[objIdx]->measObjectId = 1;
+   measObjList->list.array[objIdx]->measObject.present = MeasObjectToAddMod__measObject_PR_measObjectNR;
+   CU_ALLOC(measObjList->list.array[objIdx]->measObject.choice.measObjectNR, sizeof(MeasObjectNR_t));
+   if(!measObjList->list.array[objIdx]->measObject.choice.measObjectNR)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for mesurement object NR");
+      return RFAILED;
+   }
+
+   measObject = measObjList->list.array[objIdx]->measObject.choice.measObjectNR;
+
+   /* SSB frequency */
+   CU_ALLOC(measObject->ssbFrequency, sizeof(ARFCN_ValueNR_t));
+   if(!measObject->ssbFrequency)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB frequency in fillMeasObjToAddModList"); 
+      return RFAILED;
+   }
+   *(measObject->ssbFrequency) = 620736; /* Value picked from reference PCAP logs */
+
+   /* Subcarrier spacing */
+   CU_ALLOC(measObject->ssbSubcarrierSpacing, sizeof(SubcarrierSpacing_t));
+   if(!measObject->ssbSubcarrierSpacing)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB subcarrier spacing in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->ssbSubcarrierSpacing) = SubcarrierSpacing_kHz15;
+
+   /* SMTC1 */
+   CU_ALLOC(measObject->smtc1 , sizeof(SSB_MTC_t));
+   if(!measObject->smtc1)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SMTC1 in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   measObject->smtc1->duration = SSB_MTC__duration_sf1;
+   measObject->smtc1->periodicityAndOffset.present = SSB_MTC__periodicityAndOffset_PR_sf20;
+   measObject->smtc1->periodicityAndOffset.choice.sf20 = 0;
+
+   /* Absoulute threshold SSB consolidation */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation, sizeof(ThresholdNR_t));
+   if(!measObject->absThreshSS_BlocksConsolidation)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for absolute threshold SSB consolidation in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+
+   /* RSRP threshold */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation->thresholdRSRP, sizeof(RSRP_Range_t));
+   if(!measObject->absThreshSS_BlocksConsolidation->thresholdRSRP)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for threshold RSRP in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->absThreshSS_BlocksConsolidation->thresholdRSRP) = 1;
+
+   /* RSRQ threshold */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ, sizeof(RSRQ_Range_t));
+   if(!measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for threshold RSRQ in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ) = 1;
+
+   /* SINR threshold */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation->thresholdSINR, sizeof(SINR_Range_t));
+   if(!measObject->absThreshSS_BlocksConsolidation->thresholdSINR)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for threshold SINR in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->absThreshSS_BlocksConsolidation->thresholdSINR) = 1;
+
+   /* Number of SSBs to average */
+   CU_ALLOC(measObject->nrofSS_BlocksToAverage, sizeof(long));
+   if(!measObject->nrofSS_BlocksToAverage)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for number of SSB to average in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->nrofSS_BlocksToAverage) = 2;
+
+   /* Quantity Config index */
+   measObject->quantityConfigIndex = 1;
+
+   /* Offset MO */
+   /* RSRP offset for SSB */
+   CU_ALLOC(measObject->offsetMO.rsrpOffsetSSB, sizeof(Q_OffsetRange_t));
+   if(!measObject->offsetMO.rsrpOffsetSSB)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB RSRP offset in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->offsetMO.rsrpOffsetSSB) = Q_OffsetRange_dB0;
+
+   /* RSRQ offset for SSB */
+   CU_ALLOC(measObject->offsetMO.rsrqOffsetSSB, sizeof(Q_OffsetRange_t));
+   if(!measObject->offsetMO.rsrpOffsetSSB)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB RSRQ offset in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->offsetMO.rsrqOffsetSSB) = Q_OffsetRange_dB0;
+
+   /* SINR offset for SSB */
+   CU_ALLOC(measObject->offsetMO.sinrOffsetSSB, sizeof(Q_OffsetRange_t));
+   if(!measObject->offsetMO.sinrOffsetSSB)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB SINR offset in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->offsetMO.sinrOffsetSSB) = Q_OffsetRange_dB0;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill Report configuration to Add/mod list
+ *
+ * @details
+ *
+ *    Function : fillReportCfgToAddModList
+ *
+ *    Functionality: Fill Report configuration to Add/mod list
+ *
+ * @params[in] Report Config To Add/Mod List
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillReportCfgToAddModList(ReportConfigToAddModList_t *reportCfgList)
+{
+   uint8_t elementCnt;
+   uint8_t reportCfgIdx;
+   ReportConfigToAddMod_t *reportCfg;
+   ReportConfigNR_t *reportCfgNr;
+   EventTriggerConfig_t *eventTriggCfg;
+
+   elementCnt = 1;
+   reportCfgList->list.count = elementCnt;
+   reportCfgList->list.size = reportCfgList->list.count * sizeof(ReportConfigToAddMod_t *);
+
+   CU_ALLOC(reportCfgList->list.array, reportCfgList->list.size);
+   if(!reportCfgList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList() :Memory allocation failed for report config list's array");
+      return RFAILED;
+   }
+
+   for(reportCfgIdx=0; reportCfgIdx < reportCfgList->list.count; reportCfgIdx++)
+   {
+      CU_ALLOC(reportCfgList->list.array[reportCfgIdx], sizeof(ReportConfigToAddMod_t));
+      if(!reportCfgList->list.array[reportCfgIdx])
+      {
+         DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for report config list's array element");
+         return RFAILED;
+      }
+   }
+
+   reportCfgIdx = 0;
+   reportCfg = reportCfgList->list.array[reportCfgIdx];
+   reportCfg->reportConfigId = 1;
+   reportCfg->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigNR;
+
+   /* Report Configuration for NR */
+   CU_ALLOC(reportCfg->reportConfig.choice.reportConfigNR, sizeof(ReportConfigNR_t));
+   if(!reportCfg->reportConfig.choice.reportConfigNR)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for report config NR");
+      return RFAILED;
+   }
+   reportCfgNr = reportCfg->reportConfig.choice.reportConfigNR;
+
+   /* Report Type */
+   reportCfgNr->reportType.present = ReportConfigNR__reportType_PR_eventTriggered;
+   CU_ALLOC(reportCfgNr->reportType.choice.eventTriggered, sizeof(EventTriggerConfig_t));
+   if(!reportCfgNr->reportType.choice.eventTriggered)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for event triggerred");
+      return RFAILED;
+   }
+   eventTriggCfg = reportCfgNr->reportType.choice.eventTriggered;
+
+   /* Event 3 */
+   eventTriggCfg->eventId.present = EventTriggerConfig__eventId_PR_eventA3;
+   CU_ALLOC(eventTriggCfg->eventId.choice.eventA3, sizeof(struct EventTriggerConfig__eventId__eventA3));
+   if(!eventTriggCfg->eventId.choice.eventA3)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for event A3");
+      return RFAILED;
+   }
+
+   eventTriggCfg->eventId.choice.eventA3->a3_Offset.present = MeasTriggerQuantityOffset_PR_rsrp;
+   eventTriggCfg->eventId.choice.eventA3->a3_Offset.choice.rsrp = 6; /* i.e. 3.0db . From Reference pcap log */
+   eventTriggCfg->eventId.choice.eventA3->reportOnLeave = false;
+   eventTriggCfg->eventId.choice.eventA3->hysteresis = 0;
+   eventTriggCfg->eventId.choice.eventA3->timeToTrigger = TimeToTrigger_ms40;
+   eventTriggCfg->eventId.choice.eventA3->useWhiteCellList = false;
+
+   /* Reference Signal Type */
+   eventTriggCfg->rsType = NR_RS_Type_ssb;
+
+   /* Report Interval */
+   eventTriggCfg->reportInterval = ReportInterval_ms1024;
+
+   /* Report Amount */
+   eventTriggCfg->reportAmount = EventTriggerConfig__reportAmount_r8;
+
+   /* Report Quantity cell */
+   eventTriggCfg->reportQuantityCell.rsrp = true;
+   eventTriggCfg->reportQuantityCell.rsrq = false;
+   eventTriggCfg->reportQuantityCell.sinr = false;
+
+   /* Maximum reported cells */
+   eventTriggCfg->maxReportCells = 3;
+
+   /* Report qunatity RS Indexes */
+   CU_ALLOC(eventTriggCfg->reportQuantityRS_Indexes, sizeof(MeasReportQuantity_t));
+   if(!eventTriggCfg->reportQuantityRS_Indexes)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for report qunatity RS indexes");
+      return RFAILED;
+   }
+   eventTriggCfg->reportQuantityRS_Indexes->rsrp = true;
+   eventTriggCfg->reportQuantityRS_Indexes->rsrq = false;
+   eventTriggCfg->reportQuantityRS_Indexes->sinr = false;
+
+   /* Maximum number of RS indexes to report */
+   CU_ALLOC(eventTriggCfg->maxNrofRS_IndexesToReport, sizeof(long));
+   if(!eventTriggCfg->maxNrofRS_IndexesToReport)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for max number of RS indexes to report");
+      return RFAILED;
+   }
+   *(eventTriggCfg->maxNrofRS_IndexesToReport) = 1;
+
+   /* Include Beam measurement */
+   eventTriggCfg->includeBeamMeasurements = false;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill measurement Id to add/mod list
+ * @details
+ *
+ *    Function : fillMeasIdToAddModList
+ *
+ *    Functionality: Fill measurement Id to add/mod list
+ *
+ * @params[in] Measurement Id to add/mod list
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillMeasIdToAddModList(MeasIdToAddModList_t *measIdList)
+{
+   uint8_t elementCnt;
+   uint8_t measIdIdx;
+
+   elementCnt = 1;
+   measIdList->list.count = elementCnt;
+   measIdList->list.size = measIdList->list.count *sizeof(MeasIdToAddMod_t *);
+
+   CU_ALLOC(measIdList->list.array, measIdList->list.size);
+   if(!measIdList->list.array)
+   {
+      return RFAILED;
+   }
+
+   for(measIdIdx=0; measIdIdx < measIdList->list.count; measIdIdx++)
+   {
+      CU_ALLOC(measIdList->list.array[measIdIdx], sizeof(MeasIdToAddMod_t));
+      if(!measIdList->list.array[measIdIdx])
+      {
+         return RFAILED;
+      }
+
+      measIdIdx=0;
+      measIdList->list.array[measIdIdx]->measId = 1;
+      measIdList->list.array[measIdIdx]->measObjectId = 1;
+      measIdList->list.array[measIdIdx]->reportConfigId = 1;
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill s-measurement configuration
+ *
+ * @details
+ *
+ *    Function : fillSMeasConfig
+ *
+ *    Functionality: Fill s-measurement configuration
+ *
+ * @params[in] s-Measurement config
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillSMeasConfig(struct MeasConfigRrc__s_MeasureConfig *sMeasCfg)
+{
+   sMeasCfg->present = MeasConfigRrc__s_MeasureConfig_PR_ssb_RSRP;
+   sMeasCfg->choice.ssb_RSRP = 100; /* Value taken from reference PCAP log */
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill quantity config
+ *
+ * @details
+ *
+ *    Function : fillQunatityConfig
+ *
+ *    Functionality: Fill quantity config
+ *
+ * @params[in] Quantity Config
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillQuantityConfig(QuantityConfig_t *quantityCfg)
+{
+   uint8_t elementCnt = 0;
+   uint8_t quanCfgIdx = 0;
+   QuantityConfigNR_t *quantityCfgNr;
+
+   CU_ALLOC(quantityCfg->quantityConfigNR_List, sizeof(struct QuantityConfig__quantityConfigNR_List));
+   if(!quantityCfg->quantityConfigNR_List)
+   {
+      return RFAILED;
+   }
+
+   elementCnt = 1;
+   quantityCfg->quantityConfigNR_List->list.count = elementCnt;
+   quantityCfg->quantityConfigNR_List->list.size = elementCnt * sizeof(QuantityConfigNR_t *);
+
+   CU_ALLOC(quantityCfg->quantityConfigNR_List->list.array, quantityCfg->quantityConfigNR_List->list.size);
+   if(!quantityCfg->quantityConfigNR_List->list.array)
+   {
+      return RFAILED;
+   }
+
+   for(quanCfgIdx = 0; quanCfgIdx < quantityCfg->quantityConfigNR_List->list.count; quanCfgIdx++)
+   {
+      CU_ALLOC(quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx], sizeof(QuantityConfigNR_t));
+      if(!quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx])
+      {
+         return RFAILED;
+      }
+   }
+
+   quanCfgIdx = 0;
+   quantityCfgNr = quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx];
+
+   /* Quantity Config of Reference signal */
+   CU_ALLOC(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR) = FilterCoefficient_fc4;
+
+   /* Quantity Config RS index */
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index, sizeof(QuantityConfigRS_t));
+   if(!quantityCfgNr->quantityConfigRS_Index)
+   {
+      return RFAILED;
+   }
+
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR) = FilterCoefficient_fc4;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill measurement configuration
+ *
+ * @details
+ *
+ *    Function : fillMeasConfig
+ *
+ *    Functionality: Fill measurement configuration
+ *
+ * @params[in] Measurement config
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillMeasConfig(MeasConfigRrc_t *measConfig)
+{
+   /* Measurement object to add/mod list */
+   CU_ALLOC(measConfig->measObjectToAddModList, sizeof(MeasObjectToAddModList_t));
+   if(!measConfig->measObjectToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measurement object list in fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillMeasObjToAddModList(measConfig->measObjectToAddModList) != ROK)
+   {   
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+
+   /* Report Config To add/mod list */
+   CU_ALLOC(measConfig->reportConfigToAddModList, sizeof(ReportConfigToAddModList_t));
+   if(!measConfig->reportConfigToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for report config list in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillReportCfgToAddModList(measConfig->reportConfigToAddModList) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillReportCfgToAddModList");
+      return RFAILED;
+   }
+
+   /* Measurement Id to add/mod list */
+   CU_ALLOC(measConfig->measIdToAddModList, sizeof(MeasIdToAddModList_t));
+   if(!measConfig->measIdToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measuerment id list in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillMeasIdToAddModList(measConfig->measIdToAddModList) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillMeasIdToAddModList");
+      return RFAILED;
+   }
+
+   /* S-Measurement config */
+   CU_ALLOC(measConfig->s_MeasureConfig, sizeof(struct MeasConfigRrc__s_MeasureConfig));
+   if(!measConfig->s_MeasureConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for s measuerment config in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillSMeasConfig(measConfig->s_MeasureConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillSMeasConfig");
+      return RFAILED;
+   }
+
+   /* Qunatity Config */
+   CU_ALLOC(measConfig->quantityConfig, sizeof(QuantityConfig_t));
+   if(!measConfig->quantityConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for quantity config in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillQuantityConfig(measConfig->quantityConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillQuantityConfig");
+      return RFAILED;
+   }
+
+return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill RRC reconfiguration non-critical extension IE
+ *
+ * @details
+ *
+ *    Function : fillRrcReconfigNonCriticalExt
+ *
+ *    Functionality: Fill RRC reconfiguration non-critical extension
+ *
+ * @params[in] RRC Reconfig Non-critical extension
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillRrcReconfigNonCriticalExt(CuUeCb *ueCb, RRCReconfiguration_v1530_IEs_t *rrcRecfg, bool updateAllRbCfg)
+{
+   CU_ALLOC(rrcRecfg->masterCellGroup, sizeof(OCTET_STRING_t));
+   if(!rrcRecfg->masterCellGroup)
+   {
+      return RFAILED;
+   }
+
+   if(fillCellGrpCfg(ueCb, rrcRecfg->masterCellGroup, updateAllRbCfg) != ROK)
+   {
+      return RFAILED;
+   }
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill RRC reconfiguration structure
+ *
+ * @details
+ *
+ *    Function : fillRrcReconfig
+ *
+ *    Functionality: Fill RRC reconfiguration
+ *
+ * @params[in] UE Cb
+ *             RRC reconfiguration structure
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillRrcReconfig(CuUeCb *ueCb, RRCReconfiguration_t *rrcReconfig, bool updateAllRbCfg)
+{
+   memset(rrcReconfig, 0, sizeof(RRCReconfiguration_t));
+
+   rrcReconfig->rrc_TransactionIdentifier = 1;
+   rrcReconfig->criticalExtensions.present = RRCReconfiguration__criticalExtensions_PR_rrcReconfiguration;
+
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration, sizeof(RRCReconfiguration_IEs_t)); 
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for RRC reconfiguration IE in fillRrcReconfig");
+      return RFAILED;
+   }
+
+   /* Radio Bearer Configuration */
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig, sizeof(RadioBearerConfig_t));
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for radio bearer config in fillRrcReconfig");
+      return RFAILED;
+   }
+   if(fillRadioBearerConfig(ueCb, rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig, updateAllRbCfg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed to fill radio bearer config in fillRrcReconfig");
+      return RFAILED;
+   }
+
+   /* Measurement Configuration */
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig, sizeof(MeasConfigRrc_t));
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for Measurement config IE in fillRrcReconfig");
+      return RFAILED;
+   }
+   if(fillMeasConfig(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed to fill measurement config in fillRrcReconfig");
+      return RFAILED;
+   }
+
+   /* Non Critical extension */
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension, sizeof(struct RRCReconfiguration_v1530_IEs));
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for non critical extension IE in fillRrcReconfig");
+      return RFAILED;
+   }
+   if(fillRrcReconfigNonCriticalExt(ueCb, rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension, updateAllRbCfg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed to fill non critical extension in fillRrcReconfig");
+      return RFAILED;
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill RRC reconfiguration Octet string
+ *
+ * @details
+ *
+ *    Function : fillRrcReconfigBuf
+ *
+ *    Functionality: Fill RRC reconfiguration octet string
+ *
+ * @params[in] OCTET_STRING_t buffer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillRrcReconfigBuf(CuUeCb *ueCb, OCTET_STRING_t  *rrcReconfigBuf, bool updateAllRbCfg)
+{
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   RRCReconfiguration_t rrcRecfg, *rrcReconfig = NULLP;
+   rrcReconfig = &rrcRecfg;
+
+   while(true)
+   {
+      if(fillRrcReconfig(ueCb, rrcReconfig, updateAllRbCfg) != ROK)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill RRC Reconfiguration in fillRrcReconfigBuf");
+         break; 
+      }
+
+      /* Encode RRC Reconfiguration */
+      xer_fprint(stdout, &asn_DEF_RRCReconfiguration, rrcReconfig);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_RRCReconfiguration, 0, rrcReconfig, PrepFinalEncBuf, encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {     
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode RRC Reconfiguration (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }     
+      else  
+      {     
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRC Reconfiguration\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }     
+
+      rrcReconfigBuf->size = encBufSize;
+      CU_ALLOC(rrcReconfigBuf->buf, rrcReconfigBuf->size);
+      if(!rrcReconfigBuf->buf)
+      {     
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillRrcReconfigBuf");
+         break;
+      }     
+      memcpy(rrcReconfigBuf->buf, encBuf, rrcReconfigBuf->size);
+      ret = ROK;
+      break;
+   }
+
+   freeRrcReconfig(rrcReconfig);
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill HO preparation information Octet string
+ *
+ * @details
+ *
+ *    Function : fillHOPreparationInfoBuf
+ *
+ *    Functionality: Fill HO preparation information Octet string
+ *
+ * @params[in] HandoverPreparationInformation_t buffer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillHOPreparationInfoBuf(CuUeCb *ueCb, HandoverPreparationInformation_t *hoPrepInfoBuf)
+{
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   HandoverPreparationInformationRrc_t hoPrepInfo;
+   HandoverPreparationInformationRrc_IEs_t *hoPrepInfoIe;
+
+   while(true)
+   {
+   
+      hoPrepInfo.criticalExtensions.present = HandoverPreparationInformationRrc__criticalExtensions_PR_c1;
+      CU_ALLOC(hoPrepInfo.criticalExtensions.choice.c1, sizeof(struct HandoverPreparationInformationRrc__criticalExtensions__c1));
+      if(!hoPrepInfo.criticalExtensions.choice.c1)
       {
-         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillUeCapRatCont");
-         ret = RFAILED;
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocate memory for c1 in fillHOPreparationInfo");
          break;
       }
-
-      for(idx = 0; idx < elementCnt; idx++)
+      hoPrepInfo.criticalExtensions.choice.c1->present = \
+         HandoverPreparationInformationRrc__criticalExtensions__c1_PR_handoverPreparationInformation;
+      
+      CU_ALLOC(hoPrepInfo.criticalExtensions.choice.c1->choice.handoverPreparationInformation , \
+         sizeof(HandoverPreparationInformationRrc_IEs_t));
+      if(!hoPrepInfo.criticalExtensions.choice.c1->choice.handoverPreparationInformation)
       {
-         CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx], sizeof(struct BandNR));
-         if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx])
-         {
-            ret = RFAILED;
-            break;
-         }
-      }
-      if(ret == RFAILED)
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocate memory for handover preparation information IE in fillHOPreparationInfo");
          break;
-      
-      idx = 0;
-      ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx]->bandNR = 1;
-      ueNrCap.rf_Parameters.supportedBandCombinationList = NULLP;
-      ueNrCap.rf_Parameters.appliedFreqBandListFilter = NULLP;
-
-      ueNrCap.measAndMobParameters = NULLP;
-      ueNrCap.fdd_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.tdd_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.fr1_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.fr2_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.featureSets = NULLP;
-
-      CU_ALLOC(ueNrCap.featureSets, sizeof(struct FeatureSets));
-      if(!ueNrCap.featureSets)
+      }
+      hoPrepInfoIe = hoPrepInfo.criticalExtensions.choice.c1->choice.handoverPreparationInformation;
+   
+      /* Fill UE Capability RAT container list */
+      ret = fillUeCapRatContList(&hoPrepInfoIe->ue_CapabilityRAT_List);
+      if(ret != ROK)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapRatCont");
-        ret = RFAILED;
-        break;
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill UE Capability RAT container list");
+         break;
       }
 
-      if(fillFeatureSets(ueNrCap.featureSets) != ROK)
+      /* Fill Source config */
+      hoPrepInfoIe->sourceConfig = NULLP;
+      CU_ALLOC(hoPrepInfoIe->sourceConfig, sizeof(AS_Config_t));
+      if(!hoPrepInfoIe->sourceConfig)
       {
-         DU_LOG("\nERROR  -->  fillDLFeatureSets() failed ");
-         ret = RFAILED;
-         break;
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocate memory for source config in fillHOPreparationInfo");
+         return RFAILED;
       }
+      ret = fillRrcReconfigBuf(ueCb, &hoPrepInfoIe->sourceConfig->rrcReconfiguration, true); 
 
-      ueNrCap.featureSetCombinations = NULLP;
-      ueNrCap.lateNonCriticalExtension = NULLP;
-      ueNrCap.nonCriticalExtension = NULLP;
+      hoPrepInfoIe->rrm_Config = NULLP;
+      hoPrepInfoIe->as_Context = NULLP;
+      hoPrepInfoIe->nonCriticalExtension = NULLP;
 
       /* encode UE Capability RAT Container List into duToCuRrcContainer */
-      xer_fprint(stdout, &asn_DEF_UE_NR_Capability, &ueNrCap);
+      xer_fprint(stdout, &asn_DEF_HandoverPreparationInformationRrc, &hoPrepInfo);
       cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
-      encRetVal = aper_encode(&asn_DEF_UE_NR_Capability, 0, &ueNrCap, PrepFinalEncBuf, encBuf);
-   
+      encRetVal = aper_encode(&asn_DEF_HandoverPreparationInformationRrc, 0, \
+            &hoPrepInfo, PrepFinalEncBuf, encBuf);
+
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
          DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
-            encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
          break;
       }
       else
@@ -6428,108 +8646,19 @@ uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
          }
       }
 
-      ueCapRatContBuf->size = encBufSize;
-      CU_ALLOC(ueCapRatContBuf->buf, ueCapRatContBuf->size);
-      if(!ueCapRatContBuf->buf)
+      hoPrepInfoBuf->size = encBufSize;
+      CU_ALLOC(hoPrepInfoBuf->buf, hoPrepInfoBuf->size);
+      if(!hoPrepInfoBuf->buf)
       {
          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
          break;
       }
-      memcpy(ueCapRatContBuf->buf, encBuf, ueCapRatContBuf->size);
+      memcpy(hoPrepInfoBuf->buf, encBuf, hoPrepInfoBuf->size);
       ret = ROK;
       break;
    }
-   freeUeCapRatCont(&ueNrCap);
-   return ROK;
-}
-
-/*******************************************************************
- *
- * @brief Fill UE Capability RAT container list
- *
- * @details
- *
- *    Function : fillUeCapRatContList
- *
- *    Functionality: Fill UE Capability RAT container list
- *
- * @params[in] UE capability RAT container list buffer
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBuf)
-{
-    uint8_t          ret = RFAILED;
-    uint8_t          idx, elementCnt;
-    asn_enc_rval_t   encRetVal;
-    UE_CapabilityRAT_ContainerListRRC_t  ueCapablityList;
-
-    while(true)
-    {
-       elementCnt = 1;
-       ueCapablityList.list.count = elementCnt;
-       ueCapablityList.list.size = elementCnt * sizeof(UE_CapabilityRAT_Container_t *);
-
-       CU_ALLOC(ueCapablityList.list.array, ueCapablityList.list.size);
-       if(!ueCapablityList.list.array)
-       {
-          DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
-          ret = RFAILED;
-          break;
-       }
-
-       for(idx=0; idx<elementCnt; idx++)
-       {
-          CU_ALLOC(ueCapablityList.list.array[idx], sizeof(UE_CapabilityRAT_Container_t));
-          if(ueCapablityList.list.array[idx] == NULLP)
-          {
-             DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
-             ret = RFAILED;
-             break;
-          }
-       }
-       idx = 0;
-       ueCapablityList.list.array[idx]->rat_Type = RAT_Type_nr;
-       ret = fillUeCapRatCont(&ueCapablityList.list.array[idx]->ue_CapabilityRAT_Container);
-
-       /* encode UE Capability RAT Container List into duToCuRrcContainer */
-       xer_fprint(stdout, &asn_DEF_UE_CapabilityRAT_ContainerListRRC, &ueCapablityList);
-       cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
-       encBufSize = 0;
-       encRetVal = aper_encode(&asn_DEF_UE_CapabilityRAT_ContainerListRRC, 0, \
-             &ueCapablityList, PrepFinalEncBuf, encBuf);
-
-       /* Encode results */
-       if(encRetVal.encoded == ENCODE_FAIL)
-       {
-          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("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
-          for(int i=0; i< encBufSize; i++)
-          {
-             DU_LOG("%x",encBuf[i]);
-          }
-       }
-
-       ueCapablityListBuf->size = encBufSize;
-       CU_ALLOC(ueCapablityListBuf->buf, ueCapablityListBuf->size);
-       if(!ueCapablityListBuf->buf)
-       {
-          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
-          break;
-       }
-       memcpy(ueCapablityListBuf->buf, encBuf, ueCapablityListBuf->size);
-       ret = ROK;
-       break;
-    }
-    freeUeCapRatContList(&ueCapablityList);
-    return ROK;
+   freeHOPreparationInfo(&hoPrepInfo);
+   return ret;
 }
 
 /*******************************************************************
@@ -6549,52 +8678,75 @@ uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBu
  *
  ******************************************************************/
 
-uint8_t fillCuToDuContainer(CUtoDURRCInformation_t *rrcMsg)
+uint8_t fillCuToDuContainer(CuUeCb *ueCb, CUtoDURRCInformation_t *rrcMsg)
 {
    uint8_t elementCnt = 0;
    uint8_t ret = ROK;
    uint8_t idx, idx2, rrcBufLen;
 
+   /* UE Capabulity RAT Container List */
    CU_ALLOC(rrcMsg->uE_CapabilityRAT_ContainerList, sizeof(UE_CapabilityRAT_ContainerList_t));
    if(!rrcMsg->uE_CapabilityRAT_ContainerList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE capability RAT container list failed");
       return RFAILED;
    }
-   ret = fillUeCapRatContList(rrcMsg->uE_CapabilityRAT_ContainerList);
+   ret = fillUeCapRatContListBuf(rrcMsg->uE_CapabilityRAT_ContainerList);
 
-   CU_ALLOC(rrcMsg->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P16_t));
-   if(rrcMsg->iE_Extensions)
+   CU_ALLOC(rrcMsg->measConfig, sizeof(MeasConfig_t));
+   if(!rrcMsg->measConfig)
    {
-      elementCnt = 1;
-      rrcMsg->iE_Extensions->list.count = elementCnt;
-      rrcMsg->iE_Extensions->list.size = elementCnt * sizeof(CUtoDURRCInformation_ExtIEs_t);
-
-      /* Initialize the CUtoDURRCInformation_ExtIEs */
-      CU_ALLOC(rrcMsg->iE_Extensions->list.array, rrcMsg->iE_Extensions->list.size);
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for measurement configuration failed");
+      return RFAILED;
+   }
+   ret = fillMeasTimingConfigBuf(rrcMsg->measConfig);
 
-      if(rrcMsg->iE_Extensions->list.array == NULLP)
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+   {
+      /* IE extensions */
+      CU_ALLOC(rrcMsg->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P16_t));
+      if(rrcMsg->iE_Extensions)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
-         ret = RFAILED;
-      }
+         elementCnt = 2;
+         rrcMsg->iE_Extensions->list.count = elementCnt;
+         rrcMsg->iE_Extensions->list.size = elementCnt * sizeof(CUtoDURRCInformation_ExtIEs_t *);
 
-      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)
+         /* Initialize the CUtoDURRCInformation_ExtIEs */
+         CU_ALLOC(rrcMsg->iE_Extensions->list.array, rrcMsg->iE_Extensions->list.size);
+
+         if(rrcMsg->iE_Extensions->list.array == NULLP)
          {
-            DU_LOG("\nERROR  -->  F1AP : Memory allocation for array elements failed");
+            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)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation for array elements failed");
+               ret = RFAILED;
+            }
+         }
+
+         idx = 0;
+
+         /* Cell Group Configuration */
+         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;
+         ret = fillCellGrpCfg(ueCb, &rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig, true);
+
+         /* Handover Preparation Information */
+         idx++;
+         rrcMsg->iE_Extensions->list.array[idx]->id = ProtocolIE_ID_id_HandoverPreparationInformation; 
+         rrcMsg->iE_Extensions->list.array[idx]->criticality = Criticality_ignore;
+         rrcMsg->iE_Extensions->list.array[idx]->extensionValue.present  = \
+                                                                           CUtoDURRCInformation_ExtIEs__extensionValue_PR_HandoverPreparationInformation;
+         ret = fillHOPreparationInfoBuf(ueCb, &rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.HandoverPreparationInformation);
       }
-      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;
-      ret = fillCellGrpCfg(&rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig);
    }
    return ret;
 }
@@ -6682,18 +8834,17 @@ void FreeCuToDuInfo(CUtoDURRCInformation_t *rrcMsg)
  * ****************************************************************/
 uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcContLen, uint8_t *rrcContainer)
 {
-   uint8_t   Nrcgiret;
-   uint8_t   SplCellListret;
-   uint8_t   SrbSetupret;
+   uint8_t   Nrcgiret, SplCellListret, SrbSetupret;
+   uint8_t   ret= RFAILED, ret1;
    uint8_t   elementCnt;
-   uint8_t   idx, bufLen;
-   uint8_t   idx1;
+   uint8_t   idx, idx1, bufLen, duIdx;
+   uint32_t  spCellId;
+   DuDb      *targetDuDb = NULLP;
    F1AP_PDU_t          *f1apMsg = NULLP;
    UEContextSetupRequest_t *ueSetReq = NULLP;
    asn_enc_rval_t encRetVal;        /* Encoder return value */
    memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
-   uint8_t ret= RFAILED;
-   uint8_t ret1;
+
    while(true)
    {
       DU_LOG("\nINFO  -->  F1AP : Building UE Context Setup Request\n");
@@ -6719,7 +8870,10 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
 
       ueSetReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
 
-      elementCnt = 12;
+      if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+         elementCnt = 7;
+      else
+         elementCnt = 12;
       ueSetReq->protocolIEs.list.count = elementCnt;
       ueSetReq->protocolIEs.list.size = elementCnt * sizeof(UEContextSetupRequestIEs_t *);
 
@@ -6749,19 +8903,32 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_CU_UE_F1AP_ID;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId;
 
-      /*GNB DU UE F1AP ID*/
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
-      ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_DU_UE_F1AP_ID;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /*GNB DU UE F1AP ID*/
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id     = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+         ueSetReq->protocolIEs.list.array[idx]->criticality    =       Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_DU_UE_F1AP_ID;
+         ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;
+      }
 
       /*Special Cell ID*/
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SpCell_ID;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_NRCGI;
-      Nrcgiret = BuildNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI, ueCb->cellCb->nrCellId);
+      if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      {
+         /* Spec 38.473 Sec 9.2.2.1 : For handover case, this IE shall be considered as target cell. */
+         SEARCH_DU_DB(duIdx, ueCb->hoInfo.targetDuId, targetDuDb);
+         /* Since we are supporting only one cell per DU, accessing 0th index to
+          * get target cell info */
+         spCellId = targetDuDb->cellCb[0].nrCellId;
+      }
+      else
+         spCellId = ueCb->cellCb->nrCellId;
+      Nrcgiret = BuildNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI, spCellId);
       if(Nrcgiret != ROK)
       {
          break;
@@ -6774,32 +8941,38 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_ServCellIndex;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.ServCellIndex = CELL_INDEX;
 
-      /*CellULConfigured*/
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SpCellULConfigured;
-      ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CellULConfigured;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.CellULConfigured = CellULConfigured_none;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /*CellULConfigured*/
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id     = ProtocolIE_ID_id_SpCellULConfigured;
+         ueSetReq->protocolIEs.list.array[idx]->criticality    =       Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CellULConfigured;
+         ueSetReq->protocolIEs.list.array[idx]->value.choice.CellULConfigured = CellULConfigured_none;
+      }
 
       /*CUtoDURRCContainer*/
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_CUtoDURRCInformation;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CUtoDURRCInformation;
-      if(fillCuToDuContainer(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation))
+      if(fillCuToDuContainer(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation))
       {
          break;
       }
 
-      /*Special Cells to be SetupList*/
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SCell_ToBeSetup_List;
-      ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List;
-      SplCellListret = BuildSplCellList(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
-      if(SplCellListret != ROK)
-      {  
-         break;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /*Special Cells to be SetupList*/
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id     = ProtocolIE_ID_id_SCell_ToBeSetup_List;
+         ueSetReq->protocolIEs.list.array[idx]->criticality    =       Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List;
+         SplCellListret = BuildSplCellList(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
+         if(SplCellListret != ROK)
+         {  
+            break;
+         }
       }
 
       /*SRBs To Be Setup List*/
@@ -6807,7 +8980,7 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SRBs_ToBeSetup_List;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SRBs_ToBeSetup_List;
-      SrbSetupret = BuildSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
+      SrbSetupret = BuildSRBSetup(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
       if(SrbSetupret != ROK)
       {        
          break;
@@ -6818,38 +8991,42 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_DRBs_ToBeSetup_List;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_DRBs_ToBeSetup_List;
-      ret1 = BuildDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
+      ret1 = BuildDRBSetup(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
       if(ret1 != ROK)
       {        
          break;
       }
-      /* RRC Container for security mode */
-      idx++;
-      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;
-
-      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);
-      if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf)
-      {
-         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);
 
-      /* RRC delivery status request */
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCDeliveryStatusRequest;
-      ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = RRCDeliveryStatusRequest_true;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /* RRC Container for security mode */
+         idx++;
+         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;
+
+         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);
+         if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf)
+         {
+            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);
+
+         /* RRC delivery status request */
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCDeliveryStatusRequest;
+         ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest;
+         ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = RRCDeliveryStatusRequest_true;
+      }
 
-      /* Bit Rate hardcoded as in reference logs */
+      /* GNB-DU UE Aggregate Maximum Bit Rate hardcoded as in reference logs */
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL;
       ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
@@ -7067,7 +9244,17 @@ uint8_t procUeContextSetupResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
                 /* Adding Tunnels for successful DRB */
                 procDrbSetupList(&ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.DRBs_Setup_List);
                 break; 
-
+             }
+         case ProtocolIE_ID_id_DUtoCURRCInformation:
+             {
+                DU_LOG("\nINFO  -->  Received Du to Cu RRC Information ");
+                if((extractDuToCuRrcCont(ueCb, ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.\
+                   DUtoCURRCInformation.cellGroupConfig)) != ROK)
+                {
+                   DU_LOG("\nERROR  -->  F1AP: Failed to extract Du to Cu RRC Information ");
+                   return RFAILED;
+                }
+                break;
              }
       }
    }
@@ -7176,7 +9363,7 @@ uint8_t procUlRrcMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
          if(rrcMsgType == UE_CONTEXT_MOD_REQ)
          {
             DU_LOG("\nINFO  -->  F1AP: Sending UE Context Modification Request");
-            BuildAndSendUeContextModificationReq(duId, ueCb, MODIFY_UE);
+            BuildAndSendUeContextModificationReq(duId, ueCb, RRC_RECONFIG_COMPLETE_IND);
          }
       }
    }
@@ -7429,7 +9616,7 @@ uint8_t deleteEgtpTunnel(uint8_t *buf)
 *         RFAILED - failure
 *
 * ****************************************************************/
-uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, uint8_t actionType)
+uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, TnlInfo *ulTnlInfo, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, uint8_t actionType)
 {
    uint8_t arrIdx;
    uint8_t ulCnt;
@@ -7487,6 +9674,11 @@ uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, ULUPTNLInformatio
       transportLayerAddress.buf[3] = 82;
    ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
       transportLayerAddress.bits_unused = 0;
+
+   ulTnlInfo->address[0] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0];
+   ulTnlInfo->address[1] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1];
+   ulTnlInfo->address[2] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2];
+   ulTnlInfo->address[3] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3];
    
    /*GTP TEID*/
    ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size\
@@ -7520,6 +9712,11 @@ uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, ULUPTNLInformatio
       ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
         gTP_TEID.buf[3] = cuCb.cuCfgParams.egtpParams.currTunnelId++;
    }
+
+   ulTnlInfo->teId[0] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[0];
+   ulTnlInfo->teId[1] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[1];
+   ulTnlInfo->teId[2] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[2];
+   ulTnlInfo->teId[3] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3];
    return ROK;
 }/*End of BuildULTnlInfo*/
 
@@ -7624,12 +9821,13 @@ void FreeDrbItem(DRBs_ToBeSetupMod_Item_t *drbItem)
 *
 * ****************************************************************/
 
-uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_Item_t *drbItem)
+uint8_t FillDrbItemToSetupMod(CuUeCb *ueCb, uint8_t arrIdx, DRBs_ToBeSetupMod_Item_t *drbItem)
 {
    uint8_t ret = ROK;
 
    /*Drb Id */
    drbItem->dRBID = arrIdx + DRB_ID_TO_ADD_MOD;
+   ueCb->drbList[ueCb->numDrb].drbId = drbItem->dRBID;
    
    /*qoSInformation*/
    drbItem->qoSInformation.present = QoSInformation_PR_choice_extension;
@@ -7673,8 +9871,8 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
         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,\
-           ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item, PDU_SESSION_ID_2);
+        ret =  BuildQOSInfo(&ueCb->drbList[ueCb->numDrb].qos, &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS,\
+           ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item, PDU_SESSION_ID_2, FALSE);
         if(ret != ROK)
         {
            DU_LOG("\nERROR  -->  F1AP : BuildQOSInfo failed");
@@ -7682,8 +9880,8 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
         }
         
         /*SNSSAI*/
-        ret = BuildSNSSAI(&drbItem->qoSInformation.choice.\
-              choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[1]);
+        ret = BuildSNSSAI(&ueCb->drbList[ueCb->numDrb], &drbItem->qoSInformation.choice.\
+              choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[1], FALSE);
         if(ret != ROK)
         {
            DU_LOG("\nERROR  -->  F1AP : BuildSNSSAI failed");
@@ -7691,9 +9889,9 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
         }
         
         /*Flows mapped to DRB List*/
-         ret = BuildFlowsMap(&drbItem->qoSInformation.choice.\
+         ret = BuildFlowsMap(&ueCb->drbList[ueCb->numDrb], &drbItem->qoSInformation.choice.\
               choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List,\ 
-          ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item);
+          ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item, FALSE);
         if(ret != ROK)
         {
            DU_LOG("\nERROR  -->  F1AP : BuildFlowsMap failed");
@@ -7703,8 +9901,8 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
    }
    
    /*ULUPTNLInformation To Be Setup List*/
-   ret = BuildUlTnlInfoforSetupMod(ueId, drbItem->dRBID, &drbItem->uLUPTNLInformation_ToBeSetup_List, \
-      ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item);
+   ret = BuildUlTnlInfoforSetupMod(ueCb->gnbCuUeF1apId, drbItem->dRBID, &ueCb->drbList[ueCb->numDrb].ulUpTnlInfo, \
+      &drbItem->uLUPTNLInformation_ToBeSetup_List, ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item);
    if(ret != ROK)
    {
       DU_LOG("\nERROR  -->  F1AP : BuildUlTnlInfoforSetupMod failed");
@@ -7713,6 +9911,9 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
 
    /*RLCMode*/
    drbItem->rLCMode = RLCMode_rlc_um_bidirectional;
+   ueCb->drbList[ueCb->numDrb].rlcMode = drbItem->rLCMode;
+
+   ueCb->numDrb++;
    return ROK;
 }
 
@@ -7733,13 +9934,13 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
 *
 * ****************************************************************/
 
-uint8_t FillDrbItemList(uint8_t ueId, uint8_t arrIdx, struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe)
+uint8_t FillDrbItemList(CuUeCb *ueCb, uint8_t arrIdx, 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(FillDrbItemToSetupMod(ueId, arrIdx, (&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item))) != ROK)
+   if(FillDrbItemToSetupMod(ueCb, arrIdx, (&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item))) != ROK)
    {
       DU_LOG("\nERROR  -->  F1AP : FillDrbItemToSetupMod failed"); 
       return RFAILED;
@@ -7803,7 +10004,7 @@ void FreeDrbToBeSetupModList(DRBs_ToBeSetupMod_List_t *drbSet)
 *
 * ****************************************************************/
 
-uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet)
+uint8_t BuildDrbToBeSetupList(CuUeCb *ueCb, DRBs_ToBeSetupMod_List_t *drbSet)
 {
    uint8_t ret = ROK;
    uint8_t arrIdx =0;
@@ -7828,7 +10029,7 @@ uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet)
          return  RFAILED;
       }
 
-      ret = FillDrbItemList(ueId, arrIdx, (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx]);
+      ret = FillDrbItemList(ueCb, arrIdx, (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx]);
       if(ret != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : FillDrbItemList failed");
@@ -7855,13 +10056,25 @@ uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet)
 *
 * ****************************************************************/
 
-uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_t *drbItem)
+uint8_t FillDrbToBeModItem(CuUeCb *ueCb, uint8_t arrIdx, DRBs_ToBeModified_Item_t *drbItem)
 {
    uint8_t ret = ROK;
+   uint drbIdx=0;
+   DrbInfo *drbToBeMod;
 
    /*Drb Id */
    drbItem->dRBID = DRB2 + arrIdx;
 
+   /* Search for DRB ID in CU databse */
+   for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
+   {
+      if(ueCb->drbList[drbIdx].drbId == drbItem->dRBID)
+      {
+         drbToBeMod = &ueCb->drbList[drbIdx];
+         break;
+      }
+   }
+
    /*qoSInformation*/
    drbItem->qoSInformation = NULLP;
    CU_ALLOC(drbItem->qoSInformation, sizeof(QoSInformation_t));
@@ -7908,8 +10121,8 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
                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,\
-                     ProtocolIE_ID_id_DRBs_ToBeModified_Item, INVALID_PDU_SESSION_ID);
+               ret =  BuildQOSInfo(&drbToBeMod->qos, &drbItem->qoSInformation->choice.choice_extension->value.choice.DRB_Information.dRB_QoS,\
+                     ProtocolIE_ID_id_DRBs_ToBeModified_Item, INVALID_PDU_SESSION_ID, FALSE);
                if(ret != ROK)
                {
                   DU_LOG("\nERROR  -->  F1AP : BuildQOSInfo failed");
@@ -7917,8 +10130,8 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
                }
 
                /*SNSSAI*/
-               ret = BuildSNSSAI(&drbItem->qoSInformation->choice.\
-                     choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0]);
+               ret = BuildSNSSAI(drbToBeMod, &drbItem->qoSInformation->choice.\
+                     choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0], FALSE);
                if(ret != ROK)
                {
                   DU_LOG("\nERROR  -->  F1AP : BuildSNSSAI failed");
@@ -7926,9 +10139,9 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
                }
 
                /*Flows mapped to DRB List*/
-               ret = BuildFlowsMap(&drbItem->qoSInformation->choice.\
+               ret = BuildFlowsMap(drbToBeMod, &drbItem->qoSInformation->choice.\
                      choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List,\
-                     ProtocolIE_ID_id_DRBs_ToBeModified_Item);
+                     ProtocolIE_ID_id_DRBs_ToBeModified_Item, FALSE);
                if(ret != ROK)
                {
                   DU_LOG("\nERROR  -->  F1AP : BuildFlowsMap failed");
@@ -7939,7 +10152,7 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
    }/* End of QoS */
 
    /*ULUPTNLInformation To Be Setup List*/
-   ret = BuildUlTnlInfoforSetupMod(ueId, drbItem->dRBID, &drbItem->uLUPTNLInformation_ToBeSetup_List,\
+   ret = BuildUlTnlInfoforSetupMod(ueCb->gnbCuUeF1apId, drbItem->dRBID, &drbToBeMod->ulUpTnlInfo, &drbItem->uLUPTNLInformation_ToBeSetup_List,\
             ProtocolIE_ID_id_DRBs_ToBeModified_Item);
    if(ret != ROK)
    {
@@ -7966,12 +10179,12 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
 *
 * ****************************************************************/
 
-uint8_t FillDrbToBeModItemList(uint8_t ueId, uint8_t arrIdx, struct DRBs_ToBeModified_ItemIEs *drbItemIe)
+uint8_t FillDrbToBeModItemList(CuUeCb *ueCb, uint8_t arrIdx, struct DRBs_ToBeModified_ItemIEs *drbItemIe)
 {
    drbItemIe->id = ProtocolIE_ID_id_DRBs_ToBeModified_Item;
    drbItemIe->criticality = Criticality_reject;
    drbItemIe->value.present = DRBs_ToBeModified_ItemIEs__value_PR_DRBs_ToBeModified_Item;
-   if(FillDrbToBeModItem(ueId, arrIdx, &(drbItemIe->value.choice.DRBs_ToBeModified_Item)) != ROK)
+   if(FillDrbToBeModItem(ueCb, arrIdx, &(drbItemIe->value.choice.DRBs_ToBeModified_Item)) != ROK)
    {
       DU_LOG("\nERROR  -->  F1AP : FillDrbToBeModItem failed"); 
       return RFAILED;
@@ -7997,7 +10210,7 @@ uint8_t FillDrbToBeModItemList(uint8_t ueId, uint8_t arrIdx, struct DRBs_ToBeMod
 *
 * ****************************************************************/
 
-uint8_t BuildDrbToBeModifiedList(uint8_t ueId, DRBs_ToBeModified_List_t *drbSet)
+uint8_t BuildDrbToBeModifiedList(CuUeCb *ueCb, DRBs_ToBeModified_List_t *drbSet)
 {
    uint8_t ret = ROK;
    uint8_t arrIdx =0;
@@ -8021,7 +10234,7 @@ uint8_t BuildDrbToBeModifiedList(uint8_t ueId, DRBs_ToBeModified_List_t *drbSet)
          return  RFAILED;
       }
 
-      ret = FillDrbToBeModItemList(ueId, arrIdx, (DRBs_ToBeModified_ItemIEs_t *)drbSet->list.array[arrIdx]);
+      ret = FillDrbToBeModItemList(ueCb, arrIdx, (DRBs_ToBeModified_ItemIEs_t *)drbSet->list.array[arrIdx]);
       if(ret != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : FillDrbToBeModItemList failed");
@@ -8271,6 +10484,8 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
          elementCnt = 4;
       else if(action == QUERY_CONFIG)
          elementCnt = 3;
+      else if(action == RRC_RECONFIG_COMPLETE_IND)
+         elementCnt = 3;
       ueContextModifyReq->protocolIEs.list.count = elementCnt;
       ueContextModifyReq->protocolIEs.list.size = elementCnt*sizeof(UEContextModificationRequest_t *);
 
@@ -8314,7 +10529,7 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present =\
                                                                            UEContextModificationRequestIEs__value_PR_DRBs_ToBeSetupMod_List;
-         ret = BuildDrbToBeSetupList(ueCb->gnbCuUeF1apId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
+         ret = BuildDrbToBeSetupList(ueCb, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
                   value.choice.DRBs_ToBeSetupMod_List));
 
          /* DRB to be modified list */
@@ -8323,7 +10538,7 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present =\
                                                                            UEContextModificationRequestIEs__value_PR_DRBs_ToBeModified_List;
-         ret = BuildDrbToBeModifiedList(ueCb->gnbCuUeF1apId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
+         ret = BuildDrbToBeModifiedList(ueCb, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
                   value.choice.DRBs_ToBeModified_List));
 
          /* TODO: DRB to be release list */
@@ -8342,6 +10557,16 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
             UEContextModificationRequestIEs__value_PR_GNB_DUConfigurationQuery;
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DUConfigurationQuery = GNB_DUConfigurationQuery_true;
       }
+      else if(action == RRC_RECONFIG_COMPLETE_IND)
+      {
+         ieIdx++;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_RRCReconfigurationCompleteIndicator;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = \
+            UEContextModificationRequestIEs__value_PR_RRCReconfigurationCompleteIndicator;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.RRCReconfigurationCompleteIndicator = \
+            RRCReconfigurationCompleteIndicator_true;
+      }
 
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
@@ -8769,6 +10994,49 @@ uint8_t buildSliceList(SliceSupportList_t *sliceSupportList)
    return ROK;
 }
 
+/****************************************************************
+ * @brief Function to process Srb Setup Mod List 
+ *
+ * @details
+ *
+ *    Function : procSrbSetupModList
+ *    
+ *    Functionality:
+ *         - Function to process SRB Setup Mod List
+ *
+ * @params[in]
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t procSrbSetupModList(CuUeCb *ueCb, SRBs_SetupMod_List_t *srbSetupList)
+{
+   uint8_t arrIdx = 0, srbIdx;
+   struct SRBs_SetupMod_ItemIEs *srbItemIe = NULLP;
+
+   if(srbSetupList != NULLP)
+   {
+      for(arrIdx = 0; arrIdx < srbSetupList->list.count; arrIdx++)
+      {     
+         srbItemIe = ((struct SRBs_SetupMod_ItemIEs *)srbSetupList->list.array[arrIdx]);
+         if(srbItemIe->value.present == SRBs_SetupMod_ItemIEs__value_PR_SRBs_SetupMod_Item)
+         {
+            for(srbIdx = 0; srbIdx < ueCb->numSrb; srbIdx++)
+            {
+               if(ueCb->srbList[srbIdx].srbId == srbItemIe->value.choice.SRBs_SetupMod_Item.sRBID)
+               {
+                  ueCb->srbList[srbIdx].lcId = srbItemIe->value.choice.SRBs_SetupMod_Item.lCID;
+                  break;
+               }
+            }
+         }
+        
+      }
+   }
+   return ROK;
+}
+
+
 /****************************************************************
  * @brief Function to process Drb Setup Mod List 
  *
@@ -8784,9 +11052,9 @@ uint8_t buildSliceList(SliceSupportList_t *sliceSupportList)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t procDrbSetupModList(DRBs_SetupMod_List_t *drbSetupList)
+uint8_t procDrbSetupModList(CuUeCb *ueCb, DRBs_SetupMod_List_t *drbSetupList)
 {
-   uint8_t arrIdx = 0;
+   uint8_t arrIdx = 0, drbIdx;
    uint32_t teId = 0;
    struct DRBs_SetupMod_ItemIEs *drbItemIe = NULLP;
 
@@ -8797,6 +11065,18 @@ uint8_t procDrbSetupModList(DRBs_SetupMod_List_t *drbSetupList)
          drbItemIe = ((struct DRBs_SetupMod_ItemIEs *)drbSetupList->list.array[arrIdx]);
          if(drbItemIe->value.present == DRBs_SetupMod_ItemIEs__value_PR_DRBs_SetupMod_Item)
          {
+            for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
+            {
+               if(ueCb->drbList[drbIdx].drbId == drbItemIe->value.choice.DRBs_SetupMod_Item.dRBID)
+               {
+                  if(drbItemIe->value.choice.DRBs_SetupMod_Item.lCID)
+                     ueCb->drbList[drbIdx].lcId = *(drbItemIe->value.choice.DRBs_SetupMod_Item.lCID);
+                  break;
+               }
+            }
+
+            if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+            {
             /* extracting teId */
             teId  = extractTeId(&drbItemIe->value.choice.DRBs_SetupMod_Item.dLUPTNLInformation_ToBeSetup_List);
             if(teId > 0)
@@ -8808,6 +11088,7 @@ uint8_t procDrbSetupModList(DRBs_SetupMod_List_t *drbSetupList)
             }
             else
                return RFAILED;
+            }
          }
       }
    }
@@ -8906,23 +11187,39 @@ uint8_t procUeContextModificationResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
              {
                 duUeF1apId = ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
                 ueCb = &duDb->ueCb[duUeF1apId-1];
-                if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
-                {
-                   /* TODO : Next procedure i.e. UE context setup request to
-                    * target DU should be triggerred here */
-                   return ROK;
-                }
                 break;
              }
           case ProtocolIE_ID_id_DRBs_SetupMod_List:
              {
                 /* Adding Tunnels for successful DRB */
-                procDrbSetupModList(&ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.DRBs_SetupMod_List);
+                procDrbSetupModList(ueCb, &ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.DRBs_SetupMod_List);
                 break; 
 
              }
+          case ProtocolIE_ID_id_SRBs_SetupMod_List:
+             {
+                procSrbSetupModList(ueCb, &ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.SRBs_SetupMod_List);
+                break;
+             }
+         case ProtocolIE_ID_id_DUtoCURRCInformation:
+             {
+                DU_LOG("\nINFO  -->  Received Du to Cu RRC Information ");
+                if((extractDuToCuRrcCont(ueCb, ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.\
+                   DUtoCURRCInformation.cellGroupConfig)) != ROK)
+                {
+                   DU_LOG("\nERROR  -->  F1AP : Failed to extract Du to Cu RRC Information");
+                   return RFAILED;
+                }
+                break;
+             }
+
       }
    }
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+   {
+      BuildAndSendUeContextSetupReq(ueCb->hoInfo.targetDuId, ueCb, 0, NULLP);
+      return ROK;
+   }
    
    return ROK;
 }
index b9f9b41..fd923c2 100644 (file)
 #define CU_TO_DU_RRC_INF 4
 #define NUM_QOS_EXT 1
 
+/* MACRO for CUtoDURRCInformation */
+#define CELL_GRP_ID 1
+#define FREQ_DOM_RSRC_SIZE 6
+#define CORESET0_END_PRB   48
+#define CORESET1_NUM_PRB   24
+#define PDCCH_CTRL_RSRC_SET_ONE_ID  1
+#define PDCCH_CTRL_RSRC_SET_ONE_DURATION 2  /* Duration for control resource set id i */
+#define PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY 1   /* Precoded granularity */
+#define PDCCH_SRCH_SPC_TWO_ID 2
+#define NR_PCI 1
+#define SCRAMBLING_ID  NR_PCI
+#define DMRS_ADDITIONAL_POS  0          /* DMRS Additional poistion */
+#define PDCCH_SYMBOL_WITHIN_SLOT 128     /* Symbol within Slot Value */
+#define PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE 7   /* Num of candidate at aggregation level 1 */
+#define PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE 7   /* Num of candidate at aggregation level 2 */
+#define PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE 4   /* Num of candidate at aggregation level 4 */
+#define PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE 2   /* Num of candidate at aggregation level 8 */
+#define PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE 1  /* Num of candidate at aggregation level 16 */
+#define PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT  0  /* format 0-0 and 1-0 */
+#define PDCCH_SERACH_SPACE_DCI_FORMAT 0
+
+/* MACRO Ddefine for PDSCH Configuration */
+#define PDSCH_K0  0
+#define PDSCH_RES_ALLOC_TYPE       1          /* Resource allocation type */
+#define PDSCH_MAX_CODEWORD_SCH_BY_DCI 0       /* Max num of codewords scheduled by DCI */
+#define PDSCH_RBG_SIZE   0                    /* 0: config1 */
+#define PDSCH_NUM_HARQ_PROC 5
+#define PDSCH_MAPPING_TYPE_A 0
+#define PDSCH_MAPPING_TYPE_B 1
+
+/* MACRO Define for PUSCH Configuration */
+#define PUSCH_K2_CFG1  1
+#define PUSCH_K2_CFG2  2
+#define PUSCH_START_SYMBOL 3
+
+#define PUSCH_MSG3_DELTA_PREAMBLE 0
+#define PUSCH_P0_NOMINAL_WITH_GRANT -70
+#define PUSCH_TRANSFORM_PRECODER    1      /* 1: Disabled */
+#define PUSCH_MAX_MIMO_LAYERS       1
+#define PUSCH_PROCESS_TYPE2_ENABLED false
+#define PUSCH_MAPPING_TYPE_A        0
+#define PUSCH_MAPPING_TYPE_B        1
+
+/* MACRO defines for SRC config */
+#define SRS_RSRC_ID  1
+#define SRS_RSET_ID  1
+#define SRS_COMB_OFFSET_N2   0
+#define SRS_CYCLIC_SHIFT_N2  0
+#define SRS_FREQ_DOM_POS     0
+#define SRS_FREQ_DOM_SHIFT   0
+#define C_SRS 0
+#define B_SRS 0
+#define B_HOP 0
+#define SRS_SEQ_ID 0
+#define APERIODIC_SRS_RESRC_TRIGGER 1 
+
+/* Macro definitions for DUtoCuRrcContainer */
+#define CELL_GRP_ID 1
+#define SCH_REQ_ID  0
+#define SR_PROHIBIT_TMR 5
+#define SR_TRANS_MAX 2
+#define PERIODIC_BSR_TMR 2
+#define RETX_BSR_TMR     5
+#define SR_DELAY_TMR     6
+#define TAG_ID 0
+#define TIME_ALIGNMENT_TMR 7
+#define PHR_PERIODIC_TMR 7
+#define PHR_PROHIBHIT_TMR 0
+#define PHR_PWR_FACTOR_CHANGE 3
+#define PHR_MODE_OTHER_CG 0
+#define RLC_LCID 1 
+#define SRB_ID_1 1
+#define SN_FIELD_LEN 0
+#define T_POLL_RETRANSMIT 8 
+#define POLL_PDU 0
+#define POLL_BYTE 43
+#define MAX_RETX_THRESHOLD 5
+#define T_REASSEMBLY 8
+#define T_STATUS_PROHIBHIT 7
+#define MAC_LC_PRIORITY 1
+#define PRIORTISIED_BIT_RATE 15
+#define BUCKET_SIZE_DURATION 5
+#define LC_GRP 0
+#define P_NR_FR1 0
+#define PDSCH_HARQ_ACK_CODEBOOK 1
+#define SERV_CELL_IDX 0
+#define RLM_SYNC_OUT_SYNC_THRESHOLD 0
+#define ACTIVE_DL_BWP_ID 0
+#define ACTIVE_UL_BWP_ID 0
+#define SCRAMBLING_ID  NR_PCI
+#define DMRS_ADDITIONAL_POS  0          /* DMRS Additional poistion */
+#define RES_ALLOC_TYPE       1          /* Resource allocation type */
+#define FIVE_QI_VALUE9 9  /*spec 23.501, Table 5.7.4-1*/
+#define FIVE_QI_VALUE8 8  /*spec 23.501, Table 5.7.4-1*/
+#define PDU_SESSION_ID_1 1
+#define PDU_SESSION_ID_2 2
+#define INVALID_PDU_SESSION_ID -1
+
 typedef enum
 {
    RRC_SETUP=1,
@@ -64,8 +162,9 @@ typedef enum
 /* Defines action to be performed via UE Context Modification request */
 typedef enum
 {
-   MODIFY_UE,         /* Modify UE configuration at DU */
-   QUERY_CONFIG,      /* Query DU for its configurations */
+   MODIFY_UE,        /* Modify UE configuration at DU */
+   RRC_RECONFIG_COMPLETE_IND, /* Indicate to DU that RRC Reconfiguration is complete */
+   QUERY_CONFIG,     /* Query DU for its configurations */
    STOP_DATA_TX      /* Stop data transmission from DU to a particular UE */
 }UeCtxtModAction;
 
@@ -79,6 +178,7 @@ void F1APMsgHdlr(uint32_t *destDuId, Buffer *mBuf);
 uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *ueCb, UeCtxtModAction action);
 uint8_t BuildAndSendUeContextReleaseCommand(uint32_t duId, uint8_t cuUeF1apId, uint8_t duUeF1apId);
 uint8_t BuildAndSendF1ResetReq();
+
 /**********************************************************************
          End of file
 **********************************************************************/
index 7a62215..31515a4 100644 (file)
@@ -237,7 +237,11 @@ void initiateInterDuHandover(uint32_t sourceDuId, uint32_t targetDuId, uint32_t
     if(duDb)
        ueCb = &duDb->ueCb[ueId-1];
     if(ueCb)
+    {
        ueCb->state = UE_HANDOVER_IN_PROGRESS;
+       ueCb->hoInfo.sourceDuId = sourceDuId;
+       ueCb->hoInfo.targetDuId = targetDuId;
+    }
 
     DU_LOG("\nINFO  --> CU_STUB: Inter-DU Handover Started for ueId [%d] from DU ID [%d] to DU ID [%d]", \
           ueId, sourceDuId, targetDuId);
index fb26740..826038a 100644 (file)
@@ -50,6 +50,7 @@
 #define CU_POOL 1
 
 #define MAX_NUM_OF_SLICE 1024 /* As per the spec 38.473, maxnoofSliceItems = 1024*/
+#define MAX_QOS_FLOWS 64 /* As per the spec 38.331, maxNrofQFIs = 64 */
 
 /* allocate and zero out a static buffer */
 
@@ -119,6 +120,130 @@ typedef struct cuCfgParams
    RrcVersion       rrcVersion;
 }CuCfgParams;
 
+typedef struct handoverInfo
+{
+   uint32_t sourceDuId;
+   uint32_t targetDuId;
+}HandoverInfo;
+
+typedef struct dlAmCfg
+{
+   uint8_t        snLenDl;              /* Sequence Number length in bits. Allowed values are 12 and 18 */
+   int8_t         reAssemTmr;           /* T_reassembling Timer in msec*/
+   int16_t        statProhTmr;          /* T_status_prohibit Timer in msec*/
+}DlAmCfg;
+
+typedef struct ulAmCfg
+{
+   uint8_t      snLenUl;             /* Sequence Number length in bits. Allowed values are 12 and 18 */
+   uint16_t     pollRetxTmr;         /* T_poll_retransmit Timer in msec */
+   int16_t      pollPdu;             /* Used to trigger a poll for every pollPdu.*/
+   int32_t      pollByte;            /* Poll_Byte in bytes. */
+   uint8_t      maxRetxTh;           /* Max_Retx_Threshold */
+}UlAmCfg;
+
+typedef struct amBearerCfg
+{
+   UlAmCfg  ulAmCfg;
+   DlAmCfg  dlAmCfg;
+}AmBearerCfg;
+
+typedef struct ulUmCfg
+{
+   uint8_t        snLenUlUm;             /* Sequence Number length in bits. Allowed values are 6 and 12 */
+}UlUmCfg;
+
+typedef struct dlUmCfg
+{
+   uint8_t        snLenDlUm;             /* Sequence Number length in bits. Allowed values are 6 and 12 */
+   int8_t         reAssemTmr;            /* T_reassembling Timer in msec*/
+}DlUmCfg;
+
+typedef struct umBiDirBearerCfg
+{
+   UlUmCfg  ulUmCfg;
+   DlUmCfg  dlUmCfg;
+}UmBiDirBearerCfg;
+
+typedef struct umUniDirUlBearerCfg
+{
+   UlUmCfg  ulUmCfg;
+}UmUniDirUlBearerCfg;
+
+typedef struct umUniDirDlBearerCfg
+{
+   DlUmCfg  dlUmCfg;
+}UmUniDirDlBearerCfg;
+
+typedef struct rlcLcCfg
+{
+   uint8_t rlcMode;
+   union
+   {   
+      AmBearerCfg         amCfg;
+      UmBiDirBearerCfg    umBiDirCfg;
+      UmUniDirUlBearerCfg umUniDirUlCfg;
+      UmUniDirDlBearerCfg umUniDirDlCfg;
+   }u; 
+}RlcLcCfg;
+
+typedef struct macLcCfg
+{
+   uint8_t priority;
+   uint8_t lcGroup;
+   uint8_t schReqId;
+   uint8_t pbr;        // prioritisedBitRate
+   uint8_t bsd;        // bucketSizeDuration
+}MacLcCfg;
+
+typedef struct srbInfo
+{
+   uint8_t   srbId;
+   uint8_t   lcId;
+   RlcLcCfg  rlcLcCfg;
+   MacLcCfg  macLcCfg;
+   bool      cfgSentToUe;
+}SrbInfo;
+
+typedef struct qosInfo
+{
+   uint8_t nonDynFiveQI;
+   uint16_t avgWindow;
+   uint16_t maxBurstDataVol;
+   uint8_t priorityLevel;
+   uint8_t preemptionCapability;
+   uint8_t preemptionVulnerability;
+   uint8_t pduSessionId;
+}QosInfo;
+
+typedef struct flowsMapped
+{
+   uint8_t qosFlowId;
+   QosInfo qos;
+}FlowsMapped;
+
+typedef struct TnlInfo
+{
+   uint8_t address[4];
+   uint8_t teId[4];
+}TnlInfo;
+
+typedef struct drbInfo
+{
+   uint8_t drbId;
+   uint8_t lcId;
+   QosInfo qos;
+   Snssai *snssai;
+   uint8_t numFlowMap;
+   FlowsMapped flowMapList[MAX_QOS_FLOWS];
+   TnlInfo ulUpTnlInfo;
+   TnlInfo dlUpTnlInfo;
+   uint8_t rlcMode;
+   RlcLcCfg  rlcLcCfg;
+   MacLcCfg  macLcCfg;
+   bool      cfgSentToUe;
+}DrbInfo;
+
 typedef struct cuCellCb CuCellCb;
 
 typedef struct cuUeCb
@@ -127,8 +252,13 @@ typedef struct cuUeCb
    uint32_t  crnti;
    uint8_t   gnbDuUeF1apId;
    uint8_t   gnbCuUeF1apId;
+   uint8_t   numSrb;
+   SrbInfo   srbList[MAX_NUM_SRB];
+   uint8_t   numDrb;
+   DrbInfo   drbList[MAX_NUM_DRB];
    F1apMsgDb f1apMsgDb;
    UeState   state;
+   HandoverInfo hoInfo;
 }CuUeCb;
 
 struct cuCellCb
index 32e8e79..635cda7 100644 (file)
@@ -140,6 +140,7 @@ void duProcF1SetupRsp()
 uint8_t duGetCellCb(uint16_t cellId, DuCellCb **cellCb)
 {
    uint8_t cellIdx = 0;
+
    for(cellIdx=0; cellIdx < MAX_NUM_CELL; cellIdx++)
    {
       if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->cellId == cellId))
index e54336e..d991cba 100644 (file)
@@ -315,7 +315,7 @@ uint8_t readMacCfg()
    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
       candidate.aggLevel16     = 0;
 
-   duCfgParam.macCellCfg.initialDlBwp.pdschCommon.numTimeDomAlloc = 2;
+   duCfgParam.macCellCfg.initialDlBwp.pdschCommon.numTimeDomAlloc = NUM_TIME_DOM_RSRC_ALLOC;
    idx = 0;
    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].k0 = PDSCH_K0_CFG1;
    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].mappingType = 
index 318678c..709deeb 100644 (file)
 #define SIB1_VALUE_TAG 10
 
 /* MACRO Ddefine for PDSCH Configuration */
+#define NUM_TIME_DOM_RSRC_ALLOC 2
 #define PDSCH_K0_CFG1  0
 #define PDSCH_K0_CFG2  1
 #define PDSCH_START_SYMBOL  3
index 518094c..cb2b9df 100644 (file)
@@ -1047,6 +1047,104 @@ PUCCH_Resource__format_PR covertPucchFormatIntEnumToRrcEnum(uint8_t pucchFormat)
    return PUCCH_Resource__format_PR_NOTHING;
 }
 
+/************************************************************************
+ *
+ * @brief Converts BSR Periodic timer value to its ASN enum value
+ *
+ * @details
+ *
+ *    Function : convertBsrPeriodicTmrValueToEnum
+ *
+ *    Functionality: Converts BSR Periodic timer timer value to its ASN enum value
+ *
+ * @params[in] BSR Periodic timer value
+ * @return BSR Periodic timer ASN enum
+ *
+ * **********************************************************************/
+long convertBsrPeriodicTmrValueToEnum(int16_t periodicTmr)
+{
+   switch(periodicTmr)
+   {
+      case 1:
+         return BSR_Config__periodicBSR_Timer_sf1;
+      case 5:
+         return BSR_Config__periodicBSR_Timer_sf5;
+      case 10:
+         return BSR_Config__periodicBSR_Timer_sf10;
+      case 16:
+         return BSR_Config__periodicBSR_Timer_sf16;
+      case 20:
+         return BSR_Config__periodicBSR_Timer_sf20;
+      case 32:
+         return BSR_Config__periodicBSR_Timer_sf32;
+      case 40:
+         return BSR_Config__periodicBSR_Timer_sf40;
+      case 64:
+         return BSR_Config__periodicBSR_Timer_sf64;
+      case 80:
+         return BSR_Config__periodicBSR_Timer_sf80;
+      case 128:
+         return BSR_Config__periodicBSR_Timer_sf128;
+      case 320:
+         return BSR_Config__periodicBSR_Timer_sf320;
+      case 640:
+         return BSR_Config__periodicBSR_Timer_sf640;
+      case 1280:
+         return BSR_Config__periodicBSR_Timer_sf1280;
+      case 2560:
+         return BSR_Config__periodicBSR_Timer_sf2560;
+      case -1:
+         return BSR_Config__periodicBSR_Timer_infinity;
+      default:
+         return BSR_Config__periodicBSR_Timer_sf10;
+   }
+}
+
+/************************************************************************
+ *
+ * @brief Converts BSR Retransmission timer value to its ASN enum value
+ *
+ * @details
+ *
+ *    Function : convertBsrRetxTmrValueToEnum
+ *
+ *    Functionality: Converts BSR Retransmission timer timer value to its ASN enum value
+ *
+ * @params[in] BSR Retransmission timer value
+ * @return BSR Restransmission timer ASN enum
+ *
+ * **********************************************************************/
+long convertBsrRetxTmrValueToEnum(uint16_t retxTmr)
+{
+   switch(retxTmr)
+   {
+      case 10:
+         return BSR_Config__retxBSR_Timer_sf10;
+      case 20:
+         return BSR_Config__retxBSR_Timer_sf20;
+      case 40:
+         return BSR_Config__retxBSR_Timer_sf40;
+      case 80:
+         return BSR_Config__retxBSR_Timer_sf80;
+      case 160:
+         return BSR_Config__retxBSR_Timer_sf160;
+      case 320:
+         return BSR_Config__retxBSR_Timer_sf320;
+      case 640:
+         return BSR_Config__retxBSR_Timer_sf640;
+      case 1280:
+         return BSR_Config__retxBSR_Timer_sf1280;
+      case 2560:
+         return BSR_Config__retxBSR_Timer_sf2560;
+      case 5120:
+         return BSR_Config__retxBSR_Timer_sf5120;
+      case 10240:
+         return BSR_Config__retxBSR_Timer_sf10240;
+      default:
+         return BSR_Config__retxBSR_Timer_sf320;
+   }
+}
+
 /************************************************************************
  *
  * @brief Converts LC SR Delay timer value to its ASN enum value
index 7764198..f42fe9e 100644 (file)
@@ -37,6 +37,8 @@ int8_t convertReasmblTmrEnumToValue(uint8_t reAsmblTmrCfg);
 T_StatusProhibit_t convertProhibitTmrValueToEnum(int16_t prohibitTmr);
 int16_t convertProhibitTmrEnumToValue(T_StatusProhibit_t prohibitTmr);
 PUCCH_Resource__format_PR covertPucchFormatIntEnumToRrcEnum(uint8_t pucchFormat);
+long convertBsrPeriodicTmrValueToEnum(int16_t periodicTmr);
+long convertBsrRetxTmrValueToEnum(uint16_t retxTmr);
 long convertLcSrDelayTmrValueToEnum(uint16_t delayTimer);
 
 /**********************************************************************
index 45fae51..5b344fe 100644 (file)
@@ -2829,8 +2829,8 @@ uint8_t BuildBsrConfig(DuUeCb *ueCb, struct BSR_Config *bsrConfig)
    }
    else
    {
-      bsrConfig->periodicBSR_Timer = ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.periodicTimer;
-      bsrConfig->retxBSR_Timer     = ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.retxTimer;
+      bsrConfig->periodicBSR_Timer = convertBsrPeriodicTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.periodicTimer);
+      bsrConfig->retxBSR_Timer     = convertBsrRetxTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.retxTimer);
 
       bsrConfig->logicalChannelSR_DelayTimer = NULLP;
       DU_ALLOC(bsrConfig->logicalChannelSR_DelayTimer, sizeof(long));
@@ -3317,12 +3317,20 @@ uint8_t BuildMacLCConfig(LcCfg *lcCfgDb, struct LogicalChannelConfig *macLcConfi
  * ****************************************************************/
 uint8_t BuildRlcBearerToAddModList(DuUeCb *ueCb, struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
 {
-   uint8_t  idx = 0, macLcIdx = 0, elementCnt = 0;
+   uint8_t  idx = 0, lcIdx=0, macLcIdx = 0, elementCnt = 0;
 
    if(ueCb == NULLP)
       elementCnt = 1;
-   else
+   else if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
       elementCnt = ueCb->rlcUeCfg.numLcs;
+   else
+   {
+      for(lcIdx = 0; lcIdx<ueCb->rlcUeCfg.numLcs; lcIdx++)
+      {
+         if(ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent == false)
+            elementCnt++;
+      }
+   }
    rlcBearerList->list.count = elementCnt;
    rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
 
@@ -3345,93 +3353,109 @@ uint8_t BuildRlcBearerToAddModList(DuUeCb *ueCb, struct CellGroupConfigRrc__rlc_
       }
    }
 
-   for(idx=0; idx<rlcBearerList->list.count; idx++)
+   if(ueCb == NULLP)
    {
-      /* Fill Logical channel identity */
-      if(ueCb == NULLP)
-         rlcBearerList->list.array[idx]->logicalChannelIdentity = SRB1_LCID;
-      else
-         rlcBearerList->list.array[idx]->logicalChannelIdentity = ueCb->rlcUeCfg.rlcLcCfg[idx].lcId;
-
-      /* Fill Radio Bearer Id and type (DRB/SRB) for this logical channel */
+      idx=0;
+      rlcBearerList->list.array[idx]->logicalChannelIdentity = SRB1_LCID;
       DU_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->choice.srb_Identity = SRB1_LCID;
+      rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
+
+      /* Fill RLC related Configurations for this Radio Bearer */
+      rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+      DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
+      if(!rlcBearerList->list.array[idx]->rlc_Config)
       {
          DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
          return RFAILED;
       }
-      if(ueCb == NULLP)
+      if(BuildRlcConfig(NULLP, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
       {
-         rlcBearerList->list.array[idx]->servedRadioBearer->present = RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
-         rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = SRB1_LCID;
+         DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+         return RFAILED;
       }
-      else
+
+      /* Fill MAC related configurations for this Radio Bearer */
+      rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+      DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+      if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
+      if(BuildMacLCConfig(NULLP, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+         return RFAILED;
+      }
+   }
+   else
+   {
+      idx=0;
+      for(lcIdx=0; lcIdx<ueCb->rlcUeCfg.numLcs; lcIdx++)
       {
+         if((ueCb->f1UeDb->actionType != UE_CTXT_CFG_QUERY) && (ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent == true))
+            continue;
+
+         /* Fill Logical channel identity */
+         rlcBearerList->list.array[idx]->logicalChannelIdentity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].lcId;
+
+         /* Fill Radio Bearer Id and type (DRB/SRB) for this logical channel */
+         DU_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 = \
-            covertRbTypeFromIntEnumToRrcEnum(ueCb->rlcUeCfg.rlcLcCfg[idx].rbType);
+                                                                      covertRbTypeFromIntEnumToRrcEnum(ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbType);
          switch(rlcBearerList->list.array[idx]->servedRadioBearer->present)
          {
             case RLC_BearerConfig__servedRadioBearer_PR_srb_Identity: 
-               rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = ueCb->rlcUeCfg.rlcLcCfg[idx].rbId;
+               rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbId;
                break;
             case RLC_BearerConfig__servedRadioBearer_PR_drb_Identity:
-               rlcBearerList->list.array[idx]->servedRadioBearer->choice.drb_Identity = ueCb->rlcUeCfg.rlcLcCfg[idx].rbId;
+               rlcBearerList->list.array[idx]->servedRadioBearer->choice.drb_Identity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbId;
                break;
             case RLC_BearerConfig__servedRadioBearer_PR_NOTHING:
             default:
                break;
          }
-      }
+         ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent = true;
 
-      rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
+         rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
 
-      /* Fill RLC related Configurations for this Radio Bearer */
-      rlcBearerList->list.array[idx]->rlc_Config = NULLP;
-      DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
-      if(!rlcBearerList->list.array[idx]->rlc_Config)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-         return RFAILED;
-      }
-      if(ueCb == NULLP)
-      {
-         if(BuildRlcConfig(NULLP, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+         /* Fill RLC related Configurations for this Radio Bearer */
+         rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+         DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
+         if(!rlcBearerList->list.array[idx]->rlc_Config)
          {
-            DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
             return RFAILED;
          }
-      }
-      else
-      {
-         if(BuildRlcConfig(&ueCb->rlcUeCfg.rlcLcCfg[idx], rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+         if(BuildRlcConfig(&ueCb->rlcUeCfg.rlcLcCfg[lcIdx], rlcBearerList->list.array[idx]->rlc_Config) != ROK)
          {
             DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
             return RFAILED;
          }
-      }
 
-      /* Fill MAC related configurations for this Radio Bearer */
-      rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
-      DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
-      if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-         return RFAILED;
-      }
-
-      if(ueCb == NULLP)
-      {
-         if(BuildMacLCConfig(NULLP, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+         /* Fill MAC related configurations for this Radio Bearer */
+         rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+         DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+         if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
          {
-            DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
             return RFAILED;
          }
-      }
-      else
-      {
          for(macLcIdx = 0; macLcIdx < ueCb->macUeCfg.numLcs; macLcIdx++)
          {
-            if(ueCb->macUeCfg.lcCfgList[macLcIdx].lcId == ueCb->rlcUeCfg.rlcLcCfg[idx].lcId)
+            if(ueCb->macUeCfg.lcCfgList[macLcIdx].lcId == ueCb->rlcUeCfg.rlcLcCfg[lcIdx].lcId)
             {
                if(BuildMacLCConfig(&ueCb->macUeCfg.lcCfgList[macLcIdx], rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
                {
@@ -3441,6 +3465,8 @@ uint8_t BuildRlcBearerToAddModList(DuUeCb *ueCb, struct CellGroupConfigRrc__rlc_
                break;
             }
          }
+
+         idx++;
       }
    }
    return ROK;
@@ -4008,7 +4034,8 @@ elementCnt = pdschCfg->numTimeDomRsrcAlloc;
             DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
             return RFAILED;
          }
-         *(timeDomAlloc->k0) = *(pdschCfg->timeDomRsrcAllociList[idx].k0);
+         if(pdschCfg->timeDomRsrcAllociList[idx].k0)
+            *(timeDomAlloc->k0) = *(pdschCfg->timeDomRsrcAllociList[idx].k0);
          timeDomAlloc->mappingType = pdschCfg->timeDomRsrcAllociList[idx].mappingType;
          timeDomAlloc->startSymbolAndLength = pdschCfg->timeDomRsrcAllociList[idx].startSymbolAndLength;
       }
@@ -7347,7 +7374,8 @@ uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti
 {
    uint8_t   ret;
    uint8_t   elementCnt;
-   uint8_t   ieIdx;
+   uint8_t   ieIdx, cellIdx, ueIdx;
+   DuUeCb    *duUeCb = NULLP;
    asn_enc_rval_t  encRetVal;
    F1AP_PDU_t  *f1apMsg = NULLP;
    InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP;
@@ -7459,7 +7487,19 @@ uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti
       initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
                                                                 InitialULRRCMessageTransferIEs__value_PR_DUtoCURRCContainer;
 
-      ret = BuildCellGroupConfigRrc(NULLP, &initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer);
+      for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
+      {
+         for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
+         {
+            if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
+                  (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].crnti == crnti))
+            {
+               duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
+            }
+         }
+      }
+
+      ret = BuildCellGroupConfigRrc(duUeCb, &initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer);
       if(ret != ROK)
       {
         break;
@@ -11230,23 +11270,22 @@ void duFillModulationDetails(MacUeCfg *ueCfg, MacUeCfg *oldUeCfg, void *ueCap)
 
 /*******************************************************************
  *
- * @brief Function to extract cellGrp Info present in cutoDu cont
+ * @brief Function to extract info from CU to DU RRC container extension
  *
  * @details
  *
- *    Function : extractCellGrpInfo
+ *    Function : extractCuToDuRrcInfoExt
  *
- *    Functionality: Function to extract cellGrp Info present
- *                   in cutoDu cont
+ *    Functionality: Function to extract info from CU to DU RRC container
+ *    extension
  *
  * @params[in] ProtocolExtensionContainer_4624P16_t pointer
  *
- * @return CellGroupConfigRrc_t *
+ * @return ROK
+ *         RFAILED
  *
  * ****************************************************************/
-
-CellGroupConfigRrc_t *extractCellGrpInfo(ProtocolExtensionContainer_4624P16_t *protocolIeExtn,\
-      DuUeCfg *ueCfgDb)
+uint8_t extractCuToDuRrcInfoExt(ProtocolExtensionContainer_4624P16_t *protocolIeExtn, DuUeCfg *ueCfgDb)
 {
    uint8_t idx2 =0;
    uint16_t id =0;
@@ -11261,37 +11300,45 @@ CellGroupConfigRrc_t *extractCellGrpInfo(ProtocolExtensionContainer_4624P16_t *p
       for(idx2 = 0; idx2 < protocolIeExtn->list.count; idx2++)
       {
          extIeInfo = ((CUtoDURRCInformation_ExtIEs_t *)(protocolIeExtn->list.array[idx2]));
-        id = extIeInfo->id;
+         id = extIeInfo->id;
          switch(id)
          {
             case ProtocolIE_ID_id_CellGroupConfig:
-            {
-              recvBufLen = extIeInfo->extensionValue.choice.CellGroupConfig.size;
-              /* decoding the CellGroup Buf received */
-              DU_ALLOC(cellGrpCfg, sizeof(CellGroupConfigRrc_t));
-              if(cellGrpCfg)
-              {
-                  memset(cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
-                  rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfg,
-                    extIeInfo->extensionValue.choice.CellGroupConfig.buf, recvBufLen, 0, 0);
-                  if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+               {
+                  recvBufLen = extIeInfo->extensionValue.choice.CellGroupConfig.size;
+                  /* decoding the CellGroup Buf received */
+                  DU_ALLOC(cellGrpCfg, sizeof(CellGroupConfigRrc_t));
+                  if(cellGrpCfg)
                   {
-                     DU_LOG("\nERROR  -->  F1AP : ASN decode failed at decodeCellGrpCfg()");
-                     return NULLP;
+                     memset(cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
+                     rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfg,
+                           extIeInfo->extensionValue.choice.CellGroupConfig.buf, recvBufLen, 0, 0);
+                     if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+                     {
+                        DU_LOG("\nERROR  -->  F1AP : ASN decode failed at decodeCellGrpCfg()");
+                        return RFAILED;
+                     }
+                     xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfg);
+                     if(extractRlcCfgToAddMod(cellGrpCfg->rlc_BearerToAddModList, ueCfgDb))
+                        return NULLP;
+                     ueCfgDb->cellGrpCfg = cellGrpCfg;
                   }
-                  xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfg);
-                 if(extractRlcCfgToAddMod(cellGrpCfg->rlc_BearerToAddModList, ueCfgDb))
-                    return NULLP;
-              }
-              break;
-            }
+                  break;
+               }
+
+            case ProtocolIE_ID_id_HandoverPreparationInformation:
+               {
+                  DU_LOG("\nHLAL Received HANDOVER PREPARATION INFO in UE CONTEXT SETUP REQUEST");
+                  return RFAILED;
+               }
+
             default:
                DU_LOG("\nERROR  -->  F1AP : Invalid IE received CUtoDURRCInformation:%d at decodeCellGrpCfg()", id);
-              break;
+               break;
          }
       }
    }
-   return cellGrpCfg;
+   return ROK;
 }
 
 /*******************************************************************
@@ -11875,13 +11922,13 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                   extractUeCapability(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.\
                   uE_CapabilityRAT_ContainerList, duUeCb);
                }
+
                if(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.iE_Extensions)
                {
-                  duUeCb->f1UeDb->duUeCfg.cellGrpCfg = extractCellGrpInfo(ueSetReq->protocolIEs.list.array[ieIdx]->\
-                        value.choice.CUtoDURRCInformation.iE_Extensions, &duUeCb->f1UeDb->duUeCfg);
-                  if(!duUeCb->f1UeDb->duUeCfg.cellGrpCfg)
+                  if(extractCuToDuRrcInfoExt(ueSetReq->protocolIEs.list.array[ieIdx]->\
+                        value.choice.CUtoDURRCInformation.iE_Extensions, &duUeCb->f1UeDb->duUeCfg) != ROK)
                   {
-                     DU_LOG("\nERROR  -->  F1AP: Failed to extract cell Grp Info");
+                     DU_LOG("\nERROR  -->  F1AP: Failed to extract CU to DU RRC information extension IE");
                      //TODO: Update the failure cause in ue context Setup Response
                      ret = RFAILED;
                   }
@@ -12360,54 +12407,54 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t cellId,uint8_t ueId)
       DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
       if(f1apMsg == NULLP)
       {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
-        ret = RFAILED;
-        break;
+         DU_LOG(" ERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
+         ret = RFAILED;
+         break;
       }
 
       f1apMsg->present = F1AP_PDU_PR_successfulOutcome;
       DU_ALLOC(f1apMsg->choice.successfulOutcome,
-           sizeof(SuccessfulOutcome_t));
+            sizeof(SuccessfulOutcome_t));
       if(f1apMsg->choice.successfulOutcome == NULLP)
       {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for      F1AP-PDU failed");
-        ret = RFAILED;
-        break;
+         DU_LOG(" ERROR  -->  F1AP : Memory allocation for     F1AP-PDU failed");
+         ret = RFAILED;
+         break;
       }
 
       f1apMsg->choice.successfulOutcome->procedureCode = \
-                                                        ProcedureCode_id_UEContextSetup;
+                                                         ProcedureCode_id_UEContextSetup;
       f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
       f1apMsg->choice.successfulOutcome->value.present = \
-                                                        SuccessfulOutcome__value_PR_UEContextSetupResponse;
+                                                         SuccessfulOutcome__value_PR_UEContextSetupResponse;
 
       ueSetRsp =
-        &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
+         &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
       elementCnt = 4;
       ueSetRsp->protocolIEs.list.count = elementCnt;
       ueSetRsp->protocolIEs.list.size = \
-                                       elementCnt * sizeof(UEContextSetupResponse_t *);
+                                        elementCnt * sizeof(UEContextSetupResponse_t *);
 
       /* Initialize the UESetup members */
       DU_ALLOC(ueSetRsp->protocolIEs.list.array, \
-           ueSetRsp->protocolIEs.list.size);
+            ueSetRsp->protocolIEs.list.size);
       if(ueSetRsp->protocolIEs.list.array == NULLP)
       {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
-        ret = RFAILED;
-        break;
+         DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
+         ret = RFAILED;
+         break;
       }
 
       for(idx=0; idx<elementCnt; idx++)
       {
-        DU_ALLOC(ueSetRsp->protocolIEs.list.array[idx],\
-              sizeof(UEContextSetupResponseIEs_t));
-        if(ueSetRsp->protocolIEs.list.array[idx] == NULLP)
-        {
-           DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
-           ret = RFAILED;
-           break;
-        }
+         DU_ALLOC(ueSetRsp->protocolIEs.list.array[idx],\
+               sizeof(UEContextSetupResponseIEs_t));
+         if(ueSetRsp->protocolIEs.list.array[idx] == NULLP)
+         {
+            DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
+            ret = RFAILED;
+            break;
+         }
       }
       /* Fetching Ue Cb Info*/
       GET_CELL_IDX(cellId, cellIdx);
@@ -12418,61 +12465,40 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t cellId,uint8_t ueId)
       idx = 0;
       /*GNB CU UE F1AP ID*/
       ueSetRsp->protocolIEs.list.array[idx]->id        = \
-                                                 ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+                                                  ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present = \
-                                                            UEContextSetupResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
+                                                             UEContextSetupResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = gnbCuUeF1apId;
 
       /*GNB DU UE F1AP ID*/
       idx++;
       ueSetRsp->protocolIEs.list.array[idx]->id        = \
-                                                 ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+                                                  ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present = \
-                                                            UEContextSetupResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
+                                                             UEContextSetupResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
 
 
       /*DUtoCURRC Information */
       idx++;
       ueSetRsp->protocolIEs.list.array[idx]->id  = \
-                                                  ProtocolIE_ID_id_DUtoCURRCInformation;
+                                                   ProtocolIE_ID_id_DUtoCURRCInformation;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present =\
-                                                           UEContextSetupResponseIEs__value_PR_DUtoCURRCInformation;
-      if(ueCb->f1UeDb)
-      {
-         if(ueCb->f1UeDb->duUeCfg.cellGrpCfg)
-        {
-           cellGrpCfg = (CellGroupConfigRrc_t*)ueCb->f1UeDb->duUeCfg.cellGrpCfg;
-           ret = EncodeUeCntxtDuToCuInfo(&ueSetRsp->protocolIEs.list.array[idx]->value.\
-                    choice.DUtoCURRCInformation.cellGroupConfig, cellGrpCfg);
-            if(ret == RFAILED)
-           {
-               DU_LOG("\nERROR  -->  F1AP : Failed to EncodeUeCntxtDuToCuInfo in BuildAndSendUeContextSetupRsp()");
-               freeF1UeDb(ueCb->f1UeDb);
-               ueCb->f1UeDb = NULLP;
-               break;
-           }
-         }
-      }
-      else
-      {
-         DU_LOG("\nERROR  -->  F1AP : Failed to form DUtoCU RRCInfo at BuildAndSendUeContextSetupRsp()");
-         ret = RFAILED;
-         break;
-      }
+                                                            UEContextSetupResponseIEs__value_PR_DUtoCURRCInformation;
+      BuildCellGroupConfigRrc(ueCb, &ueSetRsp->protocolIEs.list.array[idx]->value.choice.DUtoCURRCInformation.cellGroupConfig);
 
       /* Drb Setup List */
       idx++;
       ueSetRsp->protocolIEs.list.array[idx]->id  = \
-                                ProtocolIE_ID_id_DRBs_Setup_List;
+                                                   ProtocolIE_ID_id_DRBs_Setup_List;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present =\
-                                UEContextSetupResponseIEs__value_PR_DRBs_Setup_List;
+                                                            UEContextSetupResponseIEs__value_PR_DRBs_Setup_List;
       ret = fillDrbSetupList(&ueSetRsp->protocolIEs.list.array[idx]->value.choice.DRBs_Setup_List,\
-               &ueCb->f1UeDb->duUeCfg);
+            &ueCb->f1UeDb->duUeCfg);
       if(ret == RFAILED)
       {
          DU_LOG("\nERROR  -->  F1AP : Failed to fillDrbSetupList in BuildAndSendUeContextSetupRsp()");
@@ -12481,9 +12507,9 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t cellId,uint8_t ueId)
          break;
       }
 
-       /* Free UeContext Db created during Ue context Req */
-       freeF1UeDb(ueCb->f1UeDb);
-       ueCb->f1UeDb = NULLP;
+      /* Free UeContext Db created during Ue context Req */
+      freeF1UeDb(ueCb->f1UeDb);
+      ueCb->f1UeDb = NULLP;
 
       /* TODO: To send Drb list */
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
@@ -12492,30 +12518,30 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t cellId,uint8_t ueId)
       memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
       encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
-           encBuf);
+            encBuf);
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
-        DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Context Setup Response structure (at %s)\n",\
-              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-        ret = RFAILED;
-        break;
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Context Setup Response structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         ret = RFAILED;
+         break;
       }
       else
       {
-        DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UE Context Setup Response\n");
-        for(int i=0; i< encBufSize; i++)
-        {
-           printf("%x",encBuf[i]);
-        }
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UE Context Setup Response\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            printf("%x",encBuf[i]);
+         }
       }
 
       /* Sending  msg  */
       if(sendF1APMsg() != ROK)
       {
-        DU_LOG("\nERROR  -->  F1AP : Sending UE Context Setup Response failed");
-        ret = RFAILED;
-        break;
+         DU_LOG("\nERROR  -->  F1AP : Sending UE Context Setup Response failed");
+         ret = RFAILED;
+         break;
       }
       break;
    }
@@ -14014,6 +14040,8 @@ uint8_t BuildAndSendUeContextModRsp(DuUeCb *ueCb)
          elementCnt = 3;
       if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
          elementCnt = 5;
+      if(ueCb->f1UeDb->actionType = UE_CTXT_RRC_RECFG_COMPLETE)
+         elementCnt = 2;
       ueContextModifyRes->protocolIEs.list.count = elementCnt;
       ueContextModifyRes->protocolIEs.list.size = elementCnt*sizeof(UEContextModificationResponse_t*);
 
@@ -14059,27 +14087,30 @@ uint8_t BuildAndSendUeContextModRsp(DuUeCb *ueCb)
          BuildCellGroupConfigRrc(ueCb, &ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCInformation.cellGroupConfig);
       }
 
-      ieIdx++;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_SetupMod_List;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
-                                                                        UEContextModificationResponseIEs__value_PR_DRBs_SetupMod_List;
-      if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+      if((ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY) || (ueCb->f1UeDb->actionType == UE_CTXT_MOD))
       {
-         for(tnlIdx = 0; tnlIdx < duCb.numTeId; tnlIdx++)
+         ieIdx++;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_SetupMod_List;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
+                                                                           UEContextModificationResponseIEs__value_PR_DRBs_SetupMod_List;
+         if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
          {
-            if(duCb.upTnlCfg[tnlIdx]->ueId == ueCb->gnbDuUeF1apId)
+            for(tnlIdx = 0; tnlIdx < duCb.numTeId; tnlIdx++)
             {
-               memcpy(&ueCb->f1UeDb->duUeCfg.upTnlInfo[ueCb->f1UeDb->duUeCfg.numDrbSetupMod++], duCb.upTnlCfg[tnlIdx], sizeof(UpTnlCfg));
+               if(duCb.upTnlCfg[tnlIdx]->ueId == ueCb->gnbDuUeF1apId)
+               {
+                  memcpy(&ueCb->f1UeDb->duUeCfg.upTnlInfo[ueCb->f1UeDb->duUeCfg.numDrbSetupMod++], duCb.upTnlCfg[tnlIdx], sizeof(UpTnlCfg));
+               }
             }
          }
-      }
-      ret = BuildDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
-               value.choice.DRBs_SetupMod_List) , &ueCb->f1UeDb->duUeCfg);
-      if(ret != ROK)
-      {
-         DU_LOG( "\nERROR  -->  F1AP : Failed to build DRB setupmod List ");
-         break;
+         ret = BuildDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
+                  value.choice.DRBs_SetupMod_List) , &ueCb->f1UeDb->duUeCfg);
+         if(ret != ROK)
+         {
+            DU_LOG( "\nERROR  -->  F1AP : Failed to build DRB setupmod List ");
+            break;
+         }
       }
 
       if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
@@ -14493,6 +14524,7 @@ uint8_t procF1UeContextModificationReq(F1AP_PDU_t *f1apMsg)
                }
                break;
             }
+
          case ProtocolIE_ID_id_GNB_DUConfigurationQuery:
             {
                DU_LOG("\nINFO  -->  DU APP : Received GNB DU Configuration Query in UE Context Modification Request from CU");
@@ -14502,10 +14534,20 @@ uint8_t procF1UeContextModificationReq(F1AP_PDU_t *f1apMsg)
                }
                break;
             }
+
+         case ProtocolIE_ID_id_RRCReconfigurationCompleteIndicator:
+            {
+               if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.RRCReconfigurationCompleteIndicator == \
+                  RRCReconfigurationCompleteIndicator_true)
+               {
+                  duUeCb->f1UeDb->actionType = UE_CTXT_RRC_RECFG_COMPLETE;
+               }
+               break;
+            }
       }
    }
 
-   if(ret != RFAILED)
+   if(ret != RFAILED) 
    {
       ret = duProcUeContextModReq(duUeCb);
    }
index c915456..c04af4b 100644 (file)
@@ -84,6 +84,7 @@ typedef enum
    UE_CTXT_UNKNOWN,
    UE_CTXT_SETUP,
    UE_CTXT_MOD,
+   UE_CTXT_RRC_RECFG_COMPLETE,
    UE_CTXT_CFG_QUERY,
    UE_CTXT_RELEASE
 }UeCtxtActionType;
index b18ee5e..fd4052a 100644 (file)
@@ -471,7 +471,6 @@ uint8_t duProcDlRrcMsg(F1DlRrcMsg *dlRrcMsg)
             DU_LOG("\nERROR  -->  DU APP : cellId [%d] does not exist", cellId);
             ret = RFAILED;
          }
-
          if(duCb.actvCellLst[cellId-1]->numActvUes < MAX_NUM_UE)
          {
             ret = duCreateUeCb(&duCb.ueCcchCtxt[ueIdx], dlRrcMsg->gnbCuUeF1apId);
@@ -503,11 +502,14 @@ uint8_t duProcDlRrcMsg(F1DlRrcMsg *dlRrcMsg)
                break; 
             }
          }
-        if(ueFound)
-           break;
+         if(ueFound)
+            break;
       }
       if(!ueFound)
-        ret = RFAILED;
+      {
+         DU_LOG("\nERROR   -->  DU_APP: UE ID [%d] not found", dlRrcMsg->gnbDuUeF1apId);
+         ret = RFAILED;
+      }
    }
    return ret;
 }
@@ -625,102 +627,100 @@ void fillDefaultUlLcCfg(UlLcCfg *ulLcCfg)
  *    Functionality: Fills Initial DL Bandwidth Part
  *
  * @params[in]  InitialDlBwp *initDlBwp
- * @return void
+ * @return ROK - success
+ *         RFAILED - failure
  *
  *****************************************************************/
-void fillDefaultInitDlBwp(InitialDlBwp *initDlBwp)
+uint8_t fillDefaultInitDlBwp(InitialDlBwp *initDlBwp)
 {
    uint8_t idx = 0;
    uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
    uint8_t coreset0EndPrb, coreset1StartPrb, coreset1NumPrb;
 
-
    if(initDlBwp)
    {
       /* Filling PDCCH Config */
       initDlBwp->pdcchPresent = TRUE;
       if(initDlBwp->pdcchPresent)
       {
-        initDlBwp->pdcchCfg.numCRsetToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
-        memset(initDlBwp->pdcchCfg.cRSetToAddModList, 0, MAX_NUM_CRSET);
-        if(initDlBwp->pdcchCfg.numCRsetToAddMod <= MAX_NUM_CRSET)
-        {
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].cRSetId = \
-              PDCCH_CTRL_RSRC_SET_ONE_ID;
-           memset(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, 0,\
-              FREQ_DOM_RSRC_SIZE); 
-           coreset0EndPrb = CORESET0_END_PRB;
-           coreset1StartPrb = coreset0EndPrb +6;
-           coreset1NumPrb = CORESET1_NUM_PRB;
-           /* calculate the PRBs */
-           fillCoresetFeqDomAllocMap(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
-           memcpy(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, freqDomainResource,
-              FREQ_DOM_RSRC_SIZE);
-
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].duration = \
-              PDCCH_CTRL_RSRC_SET_ONE_DURATION;
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].cceRegMappingType = \
-              CCE_REG_MAPPINGTYPE_PR_NONINTERLEAVED;
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].precoderGranularity = \
-              ALL_CONTIGUOUS_RBS;
-           initDlBwp->pdcchCfg.cRSetToAddModList[idx].dmrsScramblingId = \
-              SCRAMBLING_ID;
-        }
-        initDlBwp->pdcchCfg.numCRsetToRel = 0;
-        /* Filling Serach Space */
-        initDlBwp->pdcchCfg.numSearchSpcToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
-        memset(initDlBwp->pdcchCfg.searchSpcToAddModList, 0, MAX_NUM_CRSET);
-        if(initDlBwp->pdcchCfg.numSearchSpcToAddMod <= MAX_NUM_CRSET)
-        {
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceId =\
-              PDCCH_SRCH_SPC_TWO_ID;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].cRSetId = \
-              PDCCH_CTRL_RSRC_SET_ONE_ID;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].\
-              mSlotPeriodicityAndOffset = SLOTPERIODICITYANDOFFSET_PR_SL1;
-           memset(initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot, 0,\
-              MONITORING_SYMB_WITHIN_SLOT_SIZE);
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot[idx] =\
-              PDCCH_SYMBOL_WITHIN_SLOT;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel1 =\
-              AGGREGATIONLEVEL_N8; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel2 =\
-              AGGREGATIONLEVEL_N8; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel4 =\
-              AGGREGATIONLEVEL_N4; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel8 =\
-              AGGREGATIONLEVEL_N2; 
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel16 =\
-              AGGREGATIONLEVEL_N1;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceType = \
-              SEARCHSPACETYPE_PR_UE_SPECIFIC;
-           initDlBwp->pdcchCfg.searchSpcToAddModList[idx].ueSpecificDciFormat =\
-              PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
-
-           initDlBwp->pdcchCfg.numSearchSpcToRel = 0;
+         initDlBwp->pdcchCfg.numCRsetToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
+         memset(initDlBwp->pdcchCfg.cRSetToAddModList, 0, MAX_NUM_CRSET);
+         if(initDlBwp->pdcchCfg.numCRsetToAddMod <= MAX_NUM_CRSET)
+         {
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].cRSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+            memset(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, 0, FREQ_DOM_RSRC_SIZE); 
+            coreset0EndPrb = CORESET0_END_PRB;
+            coreset1StartPrb = coreset0EndPrb +6;
+            coreset1NumPrb = CORESET1_NUM_PRB;
+            /* calculate the PRBs */
+            fillCoresetFeqDomAllocMap(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
+            memcpy(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, freqDomainResource, FREQ_DOM_RSRC_SIZE);
+
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].cceRegMappingType = CCE_REG_MAPPINGTYPE_PR_NONINTERLEAVED;
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].precoderGranularity = ALL_CONTIGUOUS_RBS;
+            initDlBwp->pdcchCfg.cRSetToAddModList[idx].dmrsScramblingId = SCRAMBLING_ID;
+         }
+         initDlBwp->pdcchCfg.numCRsetToRel = 0;
 
-        }
+         /* Filling Serach Space */
+         initDlBwp->pdcchCfg.numSearchSpcToAddMod = PDCCH_CTRL_RSRC_SET_ONE_ID;
+         memset(initDlBwp->pdcchCfg.searchSpcToAddModList, 0, MAX_NUM_CRSET);
+         if(initDlBwp->pdcchCfg.numSearchSpcToAddMod <= MAX_NUM_CRSET)
+         {
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].cRSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSlotPeriodicityAndOffset = SLOTPERIODICITYANDOFFSET_PR_SL1;
+            memset(initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot, 0, MONITORING_SYMB_WITHIN_SLOT_SIZE);
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].mSymbolsWithinSlot[idx] = PDCCH_SYMBOL_WITHIN_SLOT;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel1 = AGGREGATIONLEVEL_N8; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel2 = AGGREGATIONLEVEL_N8; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel4 = AGGREGATIONLEVEL_N4; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel8 = AGGREGATIONLEVEL_N2; 
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].numCandidatesAggLevel16 = AGGREGATIONLEVEL_N1;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].searchSpaceType = SEARCHSPACETYPE_PR_UE_SPECIFIC;
+            initDlBwp->pdcchCfg.searchSpcToAddModList[idx].ueSpecificDciFormat = PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+         }
+         initDlBwp->pdcchCfg.numSearchSpcToRel = 0;
       }
+
       /* Filling PDSCH Config */
       initDlBwp->pdschPresent = TRUE;
       if(initDlBwp->pdschPresent)
       {
-        initDlBwp->pdschCfg.dmrsDlCfgForPdschMapTypeA.addPos = ADDITIONALPOSITION_POS0;
-        initDlBwp->pdschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1;
-        initDlBwp->pdschCfg.numTimeDomRsrcAlloc = 1;
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].mappingType = \
-           MAPPING_TYPEA;
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbol = PDSCH_START_SYMBOL; 
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].symbolLength = PDSCH_LENGTH_SYMBOL;
-        initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbolAndLength = \
-           calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
-        initDlBwp->pdschCfg.rbgSize = RBG_SIZE_CONFIG1;
-        initDlBwp->pdschCfg.numCodeWordsSchByDci = CODEWORDS_SCHED_BY_DCI_N1;
-        initDlBwp->pdschCfg.bundlingType = TYPE_STATIC_BUNDLING;
-        initDlBwp->pdschCfg.bundlingInfo.StaticBundling.size = 0;
+         initDlBwp->pdschCfg.dmrsDlCfgForPdschMapTypeA.addPos = ADDITIONALPOSITION_POS0;
+         initDlBwp->pdschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1;
+
+         initDlBwp->pdschCfg.numTimeDomRsrcAlloc = NUM_TIME_DOM_RSRC_ALLOC;
+
+         idx = 0; 
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].mappingType = MAPPING_TYPEA;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbol = PDSCH_START_SYMBOL; 
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].symbolLength = PDSCH_LENGTH_SYMBOL;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbolAndLength = calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+
+         idx++;
+         DU_ALLOC_SHRABL_BUF(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0, sizeof(uint8_t));
+         if(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0 == NULLP)
+         {
+            DU_LOG("\nERROR  -->  DUAPP : Failed to allocate memory to K0 in fillDefaultInitDlBwp");
+            return RFAILED;
+         }
+         if(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0)
+            *(initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].k0) = 1;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].mappingType = MAPPING_TYPEA;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbol = PDSCH_START_SYMBOL; 
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].symbolLength = PDSCH_LENGTH_SYMBOL;
+         initDlBwp->pdschCfg.timeDomRsrcAllociList[idx].startSymbolAndLength = calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+
+         initDlBwp->pdschCfg.rbgSize = RBG_SIZE_CONFIG1;
+         initDlBwp->pdschCfg.numCodeWordsSchByDci = CODEWORDS_SCHED_BY_DCI_N1;
+         initDlBwp->pdschCfg.bundlingType = TYPE_STATIC_BUNDLING;
+         initDlBwp->pdschCfg.bundlingInfo.StaticBundling.size = 0;
       }
    }
 
+   return ROK;
 }
 
 /******************************************************************
@@ -793,10 +793,11 @@ void fillDefaultInitUlBwp(InitialUlBwp *initUlBwp)
  *    Functionality: Fills Sp Cell Group Info
  *
  * @params[in]  MacUeCfg *macUeCfg
- * @return void
+ * @return ROK - Success
+ *         RFAILED - Failure
  *
  *****************************************************************/
-void fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg)
+uint8_t fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg)
 {
    SpCellCfg *spCell = NULL;
 
@@ -809,7 +810,11 @@ void fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg)
 
       spCell->servCellIdx = SERV_CELL_IDX;
       /* Filling Initial Dl Bwp */
-      fillDefaultInitDlBwp(&spCell->servCellCfg.initDlBwp);
+      if((fillDefaultInitDlBwp(&spCell->servCellCfg.initDlBwp)) != ROK)
+      {
+         DU_LOG("\nERROR  -->  DUAPP : Failed in fillDefaultInitDlBwp");
+         return RFAILED;
+      }
 
       spCell->servCellCfg.numDlBwpToAdd    = 0; 
       spCell->servCellCfg.firstActvDlBwpId = ACTIVE_DL_BWP_ID;
@@ -819,8 +824,8 @@ void fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg)
       spCell->servCellCfg.pdschServCellCfg.maxCodeBlkGrpPerTb = NULLP;
       spCell->servCellCfg.pdschServCellCfg.codeBlkGrpFlushInd = NULLP;
       spCell->servCellCfg.pdschServCellCfg.xOverhead = NULLP;
-      spCell->servCellCfg.pdschServCellCfg.numHarqProcForPdsch =\
-         NUM_HARQ_PROC_FOR_PDSCH_N_16;
+      spCell->servCellCfg.pdschServCellCfg.numHarqProcForPdsch = NUM_HARQ_PROC_FOR_PDSCH_N_16;
+
       /* Filling Initial UL Bwp*/
       fillDefaultInitUlBwp(&spCell->servCellCfg.initUlBwp);
       spCell->servCellCfg.numUlBwpToAdd     = 0; 
@@ -829,7 +834,9 @@ void fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg)
    else
    {
       DU_LOG("\nERROR  -->  DU APP : Memory is NULL for SpCellGrp");
+      return RFAILED;
    }
+   return ROK;
 }
 
 /******************************************************************
@@ -1197,7 +1204,13 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueId, uint16_t crnti, DuUeCfg *ueC
 
       fillDefaultMacCellGrpInfo(macUeCfg);
       fillDefaultPhyCellGrpInfo(macUeCfg);
-      fillDefaultSpCellGrpInfo(macUeCfg);
+
+      if((fillDefaultSpCellGrpInfo(macUeCfg)) != ROK)
+      {
+         DU_LOG("\nERROR  --> DUAPP : Failed in fillDefaultSpCellGrpInfo");
+         return RFAILED;
+      }
+
       macUeCfg->ambrCfg = NULLP;
       fillDefaultModulation(macUeCfg);
       fillMacSrb1LcCfg(&macUeCfg->lcCfgList[0]);
@@ -1498,6 +1511,7 @@ uint8_t fillRlcSrb1LcCfg(RlcBearerCfg *rlcLcCfg)
    rlcLcCfg->rlcMode = RLC_AM;
    rlcLcCfg->configType = CONFIG_ADD;
    ret = fillDefaultRlcModeCfg(rlcLcCfg->rlcMode, rlcLcCfg);
+   rlcLcCfg->isLcAddModRspSent = true;
    return ret;
 }
 
@@ -2807,7 +2821,7 @@ uint8_t duProcUeContextModReq(DuUeCb *ueCb)
             return RFAILED;
          }
       }
-      else if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+      else if((ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY) || (ueCb->f1UeDb->actionType == UE_CTXT_RRC_RECFG_COMPLETE))
       {
          if((BuildAndSendUeContextModRsp(ueCb) != ROK))
          {