X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_ue_mgr.c;h=ae9f09fd73b6e8478e054dc8de8ae930d2be2f30;hb=c477bb2f645c5ece7da9155197663af745bd3791;hp=5fb75f910911a99d8a39b95af40a9d7afc2513cb;hpb=438594773b3c93b5bbe8d1cb1d16626a02238b8b;p=o-du%2Fl2.git

diff --git a/src/du_app/du_ue_mgr.c b/src/du_app/du_ue_mgr.c
index 5fb75f910..ae9f09fd7 100644
--- a/src/du_app/du_ue_mgr.c
+++ b/src/du_app/du_ue_mgr.c
@@ -34,51 +34,154 @@
 #include "du_f1ap_msg_hdl.h"
 #include "du_ue_mgr.h"
 
-#ifdef EGTP_TEST
-uint32_t sduId = 0;
-#endif
-
 DuMacDlCcchInd packMacDlCcchIndOpts[] =
 {
-   packMacDlCcchInd,   /* Loose coupling */
-   MacProcDlCcchInd,    /* TIght coupling */
-   packMacDlCcchInd    /* Light weight-loose coupling */
+   packMacDlCcchInd,           /* Loose coupling */
+   MacProcDlCcchInd,           /* TIght coupling */
+   packMacDlCcchInd            /* Light weight-loose coupling */
 };
 
 DuMacUeCreateReq packMacUeCreateReqOpts[] =
 {
    packDuMacUeCreateReq,       /* Loose coupling */
-   MacProcUeCreateReq,          /* TIght coupling */
-   packDuMacUeCreateReq       /* Light weight-loose coupling */
+   MacProcUeCreateReq,         /* TIght coupling */
+   packDuMacUeCreateReq        /* Light weight-loose coupling */
 };
 
 DuRlcUeCreateReq packRlcUeCreateReqOpts[] =
 {
    packDuRlcUeCreateReq,       /* Loose coupling */
-   RlcProcUeCreateReq,          /* TIght coupling */
-   packDuRlcUeCreateReq       /* Light weight-loose coupling */
+   RlcProcUeCreateReq,         /* TIght coupling */
+   packDuRlcUeCreateReq        /* Light weight-loose coupling */
 };
 
 DuDlRrcMsgToRlcFunc duSendDlRrcMsgToRlcOpts[] =
 {
    packDlRrcMsgToRlc,          /* Loose coupling */ 
-   RlcProcDlRrcMsgTransfer,       /* Tight coupling */
+   RlcProcDlRrcMsgTransfer,    /* Tight coupling */
    packDlRrcMsgToRlc           /* Light weight-loose coupling */
 };
 
 DuRlcUeReconfigReq packRlcUeReconfigReqOpts[] =
 {
-   packDuRlcUeReconfigReq,       /* Loose coupling */
+   packDuRlcUeReconfigReq,     /* Loose coupling */
    RlcProcUeReconfigReq,       /* TIght coupling */
-   packDuRlcUeReconfigReq       /* Light weight-loose coupling */
+   packDuRlcUeReconfigReq      /* Light weight-loose coupling */
 };
 
 DuMacUeReconfigReq packMacUeReconfigReqOpts[] =
 {
-   packDuMacUeReconfigReq,       /* Loose coupling */
+   packDuMacUeReconfigReq,     /* Loose coupling */
    MacProcUeReconfigReq,       /* TIght coupling */
-   packDuMacUeReconfigReq     /* Light weight-loose coupling */
+   packDuMacUeReconfigReq      /* Light weight-loose coupling */
+};
+
+DuRlcDlUserDataToRlcFunc duSendRlcDlUserDataToRlcOpts[] =
+{
+   packRlcDlUserDataToRlc,        /* Loose coupling */ 
+   RlcProcDlUserDataTransfer,  /* Tight coupling */
+   packRlcDlUserDataToRlc         /* Light weight-loose coupling */
 };
+
+/*******************************************************************
+ *
+ * @brief Function to fillDlUserDataInfo
+ *
+ * @details
+ *
+ *    Function : fillDlUserDataInfo
+ *
+ *    Functionality:
+ *      Function to fillDlUserDataInfo
+ *
+ * @params[in] teId,
+ *             dlDataMsgInfo
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t fillDlUserDataInfo(uint32_t teId, RlcDlUserDataInfo *dlDataMsgInfo)
+{
+   uint8_t drbIdx;
+
+   for(drbIdx = 0; drbIdx < duCb.numDrb; drbIdx++)
+   {
+      if(duCb.upTnlCfg[drbIdx] && (duCb.upTnlCfg[drbIdx]->tnlCfg1 != NULLP))
+      {
+        if(duCb.upTnlCfg[drbIdx]->tnlCfg1->teId == teId)
+	{
+	   dlDataMsgInfo->cellId = duCb.upTnlCfg[drbIdx]->cellId;
+	   dlDataMsgInfo->ueIdx = duCb.upTnlCfg[drbIdx]->ueIdx;
+           dlDataMsgInfo->rbId = duCb.upTnlCfg[drbIdx]->drbId;
+	   return ROK;
+	}
+      }
+   }
+   return RFAILED;
+}
+
+ /*******************************************************************
+ *
+ * @brief Build and Send DL Data Message transfer to RLC
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendDlUserDataToRlc
+ *
+ *    Functionality:
+ *      Build and Send DL Data Message transfer to RLC
+ *
+ * @params[in] Cell ID
+ *             UE Index
+ *             Logical Channgel ID
+ *             RRC Message
+ *             RRC Message Length
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duBuildAndSendDlUserDataToRlc(uint16_t msgLen, EgtpMsg *egtpMsg)
+{
+   uint8_t ret = RFAILED;
+   Pst     pst;
+   RlcDlUserDataInfo *dlDataMsgInfo = NULLP;
+
+   DU_ALLOC_SHRABL_BUF(dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+   if(!dlDataMsgInfo)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Memory allocation failed for dlDataMsgInfo in duHdlEgtpDlData()");
+      return RFAILED;
+   }
+   memset(dlDataMsgInfo, 0, sizeof(RlcDlUserDataInfo));
+   if(ODU_GET_MSG_BUF(DU_APP_MEM_REGION, DU_POOL, &dlDataMsgInfo->dlMsg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Memory allocation failed for dlMsg in duHdlEgtpDlData()");
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+      return RFAILED;
+   }
+   dlDataMsgInfo->dlMsg = egtpMsg->msg;
+   dlDataMsgInfo->msgLen = msgLen;
+
+   /* Filling DL DATA Msg Info */
+   if(fillDlUserDataInfo(egtpMsg->msgHdr.teId, dlDataMsgInfo) == ROK)
+   {
+      /* Filling post structure and sending msg */ 
+      FILL_PST_DUAPP_TO_RLC(pst, RLC_DL_INST, EVENT_DL_USER_DATA_TRANS_TO_RLC);
+      DU_LOG("\nDEBUG  -->  DU_APP : Sending User Data Msg to RLC \n");
+      ret = (*duSendRlcDlUserDataToRlcOpts[pst.selector])(&pst, dlDataMsgInfo);
+   }
+   if(ret != ROK)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Failed to send User Data to RLC in duHdlEgtpDlData()");
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlDataMsgInfo->dlMsg, msgLen);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+   }
+   return ret;
+}
+
 /*******************************************************************
  *
  * @brief Handles EGTP data from CU 
@@ -97,50 +200,21 @@ DuMacUeReconfigReq packMacUeReconfigReqOpts[] =
  * ****************************************************************/
 uint8_t duHdlEgtpDlData(EgtpMsg  *egtpMsg)
 {
-
-   /* TODO : Extract RbId/UeID/CellID/SduId from database
-      using tunnel id in egtp header */
-
-   DU_LOG("\nDEBUG   -->  DU_APP : Processing DL data");
-#ifdef EGTP_TEST
-   Pst pst;
-   uint8_t ret;
-   MsgLen copyLen;
-   RlcDlRrcMsgInfo  *dlRrcMsgInfo = NULLP;
-
-   DU_ALLOC_SHRABL_BUF(dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo));
-   if(!dlRrcMsgInfo)
+   uint16_t msgLen = 0;
+   DU_LOG("\nDEBUG  --> DU_APP : Processing DL data in duHdlEgtpDlData()");
+   
+   if(!egtpMsg->msg)
    {
-      DU_LOG("\nDU APP : Memory allocation failed for dlRrcMsgInfo in \
-         duBuildAndSendDlRrcMsgToRlc");
-      ODU_PUT_MSG_BUF(egtpMsg->msg);
+      DU_LOG("\nERROR  -->  DU_APP : Recevied Dl Data is NULLP in duHdlEgtpDlData()");
       return RFAILED;
    }
-
-   /* Filling up the RRC msg info */
-   dlRrcMsgInfo->cellId = NR_CELL_ID;
-   dlRrcMsgInfo->ueIdx = UE_ID;
-   dlRrcMsgInfo->rbType = CM_LTE_DRB;
-   dlRrcMsgInfo->rbId   = RB_ID;
-   dlRrcMsgInfo->lcType = CM_LTE_LCH_DTCH;
-   dlRrcMsgInfo->lcId   = 4;
-   dlRrcMsgInfo->execDup = false;
-   dlRrcMsgInfo->deliveryStaRpt = false;
-   ODU_GET_MSG_LEN(egtpMsg->msg, &dlRrcMsgInfo->msgLen);
-   DU_ALLOC_SHRABL_BUF(dlRrcMsgInfo->rrcMsg, dlRrcMsgInfo->msgLen);
-   ODU_COPY_MSG_TO_FIX_BUF(egtpMsg->msg, 0, dlRrcMsgInfo->msgLen, dlRrcMsgInfo->rrcMsg, (MsgLen *)&copyLen);
-   ODU_PUT_MSG_BUF(egtpMsg->msg);
-
-   /* Filling post structure and sending msg */
-   FILL_PST_DUAPP_TO_RLC(pst, RLC_DL_INST, EVENT_DL_RRC_MSG_TRANS_TO_RLC);
-   DU_LOG("\nDU_APP: Sending Dl User Msg to RLC \n");
-   ret = (*duSendDlRrcMsgToRlcOpts[pst.selector])(&pst, dlRrcMsgInfo);
-   if(ret != ROK)
+   ODU_GET_MSG_LEN(egtpMsg->msg, (MsgLen *)&msgLen);
+   if(duBuildAndSendDlUserDataToRlc(msgLen, egtpMsg) != ROK)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo));
+      DU_LOG("\nERROR  -->  DU_APP : Failed to build DL USer Data in duHdlEgtpDlData()");
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, egtpMsg->msg, msgLen);
       return RFAILED;
    }
-#endif
    return ROK;
 }
 
@@ -920,7 +994,6 @@ uint8_t fillAmbr(AmbrCfg **macAmbr, AmbrCfg *ueDbAmbr)
       }
       memset(*macAmbr, 0, sizeof(AmbrCfg));
       (*macAmbr)->ulBr = ueDbAmbr->ulBr;
-      (*macAmbr)->dlBr = ueDbAmbr->dlBr;
    }
    else
    {
@@ -1057,59 +1130,64 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \
       ret = procUeReCfgCellInfo(macUeCfg, ueCfgDb->cellGrpCfg);
       if(ret == ROK)
       {
-         if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent)
-	 {
-	    fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\
-	       &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL);
-	 }
-	 if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent)
+         if(macUeCfg->spCellCfgPres == true)
          {
-            fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
-	       NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
+            if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent)
+            {
+               fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\
+                     &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL);
+            }
+            if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent)
+            {
+               fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
+                     NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
+            }
+         }
+         ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg);
+         if(ueCfgDb->ueNrCapability != NULLP)
+         {
+            duFillModulationDetails(macUeCfg, duMacDb, ueCfgDb->ueNrCapability);
          }
-	 ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg);
-        
-         duFillModulationDetails(macUeCfg, duMacDb, ueCfgDb->ueNrCapability);
       }
 
       /* Filling LC Context */
       for(dbIdx = 0; (dbIdx < ueCfgDb->numMacLcs && ret == ROK); dbIdx++)
       {
-	 if(!ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres)
-	 {
-	    /* Filling default UL LC config in MAC if not present */
-	    ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres = true;
-	    fillDefaultUlLcCfg(&ueCfgDb->macLcCfg[dbIdx].ulLcCfg);
-	 }
-	 for(lcIdx = 0; lcIdx < duMacDb->numLcs; lcIdx++)
-	 {
-	    if(ueCfgDb->macLcCfg[dbIdx].lcId == duMacDb->lcCfgList[lcIdx].lcId)
-	    {
-	       lcIdFound = true;
-	       if((ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_UNKNOWN) ||
-		     (ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_MOD))
-	       {
-		  ueCfgDb->macLcCfg[dbIdx].configType = CONFIG_MOD;
-		  ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]);
-	       }
-	    }
-	    else
-	       lcIdFound = false;
-	 }
-	 if(!lcIdFound)
-	 {
-	    /* ADD/DEL CONFIG */
-	    ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]);
-	 }
-	 if(ret == ROK)
-	 {
-	    macUeCfg->numLcs++;
-	 }
-	 else
-	 {
-	    DU_LOG("\nERROR  -->  DU APP : Failed to add Lc at Idx %d in fillMacUeCfg()", dbIdx); 
-	    break;
-	 }
+         if(!ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres)
+         {
+            /* Filling default UL LC config in MAC if not present */
+            ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres = true;
+            fillDefaultUlLcCfg(&ueCfgDb->macLcCfg[dbIdx].ulLcCfg);
+         }
+         for(lcIdx = 0; lcIdx < duMacDb->numLcs; lcIdx++)
+         {
+            if(ueCfgDb->macLcCfg[dbIdx].lcId == duMacDb->lcCfgList[lcIdx].lcId)
+            {
+               lcIdFound = true;
+               if((ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_UNKNOWN) ||
+                     (ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_MOD))
+               {
+                  ueCfgDb->macLcCfg[dbIdx].configType = CONFIG_MOD;
+                  ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]);
+               }
+            }
+            else
+               lcIdFound = false;
+         }
+         if(!lcIdFound)
+         {
+            /* ADD/DEL CONFIG */
+            ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]);
+         }
+         if(ret == ROK)
+         {
+            macUeCfg->numLcs++;
+         }
+         else
+         {
+            DU_LOG("\nERROR  -->  DU APP : Failed to add Lc at Idx %d in fillMacUeCfg()", dbIdx); 
+            break;
+         }
       }/*End of Outer FOR loop */
    }
    return ret;
@@ -1140,8 +1218,8 @@ void fillDefaultAmInfo(AmBearerCfg *amCfg)
  
    /* UL AM */
    amCfg->ulAmCfg.snLenUl     = AM_SIZE_12;
-   amCfg->ulAmCfg.reAssemTmr  = RE_ASM_40MS; 
-   amCfg->ulAmCfg.statProhTmr = PROH_35MS;
+   amCfg->ulAmCfg.reAssemTmr  = T_REASSEMBLY_VAL; 
+   amCfg->ulAmCfg.statProhTmr = T_STATUS_PROHIBHIT_VAL;
 }
 
 /******************************************************************
@@ -1162,7 +1240,7 @@ void fillDefaultUmBiInfo(UmBiDirBearerCfg *umBiDirCfg)
 {
    /* UL UM BI DIR INFO */
    umBiDirCfg->ulUmCfg.snLenUlUm = UM_SIZE_12;
-   umBiDirCfg->ulUmCfg.reAssemTmr = RE_ASM_40MS;
+   umBiDirCfg->ulUmCfg.reAssemTmr = T_REASSEMBLY_VAL;
 
    /* DL UM BI DIR INFO */
    umBiDirCfg->dlUmCfg.snLenDlUm  = UM_SIZE_12;
@@ -1185,7 +1263,7 @@ void fillDefaultUmBiInfo(UmBiDirBearerCfg *umBiDirCfg)
 void fillDefaultUmUlInfo(UmUniDirUlBearerCfg *UmUlCfg)
 {
    UmUlCfg->ulUmCfg.snLenUlUm = UM_SIZE_12;
-   UmUlCfg->ulUmCfg.reAssemTmr = RE_ASM_40MS;
+   UmUlCfg->ulUmCfg.reAssemTmr = T_REASSEMBLY_VAL;
 }
 
 /******************************************************************
@@ -1800,6 +1878,190 @@ uint8_t duUpdateRlcLcCfg(RlcUeCfg *rlcUeCfg, F1UeContextSetupDb *f1UeDb)
 }
 
 
+/*******************************************************************
+ *
+ * @brief Function to fill Tunnel Config to Add/Mod
+ * 
+ *
+ * @details
+ *
+ *    Function : fillTnlCfgToAddMod
+ *
+ *    Functionality: Function to fill tunnel Config to Add/Mod
+ *
+ * @params[in] Pointer to tnlCfgDb,
+ *             pointer to f1TnlCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillTnlCfgToAddMod(UpTnlCfg **ueCbTnlCfg, UpTnlCfg *f1TnlCfg)
+{
+   if(*ueCbTnlCfg == NULLP)
+   {
+      /* copying to DuCb Tnl Cfg */
+      DU_ALLOC(*ueCbTnlCfg, sizeof(UpTnlCfg));
+      if(*ueCbTnlCfg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  DU_APP : fillTnlCfgToAddMod: Memory Alloc failed for drbId[%d]", f1TnlCfg->drbId);
+         return RFAILED;
+      }
+   }
+   memset(*ueCbTnlCfg, 0, sizeof(UpTnlCfg));
+   (*ueCbTnlCfg)->configType = f1TnlCfg->configType;
+   (*ueCbTnlCfg)->cellId    = f1TnlCfg->cellId;
+   (*ueCbTnlCfg)->ueIdx     = f1TnlCfg->ueIdx;
+   (*ueCbTnlCfg)->drbId     = f1TnlCfg->drbId;
+   if(f1TnlCfg->tnlCfg1)
+   {
+      if((*ueCbTnlCfg)->tnlCfg1 == NULLP)
+      {
+         DU_ALLOC((*ueCbTnlCfg)->tnlCfg1, sizeof(GtpTnlCfg));
+         if((*ueCbTnlCfg)->tnlCfg1 == NULLP)
+         {
+            DU_LOG("\nERROR  -->  DU_APP : fillTnlCfgToAddMod: Memory Alloc failed for tnlCfg1 for drbId[%d]", f1TnlCfg->drbId);
+            return RFAILED;
+         }
+      }
+      memset((*ueCbTnlCfg)->tnlCfg1, 0, sizeof(GtpTnlCfg));
+      (*ueCbTnlCfg)->tnlCfg1->teId = f1TnlCfg->tnlCfg1->teId;
+      (*ueCbTnlCfg)->tnlCfg1->ulTnlAddress = f1TnlCfg->tnlCfg1->ulTnlAddress;
+      (*ueCbTnlCfg)->tnlCfg1->dlTnlAddress = f1TnlCfg->tnlCfg1->dlTnlAddress;
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Processing the tunnel Request to EGTP
+ *        
+ * @details
+ *
+ *    Function : duProcEgtpTunnelCfg
+ *
+ *    Functionality: Processing the tunnel Request to EGTP
+ *
+ * @params[in] UptnlCfg *duTnlCfg, UpTnlCfg *f1TnlCfg 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duProcEgtpTunnelCfg(uint8_t ueCbIdx, UpTnlCfg *duTnlCfg, UpTnlCfg *f1TnlCfg)
+{
+   uint8_t ret = RFAILED, delIdx;
+
+   if(f1TnlCfg->tnlCfg1 == NULLP)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Tunnel config not found");
+      return ret;
+   }
+
+   if(f1TnlCfg->configType == CONFIG_ADD)
+   {
+      if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_ADD, NULLP, f1TnlCfg->tnlCfg1) == ROK)
+      {
+	 if(fillTnlCfgToAddMod(&duCb.upTnlCfg[duCb.numDrb], f1TnlCfg) == ROK)
+	 {
+	    duCb.numDrb++;
+	    ret = ROK;
+	 }
+      }      
+   }
+   else if(f1TnlCfg->configType == CONFIG_MOD)
+   {
+      if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_MOD, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK)
+      {
+	 if(fillTnlCfgToAddMod(&duTnlCfg, f1TnlCfg) == ROK)
+	 {
+	    ret = ROK;
+	 }
+      }   
+   }
+   else if(f1TnlCfg->configType == CONFIG_DEL)
+   {
+      if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_DEL, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK)
+      {	   
+	 /* Free memory at drbIdx */
+	 DU_FREE(duTnlCfg->tnlCfg1, sizeof(GtpTnlCfg));
+	 DU_FREE(duTnlCfg, sizeof(UpTnlCfg));
+	 duCb.numDrb--;
+	 for(delIdx = ueCbIdx; delIdx < duCb.numDrb; delIdx++)
+	 {
+	    /* moving all elements one index ahead */
+	    ret = fillTnlCfgToAddMod(&duCb.upTnlCfg[delIdx], duCb.upTnlCfg[delIdx+1]);
+	    if(ret != ROK)
+	    {
+	       return ret;
+	    }
+	 }
+      }   
+   }
+   return ret;
+}
+
+/***********************************************************************
+ *
+ * @brief Function to fill Tunnel Config
+ *        and sends tunnel Req to EGTP
+ * 
+ *
+ * @details
+ *
+ *    Function : duUpdateTunnelCfgDb
+ *
+ *    Functionality: Function to fill tunnel Config
+ *                   and sends tunnel Cfg Req to EGTP
+ *
+ * @params[in] ueIdx, cellId, DuUeCfg 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duUpdateTunnelCfgDb(uint8_t ueIdx, uint8_t cellId, DuUeCfg *duUeCfg)
+{
+   uint8_t ret = ROK, drbIdx, duCbDrbIdx;
+   bool drbFound = false;
+
+   /*If Add/Mod tunnels request for that DRB is successful in EGTP */
+   /*then update drbId and tunnel Info in duCb */
+   for(drbIdx=0; drbIdx < duUeCfg->numDrb; drbIdx++)
+   {
+      duUeCfg->upTnlInfo[drbIdx].cellId = cellId;
+      duUeCfg->upTnlInfo[drbIdx].ueIdx = ueIdx;
+      for(duCbDrbIdx = 0; duCbDrbIdx < duCb.numDrb; duCbDrbIdx++)
+      {
+	 if(duCb.upTnlCfg[duCbDrbIdx]->drbId == duUeCfg->upTnlInfo[drbIdx].drbId)
+	 {
+	    drbFound = true; /* existing DRB */
+	    if(duProcEgtpTunnelCfg(duCbDrbIdx, duCb.upTnlCfg[duCbDrbIdx], &duUeCfg->upTnlInfo[drbIdx]) != ROK)
+	    {
+	       DU_LOG("\nERROR  -> DU_APP : duUpdateTunnelCfgDb: Failed to modify tunnel req for Drb id[%d]",
+	       duUeCfg->upTnlInfo[drbIdx].drbId);
+	       ret = RFAILED;
+	    }
+	    break;
+	 }
+	 else
+	    drbFound = false;
+      }
+      if(!drbFound && ret == ROK)/* new DRB to Add */
+      {
+	 if(duProcEgtpTunnelCfg(NULLP, NULLP, &duUeCfg->upTnlInfo[drbIdx]) != ROK)
+	 {
+            DU_LOG("\nERROR  -> DU_APP : duUpdateTunnelCfgDb: Failed to add tunnel req for Drb id[%d]",
+	    duUeCfg->upTnlInfo[drbIdx].drbId);
+	    ret = RFAILED;
+	    break;
+	 }
+      }
+      else
+         break;
+   }
+   return ret;
+}
+
 /*******************************************************************
  *
  * @brief @brief To update DuUeCb Mac and Rlc Ue Cfg
@@ -1845,6 +2107,14 @@ uint8_t duUpdateDuUeCbCfg(uint8_t ueIdx, uint8_t cellId)
          ret = duUpdateMacCfg(&ueCb->macUeCfg, ueCb->f1UeDb);
          if(ret == RFAILED)
             DU_LOG("\nERROR  -->  DU APP : Failed while updating MAC LC Config at duUpdateDuUeCbCfg()");
+         else
+	 {
+	    if(duUpdateTunnelCfgDb(ueIdx, cellId, &ueCb->f1UeDb->duUeCfg) != ROK)
+	    {
+               DU_LOG("\nERROR  -->  DU_APP : Failed to establish tunnel in duUpdateDuUeCbCfg()");
+	       return RFAILED;
+	    }
+	 }
       }
       else
          DU_LOG("\nERROR  -->  DU APP : Failed while updating RLC LC Config at duUpdateDuUeCbCfg()");
@@ -1878,27 +2148,31 @@ uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp)
       if(cfgRsp->result == MAC_DU_APP_RSP_OK)
       {
          if(pst->event == EVENT_MAC_UE_CREATE_RSP)
-	 {
+         {
             DU_LOG("\nINFO   -->  DU APP : MAC UE Create Response : SUCCESS [UE IDX : %d]", cfgRsp->ueIdx);
             duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
-	       macUeCfg.macUeCfgState = UE_CREATE_COMPLETE;
-	 }
+               macUeCfg.macUeCfgState = UE_CREATE_COMPLETE;
+         }
          else if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
          {
             DU_LOG("\nINFO   -->  DU APP : MAC UE Reconfig Response : SUCCESS [UE IDX : %d]", cfgRsp->ueIdx);
             duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
-	       macUeCfg.macUeCfgState = UE_RECFG_COMPLETE;
+               macUeCfg.macUeCfgState = UE_RECFG_COMPLETE;
             if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK)
+            {
                BuildAndSendUeCtxtRsp(cfgRsp->ueIdx, cfgRsp->cellId);
+               duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+                  macUeCfg.macUeCfgState = 0;
+            }
          }
       }
       else
       {
          DU_LOG("\nERROR  -->  DU APP : MAC UE CFG Response for EVENT[%d]: FAILURE [UE IDX : %d]", pst->event, cfgRsp->ueIdx);
-	 if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
-	 {
-	    //TODO: Send the failure case in Ue Context Setup Response
-	 }
+         if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
+         {
+            //TODO: Send the failure case in Ue Context Setup Response
+         }
          ret = RFAILED;
       }
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacUeCfgRsp));
@@ -1997,29 +2271,33 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp)
       if(cfgRsp->result == RLC_DU_APP_RSP_OK)
       {
          if(pst->event == EVENT_RLC_UE_CREATE_RSP)
-	 {
-	    DU_LOG("\nINFO   -->  DU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
-	    duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
-	       rlcUeCfg.rlcUeCfgState = UE_CREATE_COMPLETE;
-	 }
-	 else if(pst->event == EVENT_RLC_UE_RECONFIG_RSP)
-	 {
+         {
+            DU_LOG("\nINFO   -->  DU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
+            duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+               rlcUeCfg.rlcUeCfgState = UE_CREATE_COMPLETE;
+         }
+         else if(pst->event == EVENT_RLC_UE_RECONFIG_RSP)
+         {
             DU_LOG("\nINFO   -->  DU_APP: RLC UE Reconfig Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
-	    duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
-	       rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE;
-	    if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK)
+            duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+               rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE;
+            if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK)
+            {
                BuildAndSendUeCtxtRsp(cfgRsp->ueIdx, cfgRsp->cellId);
-	 }
+               duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+                  rlcUeCfg.rlcUeCfgState = 0;
+            }   
+         }
       }
       else
       {
          DU_LOG("\nERROR  -->  DU_APP: RLC UE CFG Response for EVENT[%d] : FAILED [UE IDX : %d, REASON :%d]",\
-	    pst->event, cfgRsp->ueIdx, cfgRsp->reason);
-	 if((pst->event == EVENT_RLC_UE_RECONFIG_RSP))
-	 {
+               pst->event, cfgRsp->ueIdx, cfgRsp->reason);
+         if((pst->event == EVENT_RLC_UE_RECONFIG_RSP))
+         {
             //TODO: update failure case in ue Context setup Response
-	 }
-	 ret = RFAILED;
+         }
+         ret = RFAILED;
       }
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(RlcUeCfgRsp));
    }
@@ -2031,8 +2309,6 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp)
    return ret;
 }
 
-
-
 /*******************************************************************
  *
  * @brief Builds and Send Ue Reconfig Req to RLC
@@ -2182,11 +2458,20 @@ uint8_t DuProcRlcDlRrcMsgRsp(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg)
    {
       GET_UE_IDX(dlRrcMsg->crnti, ueIdx);
       ueCb = &duCb.actvCellLst[dlRrcMsg->cellId -1]->ueCb[ueIdx -1];
-      if(ueCb->f1UeDb)
+      if(ueCb->f1UeDb && ueCb->f1UeDb->dlRrcMsgPres)
       {
-        ret = duBuildAndSendUeContextSetupReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg);
-	if(ret == RFAILED)
-	   DU_LOG("\nERROR  -->  DU APP : Failed to process UE Context Setup Request in DuProcRlcDlRrcMsgRsp()");
+         if(ueCb->f1UeDb->actionType == UE_CTXT_SETUP)
+         {
+            ret = duBuildAndSendUeContextSetupReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg);
+            if(ret == RFAILED)
+               DU_LOG("\nERROR  -->  DU APP : Failed to process UE Context Setup Request in DuProcRlcDlRrcMsgRsp()");
+         }
+         if(ueCb->f1UeDb->actionType == UE_CTXT_MOD)
+         {
+            ret = duBuildAndSendUeContextModReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg);
+            if(ret == RFAILED)
+               DU_LOG("\nERROR  -->  DU APP : Failed to process UE Context Mod Request in DuProcRlcDlRrcMsgRsp()");
+         }
       }
    }
    else
@@ -2214,7 +2499,7 @@ uint8_t DuProcRlcDlRrcMsgRsp(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg)
 uint8_t duProcUeContextSetupRequest(DuUeCb *ueCb)
 {
    uint8_t ret, cellId;
-   
+
    ret = ROK;
    if(ueCb)
    {
@@ -2230,18 +2515,18 @@ uint8_t duProcUeContextSetupRequest(DuUeCb *ueCb)
             {
                DU_LOG("\nERROR  -->  DU APP : Failed to send DL RRC msg in duProcUeContextSetupRequest()");
                DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
-                  ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+                     ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
                DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
             }
          }
       }
-      else
+      else if(ueCb->f1UeDb->actionType == UE_CTXT_SETUP)
       {
          ret = duBuildAndSendUeContextSetupReq(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
-	 if(ret == RFAILED)
-	 {
+         if(ret == RFAILED)
+         {
             DU_LOG("\nERROR  -->  DU APP : Failed to build ue context setup Req in duProcUeContextSetupRequest()");
-	 }
+         }
       }
    }
    else
@@ -2252,6 +2537,99 @@ uint8_t duProcUeContextSetupRequest(DuUeCb *ueCb)
    return ret;
 }
 
+/*******************************************************************
+ *
+ * @brief Build and Send Ue context mod request
+ *
+ * @details
+ *
+ *
+ *    Function : duBuildAndSendUeContextModReq
+ *
+ *    Functionality: 
+ *     Build and Send Ue context mod request
+ * 
+ *  @params[in]  cellId, crnti, DuUeCfg pointer
+ *  @return ROK     - success
+ *          RFAILED - failure
+ * 
+ *****************************************************************/
+
+uint8_t duBuildAndSendUeContextModReq(uint16_t cellId, uint16_t crnti, DuUeCfg *duUeCfg)
+{
+   uint8_t ret = ROK;
+
+   DU_LOG("\nDEBUG   -->  DU_APP: Processing Ue Context Mod Request for cellId [%d]", cellId);
+   /* Filling RLC Ue Reconfig */ 
+   ret = duBuildAndSendUeReCfgReqToRlc(cellId, crnti, duUeCfg);
+   if(ret == RFAILED)
+      DU_LOG("\nERROR  -->  DU APP : Failed to build ctxt setup req for RLC at duBuildAndSendUeContextModReq()");
+   
+   /* Filling MAC Ue Reconfig */
+   ret = duBuildAndSendUeReCfgReqToMac(cellId, crnti, duUeCfg);
+   if(ret == RFAILED)
+      DU_LOG("\nERROR  -->  DU APP : Failed at build ctxt setup req for MAC at duBuildAndSendUeContextModReq()");
+
+   return ret;
+}
+/*******************************************************************
+ *
+ * @brief Processing Ue context mod request
+ *
+ * @details
+ *
+ *
+ *    Function : duProcUeContextModReq 
+ *
+ *    Functionality:
+ *        Processing  Ue context mod request
+ *
+ *  @params[in] DuUeCb *ueCb 
+ *  @return ROK     - success
+ *          RFAILED - failure
+ *
+ *****************************************************************/
+
+uint8_t duProcUeContextModReq(DuUeCb *ueCb)
+{
+   uint8_t ret, cellId;
+
+   ret = ROK;
+   if(ueCb)
+   {
+      cellId = duCb.actvCellLst[ueCb->f1UeDb->cellIdx]->cellId;
+      /* Send DL RRC msg for security Mode */
+      if(ueCb->f1UeDb->dlRrcMsg)
+      {
+         if(ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+         {
+            /* Sending DL RRC Message to RLC */
+            ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, ueCb->f1UeDb->dlRrcMsg);
+            if(ret == RFAILED)
+            {
+               DU_LOG("\nERROR  -->  DU APP : Failed to send DL RRC msg in duProcUeContextModReq()");
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
+                     ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+            }
+         }
+      }
+      else
+      {
+         ret = duBuildAndSendUeContextModReq(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
+         if(ret == RFAILED)
+         {
+            DU_LOG("\nERROR  -->  DU APP : Failed to build ue context setup Req in duProcUeContextModReq()");
+         }
+      }
+   }
+   else
+   {
+      //TODO: To send the failure cause in UeContextModRsp
+      DU_LOG("ERROR  -->  DU APP : Failed to process UE CNTXT MOD REQ at duProcUeContextModReq()");
+   }
+   return ROK;
+}
 /**********************************************************************
   End of file
  ***********************************************************************/