[JIRA ID- ODUHIGH-462] [ISSUE ID ODUHIGH-477] Adding support for drx configuration...
[o-du/l2.git] / src / du_app / du_f1ap_msg_hdl.c
index 2bdb40a..0f9450c 100644 (file)
 #include "BWP-UplinkCommon.h"
 #include "ReconfigurationWithSync.h"
 #include "du_sys_info_hdl.h"
+#include "DRX-ConfigRrc.h"
 
 #ifdef O1_ENABLE
 #include "CmInterface.h"
@@ -2533,16 +2534,14 @@ void FreeULRRCMessageTransfer( F1AP_PDU_t *f1apMsg)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb  ueCb, uint8_t lcId, \
+uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb  *ueCb, uint8_t lcId, \
       uint16_t msgLen, uint8_t *rrcMsg)
 {
-   uint8_t   elementCnt =0;
-   uint8_t   idx1 =0;
-   uint8_t   idx =0;
-   F1AP_PDU_t                  *f1apMsg = NULLP;
-   ULRRCMessageTransfer_t      *ulRRCMsg = NULLP;
-   asn_enc_rval_t              encRetVal;        /* Encoder return value */
-   uint8_t ret =RFAILED;
+   uint8_t                 elementCnt=0, idx1=0, idx=0;
+   uint8_t                 ret = RFAILED;
+   F1AP_PDU_t              *f1apMsg = NULLP;
+   ULRRCMessageTransfer_t  *ulRRCMsg = NULLP;
+   asn_enc_rval_t          encRetVal;        /* Encoder return value */
    
    memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
 
@@ -2597,7 +2596,7 @@ uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb  ueCb, uint8_t lcId, \
       ulRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
       ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
                                                              ULRRCMessageTransferIEs__value_PR_GNB_CU_UE_F1AP_ID;
-      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_CU_UE_F1AP_ID = ueCb.gnbCuUeF1apId;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId;
 
       /*GNB DU UE F1AP ID*/
       idx1++;
@@ -2605,7 +2604,7 @@ uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb  ueCb, uint8_t lcId, \
       ulRRCMsg->protocolIEs.list.array[idx1]->criticality = Criticality_reject;
       ulRRCMsg->protocolIEs.list.array[idx1]->value.present = \
                                                              ULRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
-      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_DU_UE_F1AP_ID = ueCb.gnbDuUeF1apId;
+      ulRRCMsg->protocolIEs.list.array[idx1]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;
 
       /*SRBID*/
       idx1++;
@@ -6980,7 +6979,200 @@ uint8_t BuildPhyCellGrpCfg(DuUeCb *ueCb, PhysicalCellGroupConfig_t *phyCellGrpCf
 
    return ROK;
 }
-
+#ifdef NR_DRX
+/*******************************************************************
+ *
+ * @brief fill long cycle offset value of drx
+ *
+ * @details
+ *
+ *    Function : fillLongCycleOffsetValFromDuCb 
+ *
+ *    Functionality: fill long cycle offset value of drx
+ *
+ * @params[in] DrxLongCycleStartOffset  drxLongCycleStartOffset,
+ * struct DRX_ConfigRrc__drx_LongCycleStartOffset drx_LongCycleStartOffset
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void fillLongCycleOffsetValFromDuCb(DrxLongCycleStartOffset  drxLongCycleStartOffset,\
+struct DRX_ConfigRrc__drx_LongCycleStartOffset *drx_LongCycleStartOffset)
+{
+   
+   drx_LongCycleStartOffset->present = convertLongDrxCycleLengthValueToEnum(drxLongCycleStartOffset.drxLongCycleStartOffsetChoice); 
+   switch(drx_LongCycleStartOffset->present)
+   {
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms10:
+         {
+            drx_LongCycleStartOffset->choice.ms10 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms20:
+         {
+            drx_LongCycleStartOffset->choice.ms20 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms32:
+         {
+            drx_LongCycleStartOffset->choice.ms32 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms40:
+         {
+            drx_LongCycleStartOffset->choice.ms40 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms60:
+         {
+            drx_LongCycleStartOffset->choice.ms60 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms64:
+         {
+            drx_LongCycleStartOffset->choice.ms64 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms70:
+         {
+            drx_LongCycleStartOffset->choice.ms70 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms80:
+         {
+            drx_LongCycleStartOffset->choice.ms80 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms128:
+         {
+            drx_LongCycleStartOffset->choice.ms128 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms160:
+         {
+            drx_LongCycleStartOffset->choice.ms160 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms256:
+         {
+            drx_LongCycleStartOffset->choice.ms256 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms320:
+         {
+            drx_LongCycleStartOffset->choice.ms320 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms512:
+         {
+            drx_LongCycleStartOffset->choice.ms512 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms640:
+         {
+            drx_LongCycleStartOffset->choice.ms640 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms1024:
+         {
+            drx_LongCycleStartOffset->choice.ms1024 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms1280:
+         {
+            drx_LongCycleStartOffset->choice.ms1280 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms2048:
+         {
+            drx_LongCycleStartOffset->choice.ms2048 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms2560:
+         {
+            drx_LongCycleStartOffset->choice.ms2560 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms5120:
+         {
+            drx_LongCycleStartOffset->choice.ms5120 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms10240:
+         {
+            drx_LongCycleStartOffset->choice.ms10240 = drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+            break;
+         }
+      default :
+         break;
+   }
+}
+/*******************************************************************
+ *
+ * @brief Builds drx config IE 
+ *
+ * @details
+ *
+ *    Function : BuildDrxConfigRrc 
+ *
+ *    Functionality: Build drx config in MacCellGrpCfg 
+ *
+ * @params[in] struct MAC_CellGroupConfig__drx_ConfigRrc 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildDrxConfigRrc(DuUeCb *ueCb, struct MAC_CellGroupConfig__drx_ConfigRrc *drxCfg)
+{
+   drxCfg->present = MAC_CellGroupConfig__drx_ConfigRrc_PR_setup;
+   DU_ALLOC(drxCfg->choice.setup, sizeof(struct DRX_ConfigRrc));
+   if(!drxCfg->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDrxConfigRrc");
+      return RFAILED;
+   }
+   if(ueCb->macUeCfg.macCellGrpCfg.drxCfg.drxOnDurationTimer.onDurationTimerValInMs)
+   {
+      drxCfg->choice.setup->drx_onDurationTimer.present = DRX_ConfigRrc__drx_onDurationTimer_PR_milliSeconds;
+      drxCfg->choice.setup->drx_onDurationTimer.choice.milliSeconds = convertOnDurationTimerMilliSecondsValueToEnum(ueCb->macUeCfg.\
+      macCellGrpCfg.drxCfg.drxOnDurationTimer.onDurationtimerValue.milliSeconds);
+   }
+   else
+   {
+      drxCfg->choice.setup->drx_onDurationTimer.present = DRX_ConfigRrc__drx_onDurationTimer_PR_subMilliSeconds;
+      drxCfg->choice.setup->drx_onDurationTimer.choice.subMilliSeconds = ueCb->macUeCfg.macCellGrpCfg.drxCfg.\
+      drxOnDurationTimer.onDurationtimerValue.subMilliSeconds;
+   }
+   drxCfg->choice.setup->drx_InactivityTimer = convertDrxInactivityTimerValueToEnum(ueCb->macUeCfg.macCellGrpCfg.drxCfg.drxInactivityTimer);
+   drxCfg->choice.setup->drx_HARQ_RTT_TimerDL = ueCb->macUeCfg.macCellGrpCfg.drxCfg.drxHarqRttTimerDl;
+   drxCfg->choice.setup->drx_HARQ_RTT_TimerUL = ueCb->macUeCfg.macCellGrpCfg.drxCfg.drxHarqRttTimerUl;
+   drxCfg->choice.setup->drx_RetransmissionTimerDL = convertDrxRetransmissionTimerDlValueToEnum(ueCb->macUeCfg.macCellGrpCfg.drxCfg.\
+   drxRetransmissionTimerDl);
+   drxCfg->choice.setup->drx_RetransmissionTimerUL = convertDrxRetransmissionTimerUlValueToEnum(ueCb->macUeCfg.macCellGrpCfg.drxCfg.\
+   drxRetransmissionTimerUl);
+   drxCfg->choice.setup->drx_SlotOffset = ueCb->macUeCfg.macCellGrpCfg.drxCfg.drxSlotOffset;
+   fillLongCycleOffsetValFromDuCb(ueCb->macUeCfg.macCellGrpCfg.drxCfg.drxLongCycleStartOffset, &drxCfg->choice.setup->drx_LongCycleStartOffset);
+   
+   if(ueCb->macUeCfg.macCellGrpCfg.drxCfg.shortDrxPres)
+   {
+      DU_ALLOC(drxCfg->choice.setup->shortDRX, sizeof(struct DRX_ConfigRrc__shortDRX));
+      if(drxCfg->choice.setup->shortDRX)
+      {
+         drxCfg->choice.setup->shortDRX->drx_ShortCycle = convertShortDrxCycleLengthValueToEnum(ueCb->macUeCfg.macCellGrpCfg.drxCfg.\
+         shortDrx.drxShortCycle);
+         drxCfg->choice.setup->shortDRX->drx_ShortCycleTimer = ueCb->macUeCfg.macCellGrpCfg.drxCfg.shortDrx.drxShortCycleTimer;
+      }
+      else
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDrxConfigRrc");
+         return RFAILED;
+      }
+   }
+   return ROK;
+}
+#endif
 /*******************************************************************
  *
  * @brief Builds Mac cell group config 
@@ -6999,7 +7191,23 @@ uint8_t BuildPhyCellGrpCfg(DuUeCb *ueCb, PhysicalCellGroupConfig_t *phyCellGrpCf
  * ****************************************************************/
 uint8_t BuildMacCellGrpCfg(DuUeCb *ueCb, MAC_CellGroupConfig_t *macCellGrpCfg)
 {
-   macCellGrpCfg->drx_Config = NULLP;
+   macCellGrpCfg->drx_ConfigRrc = NULLP;
+#ifdef NR_DRX   
+   if(ueCb)
+   {
+      DU_ALLOC(macCellGrpCfg->drx_ConfigRrc, sizeof(struct MAC_CellGroupConfig__drx_ConfigRrc));
+      if(!macCellGrpCfg->drx_ConfigRrc)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+         return RFAILED;
+      }
+      if(BuildDrxConfigRrc(ueCb, macCellGrpCfg->drx_ConfigRrc) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : failed to build drx config");
+         return RFAILED;
+      }
+   }
+#endif
    macCellGrpCfg->schedulingRequestConfig = NULLP;
    DU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
    if(!macCellGrpCfg->schedulingRequestConfig)
@@ -7993,6 +8201,7 @@ uint8_t FreeMemDuToCuRrcCont(CellGroupConfigRrc_t *cellGrpCfg)
    struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList=NULLP;
    struct RLC_Config *rlcConfig=NULLP;
    struct LogicalChannelConfig *macLcConfig=NULLP;
+   struct MAC_CellGroupConfig__drx_ConfigRrc *drxCfg=NULLP;
    struct SchedulingRequestConfig *schedulingRequestConfig=NULLP;
    struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList=NULLP;
    struct TAG_Config *tagConfig=NULLP;
@@ -8015,6 +8224,9 @@ uint8_t FreeMemDuToCuRrcCont(CellGroupConfigRrc_t *cellGrpCfg)
                {
                   switch(rlcConfig->present)
                   {
+                     case RLC_Config_PR_NOTHING:
+                        break;
+
                      case RLC_Config_PR_am:
                         {
                            if(rlcConfig->choice.am)
@@ -8078,6 +8290,27 @@ uint8_t FreeMemDuToCuRrcCont(CellGroupConfigRrc_t *cellGrpCfg)
    macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
    if(macCellGrpCfg)
    {
+      drxCfg = macCellGrpCfg->drx_ConfigRrc;
+
+      if(drxCfg)
+      {
+          switch(drxCfg->present)
+          {
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_NOTHING:
+               break;
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_setup:
+            {
+               if(drxCfg->choice.setup)
+               {
+                  DU_FREE(drxCfg->choice.setup->shortDRX, sizeof(struct DRX_ConfigRrc__shortDRX));  
+                  DU_FREE(drxCfg->choice.setup, sizeof(struct DRX_ConfigRrc));
+               }
+            }
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_release:
+               break;
+          }
+          DU_FREE(drxCfg, sizeof(struct MAC_CellGroupConfig__drx_ConfigRrc));
+      }
       schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig; 
       if(schedulingRequestConfig)
       {
@@ -8683,35 +8916,22 @@ void freeRlcLcCfg(RlcBearerCfg *lcCfg)
    {
       case RLC_AM :
          {
-            if(lcCfg->u.amCfg)
-            {
-               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.amCfg, sizeof(AmBearerCfg));
-            }
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.amCfg, sizeof(AmBearerCfg));
             break;
          }
       case RLC_UM_BI_DIRECTIONAL :
          {
-            if(lcCfg->u.umBiDirCfg)
-            {
-               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
-            }
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
             break;
          }
       case RLC_UM_UNI_DIRECTIONAL_UL :
          {
-            if(lcCfg->u.umUniDirUlCfg)
-            {
-               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
-            }
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
             break;
-
          }
       case RLC_UM_UNI_DIRECTIONAL_DL :
          {
-            if(lcCfg->u.umUniDirDlCfg)
-            {
-               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
-            }
+            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
             break;
          }
       default:
@@ -9267,7 +9487,7 @@ void freeAperDecodeinitialUplinkBWPConfig(UplinkConfig_t *ulCfg)
  * @return void
  *
  * ****************************************************************/
-void freeDuUeCfg(DuUeCfg *ueCfg)
+void freeDuUeCfg(UeCtxtActionType actionType, DuUeCfg *ueCfg)
 {
    uint8_t lcIdx = 0;
    uint8_t arrIdx = 0;
@@ -9296,194 +9516,200 @@ void freeDuUeCfg(DuUeCfg *ueCfg)
 
    if(ueCfg->cellGrpCfg)
    {
-      
       rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
       if(rlcBearerList)
       {
-        if(rlcBearerList->list.array)
-        {
-           for(arrIdx=0; arrIdx<rlcBearerList->list.count; arrIdx++)
-           {
-              if(rlcBearerList->list.array[arrIdx])
-              {
-                 rlcConfig   = rlcBearerList->list.array[arrIdx]->rlc_Config;
-                 macLcConfig = rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig;
-                 
-                 if(rlcBearerList->list.array[arrIdx]->servedRadioBearer)
-                 {
-                    free(rlcBearerList->list.array[arrIdx]->servedRadioBearer);
-                 }
-                 if(rlcConfig)
-                 {
-                    if(rlcConfig->choice.am)
-                    {
-                       free(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength);
-                       free(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength);
-                       free(rlcConfig->choice.am);
-                    }
-                    free(rlcBearerList->list.array[arrIdx]->rlc_Config);
-                 }
-                 if(macLcConfig)
-                 {
-                    if(macLcConfig->ul_SpecificParameters)
-                    {
-                       free(macLcConfig->ul_SpecificParameters->schedulingRequestID);
-                       free(macLcConfig->ul_SpecificParameters->logicalChannelGroup);
-                       free(macLcConfig->ul_SpecificParameters);
-                    }
-                    free(rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig);
-                 }
-                 free(rlcBearerList->list.array[arrIdx]); 
-              }
-           }
-           free(rlcBearerList->list.array);
-        }
-        free(cellGrpCfg->rlc_BearerToAddModList);
+         if(rlcBearerList->list.array)
+         {
+            for(arrIdx=0; arrIdx<rlcBearerList->list.count; arrIdx++)
+            {
+               if(rlcBearerList->list.array[arrIdx])
+               {
+                  rlcConfig   = rlcBearerList->list.array[arrIdx]->rlc_Config;
+                  macLcConfig = rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig;
+
+                  if(rlcBearerList->list.array[arrIdx]->servedRadioBearer)
+                  {
+                     free(rlcBearerList->list.array[arrIdx]->servedRadioBearer);
+                  }
+                  if(rlcConfig)
+                  {
+                     if(rlcConfig->choice.am)
+                     {
+                        free(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength);
+                        free(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength);
+                        free(rlcConfig->choice.am);
+                     }
+                     free(rlcBearerList->list.array[arrIdx]->rlc_Config);
+                  }
+                  if(macLcConfig)
+                  {
+                     if(macLcConfig->ul_SpecificParameters)
+                     {
+                        free(macLcConfig->ul_SpecificParameters->schedulingRequestID);
+                        free(macLcConfig->ul_SpecificParameters->logicalChannelGroup);
+                        free(macLcConfig->ul_SpecificParameters);
+                     }
+                     free(rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig);
+                  }
+                  free(rlcBearerList->list.array[arrIdx]); 
+               }
+            }
+            free(rlcBearerList->list.array);
+         }
+         free(cellGrpCfg->rlc_BearerToAddModList);
       }
 
       macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
       if(macCellGrpCfg)
       {
-        schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig;
-        if(schedulingRequestConfig)
-        {
-           schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
-           if(schReqList)
-           {
-              if(schReqList->list.array)
-              {
-                 for(arrIdx=0;arrIdx<schReqList->list.count; arrIdx++)
-                 {
-                    if(schReqList->list.array[arrIdx])
-                    {
-                       free(schReqList->list.array[arrIdx]->sr_ProhibitTimer); 
-                       free(schReqList->list.array[arrIdx]);
-                    }
-                 }
-                 free(schReqList->list.array);
-              }
-              free(schedulingRequestConfig->schedulingRequestToAddModList);
-           }
-           free(macCellGrpCfg->schedulingRequestConfig);
-        }
-        if(macCellGrpCfg->bsr_Config)
-        {
-           free(macCellGrpCfg->bsr_Config);
-        }
-        tagConfig = macCellGrpCfg->tag_Config;
-        if(tagConfig)
-        {
-           tagList = tagConfig->tag_ToAddModList;
-           if(tagList)
-           {
-              if(tagList->list.array)
-              {
-                 for(arrIdx=0; arrIdx<tagList->list.count; arrIdx++)
-                 {
-                    free(tagList->list.array[arrIdx]);
-                 }
-                 free(tagList->list.array);
-              }
-              free(tagConfig->tag_ToAddModList);
-           }
-           free(tagConfig); 
-        }
+         schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig;
+         if(schedulingRequestConfig)
+         {
+            schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
+            if(schReqList)
+            {
+               if(schReqList->list.array)
+               {
+                  for(arrIdx=0;arrIdx<schReqList->list.count; arrIdx++)
+                  {
+                     if(schReqList->list.array[arrIdx])
+                     {
+                        free(schReqList->list.array[arrIdx]->sr_ProhibitTimer); 
+                        free(schReqList->list.array[arrIdx]);
+                     }
+                  }
+                  free(schReqList->list.array);
+               }
+               free(schedulingRequestConfig->schedulingRequestToAddModList);
+            }
+            free(macCellGrpCfg->schedulingRequestConfig);
+         }
+         if(macCellGrpCfg->bsr_Config)
+         {
+            free(macCellGrpCfg->bsr_Config);
+         }
+         tagConfig = macCellGrpCfg->tag_Config;
+         if(tagConfig)
+         {
+            tagList = tagConfig->tag_ToAddModList;
+            if(tagList)
+            {
+               if(tagList->list.array)
+               {
+                  for(arrIdx=0; arrIdx<tagList->list.count; arrIdx++)
+                  {
+                     free(tagList->list.array[arrIdx]);
+                  }
+                  free(tagList->list.array);
+               }
+               free(tagConfig->tag_ToAddModList);
+            }
+            free(tagConfig); 
+         }
 
-        phrConfig = macCellGrpCfg->phr_Config;
-        if(phrConfig)
-        {
-           free(phrConfig->choice.setup); 
-           free(phrConfig); 
-        }
+         phrConfig = macCellGrpCfg->phr_Config;
+         if(phrConfig)
+         {
+            free(phrConfig->choice.setup); 
+            free(phrConfig); 
+         }
 
-        free(macCellGrpCfg); 
+         free(macCellGrpCfg); 
       }
 
       phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
       if(phyCellGrpCfg)
       {
-        free(phyCellGrpCfg->p_NR_FR1);
-        free(phyCellGrpCfg); 
+         free(phyCellGrpCfg->p_NR_FR1);
+         free(phyCellGrpCfg); 
       }
 
       spCellCfg = cellGrpCfg->spCellConfig;
       if(spCellCfg)
       {
-        if(spCellCfg->servCellIndex)
-        {
-           if(spCellCfg->rlmInSyncOutOfSyncThreshold)
-           {
-              if(spCellCfg->spCellConfigDedicated)
-              {
-                 srvCellCfg = spCellCfg->spCellConfigDedicated;
-                 if(srvCellCfg->initialDownlinkBWP)
-                 {
-                    dlBwp = srvCellCfg->initialDownlinkBWP;
-                    if(srvCellCfg->firstActiveDownlinkBWP_Id)
-                    {
-                       if(srvCellCfg->defaultDownlinkBWP_Id)
-                       {
-                          if(srvCellCfg->uplinkConfig)
-                          {
+         if(spCellCfg->servCellIndex)
+         {
+            if(spCellCfg->rlmInSyncOutOfSyncThreshold)
+            {
+               if(spCellCfg->spCellConfigDedicated)
+               {
+                  srvCellCfg = spCellCfg->spCellConfigDedicated;
+                  if(srvCellCfg->initialDownlinkBWP)
+                  {
+                     dlBwp = srvCellCfg->initialDownlinkBWP;
+                     if(srvCellCfg->firstActiveDownlinkBWP_Id)
+                     {
+                        if(srvCellCfg->defaultDownlinkBWP_Id)
+                        {
+                           if(srvCellCfg->uplinkConfig)
+                           {
 
-                             if(srvCellCfg->pdsch_ServingCellConfig)
-                             {
-                                pdschCfg=
-                                   srvCellCfg->pdsch_ServingCellConfig;
-                                if(pdschCfg->choice.setup)
-                                {
+                              if(srvCellCfg->pdsch_ServingCellConfig)
+                              {
+                                 pdschCfg=
+                                    srvCellCfg->pdsch_ServingCellConfig;
+                                 if(pdschCfg->choice.setup)
+                                 {
 
-                                   free(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH);
-                                   free(pdschCfg->choice.setup);
-                                }
+                                    free(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH);
+                                    free(pdschCfg->choice.setup);
+                                 }
 
-                                free(srvCellCfg->pdsch_ServingCellConfig);
-                             }
+                                 free(srvCellCfg->pdsch_ServingCellConfig);
+                              }
 
-                             freeAperDecodeinitialUplinkBWPConfig(srvCellCfg->uplinkConfig);
-                             free(srvCellCfg->uplinkConfig);
-                          }
-                          free(srvCellCfg->defaultDownlinkBWP_Id);
-                       }
+                              freeAperDecodeinitialUplinkBWPConfig(srvCellCfg->uplinkConfig);
+                              free(srvCellCfg->uplinkConfig);
+                           }
+                           free(srvCellCfg->defaultDownlinkBWP_Id);
+                        }
 
-                       free(srvCellCfg->firstActiveDownlinkBWP_Id);
-                    }
-                    if(dlBwp->pdcch_Config)
-                    {
-                       if(dlBwp->pdsch_Config)
-                       {
-                          freeAperDecodeBWPDlDedPdschConfig(dlBwp);
-                          free(dlBwp->pdsch_Config);
-                       }
-                       freeAperDecodeBWPDlDedPdcchConfig(dlBwp);
-                       free(dlBwp->pdcch_Config);
-                    }
-                    free(srvCellCfg->initialDownlinkBWP);
-                 }
+                        free(srvCellCfg->firstActiveDownlinkBWP_Id);
+                     }
+                     if(dlBwp->pdcch_Config)
+                     {
+                        if(dlBwp->pdsch_Config)
+                        {
+                           freeAperDecodeBWPDlDedPdschConfig(dlBwp);
+                           free(dlBwp->pdsch_Config);
+                        }
+                        freeAperDecodeBWPDlDedPdcchConfig(dlBwp);
+                        free(dlBwp->pdcch_Config);
+                     }
+                     free(srvCellCfg->initialDownlinkBWP);
+                  }
 
-                 free(spCellCfg->spCellConfigDedicated);
-              }
-              free(spCellCfg->rlmInSyncOutOfSyncThreshold);
-           }
-           free(spCellCfg->servCellIndex); 
-        }
-        free(spCellCfg);
+                  free(spCellCfg->spCellConfigDedicated);
+               }
+               free(spCellCfg->rlmInSyncOutOfSyncThreshold);
+            }
+            free(spCellCfg->servCellIndex); 
+         }
+         free(spCellCfg);
       }
       DU_FREE(ueCfg->cellGrpCfg, sizeof(CellGroupConfigRrc_t));
       ueCfg->cellGrpCfg = NULLP;
    }
+
    if(ueCfg->ambrCfg)
    {
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCfg->ambrCfg, sizeof(AmbrCfg));
    }
-   for(lcIdx = 0; lcIdx < ueCfg->numRlcLcs; lcIdx++)
+
+   if(actionType != UE_CTXT_CFG_QUERY)
    {
-      freeRlcLcCfg(&ueCfg->rlcLcCfg[lcIdx]);
+      for(lcIdx = 0; lcIdx < ueCfg->numRlcLcs; lcIdx++)
+      {
+         freeRlcLcCfg(&ueCfg->rlcLcCfg[lcIdx]);
+      }
    }
+
    for(lcIdx = 0; lcIdx < ueCfg->numMacLcs; lcIdx++)
    {
       freeMacLcCfg(&ueCfg->macLcCfg[lcIdx]);
    }
+
    for(lcIdx = 0; lcIdx < ueCfg->numDrb; lcIdx++)
    {
       DU_FREE(ueCfg->upTnlInfo[lcIdx].tnlCfg1, sizeof(GtpTnlCfg));
@@ -9517,7 +9743,7 @@ void freeF1UeDb(F1UeContextSetupDb *f1UeDb)
       }
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
    }
-   freeDuUeCfg(&f1UeDb->duUeCfg);
+   freeDuUeCfg(f1UeDb->actionType, &f1UeDb->duUeCfg);
    memset(f1UeDb, 0, sizeof(F1UeContextSetupDb));
    DU_FREE(f1UeDb, sizeof(F1UeContextSetupDb));
 }
@@ -11724,6 +11950,228 @@ ServCellCfgInfo *storedSrvCellCfg)
    }
    return ret;
 }
+
+#ifdef NR_DRX
+
+/*******************************************************************
+ *
+ * @brief fill long cycle offset value of drx in UE structure
+ *
+ * @details
+ *
+ *    Function : fillLongCycleOffsetValueInUeDb
+ *
+ *    Functionality: fill long cycle offset value of drx in UE structure
+ *
+ * @params[in] DrxLongCycleStartOffset  drxLongCycleStartOffset,
+ * struct DRX_ConfigRrc__drx_LongCycleStartOffset drx_LongCycleStartOffset
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+void fillLongCycleOffsetValueInUeDb(DrxLongCycleStartOffset *drxLongCycleStartOffset, struct DRX_ConfigRrc__drx_LongCycleStartOffset  *drx_LongCycleStartOffset)
+{
+
+   drxLongCycleStartOffset->drxLongCycleStartOffsetChoice = convertLongDrxCycleLengthEnumToValue(drx_LongCycleStartOffset->present);
+   switch(drx_LongCycleStartOffset->present)
+   {
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms10:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms10;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms20:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms20;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms32:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms32;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms40:
+        {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms40;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms60:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms60;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms64:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms64;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms70:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms70;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms80:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms80;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms128:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms128;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms160:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms160;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms256:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms256;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms320:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms320;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms512:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms512;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms640:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms640;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms1024:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms1024;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms1280:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms1280;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms2048:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms2048;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms2560:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms2560;
+            break;
+         }
+       case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms5120:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms5120;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms10240:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = drx_LongCycleStartOffset->choice.ms10240;
+            break;
+         }
+      default :
+         break;
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Fills drx configuration structure with the help of drx_ConfigRrc
+ *which recive from CU or storedDrxCfg which is already stored
+ *
+ * @details
+ *
+ *    Function : extractDrxConfiguration 
+ *
+ *    Functionality: Fills Reconfig Cell group Info received by CU
+ *   
+ * @params[in] cuMacCellGrpDrxConfig  = MAC_CellGroupConfig__drx_ConfigRrc information which
+ *                       is send by CU, which we have stored in F1UeContextSetupDb
+ *             DrxCfg * drxCfg  = Used to Store the information,
+ *                      which needs to send in other layer, as well as this can be
+ *                      the variable which stores the information in DuCb,
+ *             DrxCfg *storedDrxCfg = Null in case of sending the
+ *                      information to other layer else it will have the drx information 
+ *                      stored in the copyOfmacUeCfg which we have stored in F1UeContextSetupDb.
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void extractDrxConfiguration(struct MAC_CellGroupConfig__drx_ConfigRrc *cuMacCellGrpDrxConfig, DrxCfg * drxCfg, DrxCfg *storedDrxCfg)
+{
+   struct DRX_ConfigRrc *cuDrxConfig;
+
+   if(storedDrxCfg)
+   {
+      memcpy(drxCfg, storedDrxCfg, sizeof(DrxCfg));
+   }
+   else
+   {
+      if(cuMacCellGrpDrxConfig)
+      {
+         switch(cuMacCellGrpDrxConfig->present)
+         {
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_NOTHING:
+               break;
+
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_setup:
+               {
+                  cuDrxConfig = cuMacCellGrpDrxConfig->choice.setup;
+                  if(cuDrxConfig)
+                  {
+                     switch(cuDrxConfig->drx_onDurationTimer.present)
+                     {
+                        case DRX_ConfigRrc__drx_onDurationTimer_PR_NOTHING:
+                           break;
+                        case DRX_ConfigRrc__drx_onDurationTimer_PR_milliSeconds:
+                           {
+                              drxCfg->drxOnDurationTimer.onDurationTimerValInMs = true;
+                              drxCfg->drxOnDurationTimer.onDurationtimerValue.milliSeconds=convertOnDurationTimerMilliSecondsEnumToValue(cuDrxConfig->\
+                              drx_onDurationTimer.choice.milliSeconds);
+                              break;
+                           }
+                        case DRX_ConfigRrc__drx_onDurationTimer_PR_subMilliSeconds:
+                           {
+                              drxCfg->drxOnDurationTimer.onDurationTimerValInMs = false;
+                              drxCfg->drxOnDurationTimer.onDurationtimerValue.subMilliSeconds = cuDrxConfig->drx_onDurationTimer.choice.subMilliSeconds;
+                              break;
+                           }
+                     }
+                  }
+                  fillLongCycleOffsetValueInUeDb(&drxCfg->drxLongCycleStartOffset, &cuDrxConfig->drx_LongCycleStartOffset);
+                  drxCfg->drxInactivityTimer = convertDrxInactivityTimerEnumToValue(cuDrxConfig->drx_InactivityTimer);
+                  drxCfg->drxHarqRttTimerDl = cuDrxConfig->drx_HARQ_RTT_TimerDL;
+                  drxCfg->drxHarqRttTimerUl = cuDrxConfig->drx_HARQ_RTT_TimerUL;
+                  drxCfg->drxRetransmissionTimerDl = convertDrxRetransmissionTimerDlEnumToValue(cuDrxConfig->drx_RetransmissionTimerDL);
+                  drxCfg->drxRetransmissionTimerUl = convertDrxRetransmissionTimerUlEnumToValue(cuDrxConfig->drx_RetransmissionTimerUL);
+                  drxCfg->drxSlotOffset = cuDrxConfig->drx_SlotOffset;
+                  if(cuDrxConfig->shortDRX)
+                  {
+                     drxCfg->shortDrxPres=true;
+                     drxCfg->shortDrx.drxShortCycle = convertShortDrxCycleLengthEnumToValue(cuDrxConfig->shortDRX->drx_ShortCycle);
+                     drxCfg->shortDrx.drxShortCycleTimer = cuDrxConfig->shortDRX->drx_ShortCycleTimer;
+                  }
+                  else
+                     drxCfg->shortDrxPres=false;
+
+                  break;
+               }
+
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_release:
+               break;
+         }
+      }
+   }
+}
+#endif
+
 /*******************************************************************
  *
  * @brief Fills Reconfig Cell group Info received by CU
@@ -11761,6 +12209,28 @@ uint8_t extractUeReCfgCellInfo(CellGroupConfigRrc_t *cellGrp, MacUeCfg *macUeCfg
       {
          macUeCfg->macCellGrpCfgPres = true;
          macCellGroup = ((MAC_CellGroupConfig_t *)(cellGrp->mac_CellGroupConfig));
+
+#ifdef NR_DRX         
+         if(macCellGroup->drx_ConfigRrc)
+         {
+            if(storedMacUeCfg)
+            {
+               if(!storedMacUeCfg->macCellGrpCfgPres) 
+               {
+                  extractDrxConfiguration(macCellGroup->drx_ConfigRrc, &macUeCfg->macCellGrpCfg.drxCfg,NULL);    
+               }
+               else
+               {
+                  extractDrxConfiguration(macCellGroup->drx_ConfigRrc, &macUeCfg->macCellGrpCfg.drxCfg, &storedMacUeCfg->macCellGrpCfg.drxCfg);    
+               }
+            }
+            else
+            {
+               extractDrxConfiguration(macCellGroup->drx_ConfigRrc, &macUeCfg->macCellGrpCfg.drxCfg,NULL); 
+            }
+         }
+#endif
+
          if(macCellGroup->schedulingRequestConfig)
          {
             extractSchReqReConfig(macCellGroup->schedulingRequestConfig, &macUeCfg->macCellGrpCfg.schReqCfg);
@@ -13006,12 +13476,14 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
    int8_t ueIdx = -1;
    uint8_t  ret=0, ieIdx=0, ieExtIdx = 0, servCellIdx = 0;
    bool ueCbFound = false, hoInProgress = false;
-   uint16_t nrCellId = 0,  cellIdx=0;
+   uint16_t cellIdx=0;
+   uint64_t nrCellId = 0;
    uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId=0, bitRateSize=0;
    DuUeCb   *duUeCb = NULL;
    UEContextSetupRequest_t   *ueSetReq = NULL;
    DRBs_ToBeSetup_List_t *drbCfg = NULL;
    CUtoDURRCInformation_t *rrcInfo = NULL;
+   DRXCycle_t *drxCycle;
 
    ret = ROK;
 
@@ -13039,7 +13511,7 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                GET_CELL_IDX(nrCellId, cellIdx);
                if(!duCb.actvCellLst[cellIdx])
                {
-                  DU_LOG("\nERROR  -->  F1AP : Cell Id [%d] not found", nrCellId);
+                  DU_LOG("\nERROR  -->  F1AP : Cell Id [%lu] not found", nrCellId);
                   ret = RFAILED;
                }
                break;
@@ -13094,7 +13566,7 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                      gnbDuUeF1apId = ueIdx +1;
                   else
                   {
-                     DU_LOG("\nERROR  -->  F1AP : No free UE IDX found in UE bit map of cell Id [%d]", nrCellId);
+                     DU_LOG("\nERROR  -->  F1AP : No free UE IDX found in UE bit map of cell Id [%lu]", nrCellId);
                      ret = RFAILED;
                      break;
                   }
@@ -13148,12 +13620,25 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                break;
             } 
 
-         case ProtocolIE_ID_id_SCell_ToBeSetup_List:
+#ifdef NR_DRX
+         case ProtocolIE_ID_id_DRXCycle:
             {
-               DU_LOG("\nINFO   -->  DU_APP: Received SCell_ToBeSetup_List but  Not processing the list");
+               duUeCb->f1UeDb->duUeCfg.drxCyclePres = true;
+               drxCycle = &ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.DRXCycle;
+               duUeCb->f1UeDb->duUeCfg.drxCycle.drxLongCycleLength =  convertLongDrxCycleLengthEnumToValue(drxCycle->longDRXCycleLength);
+               if(drxCycle->shortDRXCycleLength)
+               {
+                  duUeCb->f1UeDb->duUeCfg.drxCycle.shortDrxCyclePres = true;
+                  duUeCb->f1UeDb->duUeCfg.drxCycle.shortDrxCycle.drxShortCycle = \
+                  convertShortDrxCycleLengthEnumToValue(*(drxCycle->shortDRXCycleLength));
+               }
+               if(drxCycle->shortDRXCycleTimer)
+                  duUeCb->f1UeDb->duUeCfg.drxCycle.shortDrxCycle.drxShortCycleTimer = *(drxCycle->shortDRXCycleTimer);   
+
                break;
             }
 
+#endif
          case ProtocolIE_ID_id_SRBs_ToBeSetup_List:
             {
                if(extractSrbListToSetup(&ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.SRBs_ToBeSetup_List,\
@@ -13178,7 +13663,6 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                }
                break;
             }
-
          case ProtocolIE_ID_id_RRCContainer:
             {
                /* Filling Dl RRC Msg Info */
@@ -13200,13 +13684,16 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
 
          case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
             {
-               if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
-               {
-                  duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
-               }
-               else
+               if(duUeCb->f1UeDb->dlRrcMsg)
                {
-                  DU_LOG("\nERROR  -->  Ignoring delivery report, since rrcContainer is not present");
+                  if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+                  {
+                     duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
+                  }
+                  else
+                  {
+                     DU_LOG("\nERROR  -->  Ignoring delivery report, since rrcContainer is not present");
+                  }
                }
                break;
             }
@@ -14434,7 +14921,8 @@ uint8_t BuildAndSendRrcDeliveryReport(uint32_t gnbCuUeF1apId, \
 uint8_t extractCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate)
 {
    uint8_t  ret = ROK;
-   uint16_t idx, nci, pci = 0;
+   uint16_t idx, pci = 0;
+   uint64_t nci;
    Cells_to_be_Activated_List_Item_t cell;
 
    for(idx=0; idx<cellsToActivate.list.count; idx++)
@@ -14445,7 +14933,7 @@ uint8_t extractCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate)
 
       if(cell.nRPCI)
       {
-        pci = *cell.nRPCI;
+         pci = *cell.nRPCI;
       }
       ret = duProcCellsToBeActivated(cell.nRCGI.pLMN_Identity.buf, nci, pci);
    }
@@ -14699,7 +15187,8 @@ uint8_t duProcGnbDuCfgUpdAckMsg(uint8_t transId)
 {
    uint8_t  ieIdx=0, arrIdx=0,ret=ROK;
    uint8_t  ueId =0 , ueIdx =0, totalActiveUe = 0;
-   uint16_t cellId =0, cellIdx =0, crnti=0;
+   uint16_t cellIdx =0, crnti=0;
+   uint64_t cellId =0;
    CmLList *f1apPduNode = NULLP;
    ReservedF1apPduInfo *f1apPduInfo =NULLP;
    F1AP_PDU_t *f1apMsgPdu = NULLP;
@@ -14755,7 +15244,7 @@ uint8_t duProcGnbDuCfgUpdAckMsg(uint8_t transId)
                            if(ret == RFAILED)
                            {
                               DU_LOG("\nERROR  --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to send cell delete\
-                              request for cellId[%d]", cellId);
+                              request for cellId[%lu]", cellId);
                            }
                         }
                         else
@@ -14776,7 +15265,7 @@ uint8_t duProcGnbDuCfgUpdAckMsg(uint8_t transId)
                               if(ret == RFAILED)
                               {
                                  DU_LOG("\nERROR  --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to build and send UE delete\
-                                 request for cellId[%d]", cellId);
+                                 request for cellId[%lu]", cellId);
                               }
                               ueIdx++;
                               totalActiveUe--;
@@ -14785,7 +15274,7 @@ uint8_t duProcGnbDuCfgUpdAckMsg(uint8_t transId)
                      }
                      else
                      {
-                        DU_LOG("\nERROR  --> DU_APP : duProcGnbDuCfgUpdAckMsg(): CellId [%d] not found", cellId);
+                        DU_LOG("\nERROR  --> DU_APP : duProcGnbDuCfgUpdAckMsg(): CellId [%lu] not found", cellId);
                         ret = RFAILED;
                      }
                      break;
@@ -15261,7 +15750,7 @@ uint8_t BuildAndSendUeContextModRsp(DuUeCb *ueCb)
 
    DU_LOG("\nINFO  -->  F1AP : Building UE context modification response\n");
 
-   while(1)
+   while(true)
    {
       DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
       if(f1apMsg == NULLP)
@@ -16517,14 +17006,13 @@ void freeAperDecodePagingMsg(Paging_t   *paging)
 uint8_t procPagingMsg(F1AP_PDU_t *f1apMsg) 
 {
    uint8_t ieIdx = 0, cellListIdx = 0;
-   uint16_t cellId = 0;
+   uint64_t cellId = 0;
    Paging_t   *paging = NULLP;
    PagingCell_list_t  *pagingCelllist = NULLP;
    PagingCell_ItemIEs_t *pagingCellItemIes = NULLP;
    PagingCell_Item_t *pagingCellItem = NULLP;
    DuPagingMsg *tmpPagingParam = NULLP;
 
-   DU_LOG("\nINFO  --> DU APP : Processing the Paging Message");
    paging = &f1apMsg->choice.initiatingMessage->value.choice.Paging;
    if(paging)
    {
@@ -16604,7 +17092,7 @@ uint8_t procPagingMsg(F1AP_PDU_t *f1apMsg)
                                  bitStringToInt(&pagingCellItem->nRCGI.nRCellIdentity, &cellId);
                                  if(processPagingMsg(cellId, tmpPagingParam) != ROK)
                                  {
-                                    DU_LOG("\nERROR  --> DU APP : Paging Processing Failed at CellId:%d",cellId);
+                                    DU_LOG("\nERROR  --> DU APP : Paging Processing Failed at CellId:%lu",cellId);
                                     continue;
                                  }
                               }