X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_msg_hdl.c;h=053fcf1b92a78f0db5ba6631e3008e4ffa509e38;hb=be7e4e372cc1d6f12f7af9c6b6d09a7ecedca58c;hp=ecf5a3e1374516857a1f7c06be01ca33805e94e1;hpb=8660dd47a5ef27b62300fabf6b027852f1d5d026;p=o-du%2Fl2.git

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index ecf5a3e13..053fcf1b9 100644
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -920,7 +920,7 @@ S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
                {
                   DU_LOG("\nDU_APP : SCTP communication UP");
                   //Setup F1-C
-                  if(ntfy->u.assocChange.assocId == f1Params.assocId & (!duCb.f1Status))
+                  if(ntfy->u.assocChange.assocId == f1Params.assocId)
                   {
                      /* Build and send F1 Setup response */
                      if(BuildAndSendF1SetupReq() != ROK)
@@ -929,7 +929,7 @@ S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
                      }
                   }
                   //Setup E2
-                  if(ntfy->u.assocChange.assocId == ricParams.assocId & (!duCb.e2Status))
+                  if(ntfy->u.assocChange.assocId == ricParams.assocId)
                   {
                      /* Build and send F1 Setup response */
                      if(BuildAndSendE2SetupReq() != ROK)
@@ -1175,7 +1175,9 @@ S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm)
       DU_LOG("\nDU_APP : Tunnel management confirm OK");
 
 #ifdef EGTP_TEST
-      duSendEgtpDatInd();
+      duSendUeCreateReqToRlc();
+
+      duSendEgtpTestData();
       
       /* For testing purpose. TTI thread should actually be in L1 */
       duStartTtiThread();
@@ -1190,38 +1192,52 @@ S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm)
    RETVALUE(ret);
 }
 
+S16 duSendEgtpDatInd(Buffer *mBuf)
+{
+   EgtpMsg  egtpMsg;
+
+   /* Fill EGTP header */
+   egtpMsg.msgHdr.msgType = EGTPU_MSG_GPDU;
+   egtpMsg.msgHdr.nPdu.pres = FALSE;
+   egtpMsg.msgHdr.seqNum.pres = FALSE;
+   egtpMsg.msgHdr.extHdr.udpPort.pres = FALSE;
+   egtpMsg.msgHdr.extHdr.pdcpNmb.pres = FALSE;
+   egtpMsg.msgHdr.teId = 1;
+   egtpMsg.msg = mBuf;
+   
+   egtpHdlDatInd(egtpMsg);
+
+   return ROK;
+
+}
+
 #ifdef EGTP_TEST
 /*******************************************************************
  *
- * @brief Simulate RLC to EGTP data indication 
+ * @brief Simulate UL Data for intial test
  *
  * @details
  *
- *    Function : duSendEgtpDatInd
+ *    Function : duSendEgtpTestData
  *
  *    Functionality:
- *      Simulate RLC to EGTP data indication
+ *      Simulate UL data for initial test
  *
  * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 duSendEgtpDatInd()
+S16 duSendEgtpTestData()
 {
    char data[30] = "This is EGTP data from DU";
    int datSize = 30;
 
    Buffer   *mBuf;
-   EgtpMsg  egtpMsg;
 
    if(SGetMsg(DU_APP_MEM_REGION, DU_POOL, &mBuf) == ROK)
    {
-      if(SAddPstMsgMult((Data *)data, datSize, mBuf) == ROK)
-      {
-         SPrntMsg(mBuf, 0,0);
-      }
-      else
+      if(SAddPstMsgMult((Data *)data, datSize, mBuf) != ROK)
       {
          DU_LOG("\nDU_APP : SAddPstMsgMult failed");
          SPutMsg(mBuf);
@@ -1302,19 +1318,8 @@ S16 duSendEgtpDatInd()
 
    /* this function automatically reverses revPkArray */
    ret = SAddPreMsgMult(revPkArray, (MsgLen)cnt, mBuf);
-
-
-   egtpMsg.msgHdr.msgType = EGTPU_MSG_GPDU;
-   egtpMsg.msgHdr.nPdu.pres = FALSE;
-   egtpMsg.msgHdr.seqNum.pres = FALSE;
-   egtpMsg.msgHdr.extHdr.udpPort.pres = FALSE;
-   egtpMsg.msgHdr.extHdr.pdcpNmb.pres = FALSE;
-   egtpMsg.msgHdr.teId = 1;
-   egtpMsg.msg = mBuf;
-
-   SPrntMsg(mBuf, 0, 0);
-
-   egtpHdlDatInd(egtpMsg);
+    
+   duSendEgtpDatInd(mBuf);
  
    RETVALUE(ROK);
 }
@@ -1398,32 +1403,6 @@ S16 duSendSchCfg()
    return ROK;
 }
 
-/*******************************************************************
- *
- * @brief Checks the status of the received information
- *
- * @details
- *
- *    Function : duCheckReqStatus
- *
- *    Functionality:
- *       Checks the status of the received information
- *
- * @params[in] Confirm status
- * @return ROK     - success
- *         RFAILED - failure
- *
- ******************************************************************/
-S16 duCheckReqStatus(CmStatus *cfm)
-{
-   S16 ret = ROK;
-   if(cfm->status != LCM_PRIM_OK)
-   {
-      DU_LOG("\nDU_APP : Failed to process the request successfully");
-      ret = RFAILED;
-   }
-   RETVALUE(ret); 
-}
 
 /**************************************************************************
  * @brief Function to configure SCTP params and 
@@ -1445,24 +1424,20 @@ S16 duCheckReqStatus(CmStatus *cfm)
 S16 duLayerConfigComplete()
 {
    S16 ret = ROK;
-   CmStatus cfm;
 
    DU_LOG("\nDU_APP : Configuring all Layer is complete");
 
-   duSctpCfgReq(duCfgParam.sctpParams, &cfm);
-   if((ret = duCheckReqStatus(&cfm)) != ROK)
+   if((ret = duSctpCfgReq(duCfgParam.sctpParams)) != ROK)
    {
       DU_LOG("\nDU_APP : Failed configuring Sctp Params");
       ret = RFAILED;
    }
-   duSctpAssocReq(duCfgParam.sctpParams.itfType.f1Itf, &cfm);
-   if((ret = duCheckReqStatus(&cfm)) != ROK)
+	if((ret = duSctpAssocReq(F1_INTERFACE)) != ROK)
    {
       DU_LOG("\nDU_APP : Failed to send AssocReq F1");
       ret = RFAILED;
    }
-   duSctpAssocReq(duCfgParam.sctpParams.itfType.e2Itf, &cfm);
-   if((ret = duCheckReqStatus(&cfm)) != ROK)
+   if((ret = duSctpAssocReq(E2_INTERFACE)) != ROK)
    {
       DU_LOG("\nDU_APP : Failed to send AssocReq E2");
       ret = RFAILED;