[Epic-ID: ODUHIGH-463][Task-ID: ODUHIGH-506]UE Context Modification Req/Rsp at Source...

Change-Id: Ib5bf11ce75b828f414f7fb862ef9ea9f805c07c8
Signed-off-by: lal.harshita <Harshita.Lal@radisys.com>

diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c
index a40b865..5da2175 100644 (file)
--- a/src/cu_stub/cu_f1ap_msg_hdl.c
+++ b/src/cu_stub/cu_f1ap_msg_hdl.c
@@ -9724,7 +9724,7 @@ uint8_t procUeContextSetupResponse(uint32_t duId, F1AP_PDU_t *f1apMsg, char *rec
          return RFAILED;
       }     
    }
-   else if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+   else
    {
       if(ueCb->hoInfo.HOType == Inter_DU_HO)
       {
@@ -9778,7 +9778,7 @@ uint8_t procUeContextSetupResponse(uint32_t duId, F1AP_PDU_t *f1apMsg, char *rec
       }
       else if(ueCb->hoInfo.HOType == Xn_Based_Inter_CU_HO)
       {
-         BuildAndSendHOReqAck(ueCb, recvBuf, recvBufLen);
+         BuildAndSendHOReqAck(ueCb, duToCuRrcContainer->buf, duToCuRrcContainer->size);
       }
    }
 
@@ -11968,7 +11968,13 @@ uint8_t procUeContextModificationResponse(uint32_t duId, F1AP_PDU_t *f1apMsg, ch
                    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) && (ueCb->hoInfo.HOType == Xn_Based_Inter_CU_HO))
+                   /* In case UE context modification response is received at source GNB CU from source GNB DU 
+                    * for a UE in handover, send HO request to target GNB only if not sent already.
+                    * If HO Req is already sent to target GNB, and an HO Req Ack is received, then 
+                    * ueCb->hoInfo.cuUeF1apIdTgt will be non-zero
+                    */
+                   if((ueCb->state == UE_HANDOVER_IN_PROGRESS) && (ueCb->hoInfo.HOType == Xn_Based_Inter_CU_HO) && \
+                      (ueCb->hoInfo.cuUeF1apIdTgt == 0))
                    {
                       BuildAndSendHOReq(ueCb, recvBuf, recvBufLen);
                    }

diff --git a/src/cu_stub/cu_xnap_msg_hdl.c b/src/cu_stub/cu_xnap_msg_hdl.c
index 436809a..c3e01aa 100644 (file)
--- a/src/cu_stub/cu_xnap_msg_hdl.c
+++ b/src/cu_stub/cu_xnap_msg_hdl.c
@@ -316,23 +316,89 @@ void BuildAndSendHOReqAck(CuUeCb *ueCb, char *xnMsg, MsgLen xnMsgLen)
  *    Function : XNAPProcHandoverReqAck
  *
  *    Functionality:
- *       1. Unpack CU UE F1AP ID (by SCU) and search for UE CB and
+ *       1. Unpack CU UE F1AP ID (by SCU) and fetch UE CB and
  *          the corresponding DU DB (SDU)
  *       2. Unpack CU UE F1AP ID (by TCU) and fill in UEcb->hoInfo
- *       3. Decode the F1AP UE context setup response msg received in 
- *          XNAP message buffer and extract UE configurations
- *       4. Create RRC reconfig msg with these configurations
- *       5. Send RRC Reconfig msg and Transmission Action = DO NOT TRANSMIT
- *          in UE context modification request to S DU
+ *       3. Decode DU to CU RRC Container received in XNAP message 
+ *          buffer and extract UE configurations.
+ *       4. Send UE Context modification response to SDU conatining 
+ *          RRC Reconfig Message and command to stop transmission
+ *          to UE in handover.
  *
- * @params[in] Pointer to destination Id
+ * @params[in] Destination Id
  *             Pointer to message buffer
  * @return void
  *
  ******************************************************************/
 void XNAPProcHandoverReqAck(uint32_t destId, Buffer *mBuf)
 {
+   uint8_t   duIdx, duId, ueIdx;
+   uint8_t   cuUeF1apIdSrc;
+   uint8_t   cuUeF1apIdTgt;
+   DuDb      *duDb;
+   CuUeCb    *ueCb;
+
    DU_LOG("\nINFO  -->  CU STUB : Received Handover Request Acknowledgement");
+   
+   /* Fetch UE CB and DU DB in Source CU for UE under Inter-CU Handover */
+   CMCHKUNPK(oduPackUInt8, &(cuUeF1apIdSrc), mBuf);
+   for(duIdx = 0; duIdx < cuCb.numDu; duIdx++)
+   {
+      for(ueIdx = 0; ueIdx < MAX_NUM_CELL * MAX_NUM_UE; ueIdx++)
+      {
+         if(cuCb.duInfo[duIdx].ueCb[ueIdx].gnbCuUeF1apId == cuUeF1apIdSrc)
+         {
+            duDb = &cuCb.duInfo[duIdx];
+            ueCb = &cuCb.duInfo[duIdx].ueCb[ueIdx];
+            break;
+         }
+      }
+      if(duDb && ueCb)
+         break;
+   }
+   if(!duDb || !ueCb)
+   {
+      DU_LOG("\nERROR  -->  CU STUB : UE CB not found for CU UE F1AP ID [%d]", cuUeF1apIdSrc);
+      return;
+   }
+
+   /* Decode CU UE F1AP ID assigned by Target CU to UE in handover and store 
+    * this in hoInfo block for use during future message exchange between the
+    * two CUs */
+   CMCHKUNPK(oduPackUInt8, &(cuUeF1apIdTgt), mBuf);
+   ueCb->hoInfo.cuUeF1apIdTgt = cuUeF1apIdTgt; 
+
+   /* Decode DU to CU RRC Container received in Xn Msg */
+   OCTET_STRING_t rrcCont;
+   MsgLen copyCnt;
+
+   /* Copy mBuf into char array to decode it */
+   memset(&rrcCont, 0, sizeof(OCTET_STRING_t));
+   ODU_GET_MSG_LEN(mBuf, &rrcCont.size);
+   CU_ALLOC(rrcCont.buf, rrcCont.size);
+   if(rrcCont.buf == NULLP)
+   {
+      DU_LOG("\nERROR  -->  XNAP : Memory allocation failed");
+      return;
+   }
+   if(ODU_COPY_MSG_TO_FIX_BUF(mBuf, 0, rrcCont.size, (Data *)rrcCont.buf, &copyCnt) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed while copying %d", copyCnt);
+      return;
+   }
+
+   /* Extract DU to CU RRC container information and store in UE CB */
+   extractDuToCuRrcCont(ueCb, rrcCont);
+
+   CU_FREE(rrcCont.buf, rrcCont.size);
+
+   /* Send UE Context Modification request after filling it using the information received in
+    * Xn Handover Request Ack */
+   if(BuildAndSendUeContextModificationReq(duDb->duId, ueCb, STOP_DATA_TX) != ROK)
+   {
+      DU_LOG("\nERROR  ->  F1AP : Failed at BuildAndSendUeContextModificationReq()");
+      return;
+   }
 }
 
 /*******************************************************************