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

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index e8f712d97..ecf5a3e13 100644
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -31,17 +31,16 @@ U8 numRlcMacSaps = 0;
 U8 macCfg = 0;
 U8 macCfgInst = 0;
 
-extern DuCfgParams duCfgParam;;
-
+extern DuCfgParams duCfgParam;
 extern S16 cmPkLkwCfgReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
 
-packMacCellCfgReq packMacCellCfgMt[] =
+packMacCellCfgReq packMacCellCfgOpts[] =
 {
-   packLcMacCellCfg, /* packing for loosely coupled */
-   handleMacCellCfgReq, /* packing for tightly coupled */
-   packLwLcMacCellCfg, /* packing for light weight loosly coupled */
+   packMacCellCfg, /* packing for loosely coupled */
+   MacHdlCellCfgReq, /* packing for tightly coupled */
+   packMacCellCfg, /* packing for light weight loosly coupled */
 };
 
 /**************************************************************************
@@ -891,42 +890,6 @@ S16 duBindUnbindRlcToMacSap(U8 inst, U8 action)
 
    return ROK;
 }
-/*******************************************************************
- *
- * @brief  Function to start SCTP
- *
- * @details
- *
- *    Function : duSctpStartReq
- *
- *    Functionality:
- *       Function to start SCTP
- *
- * @params[in] 
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-S16 duSctpStartReq()
-{
-   Pst pst;
-
-   cmMemset((U8 *)&(pst), 0, sizeof(Pst));
-   pst.srcEnt = (Ent)ENTDUAPP;
-   pst.srcInst = (Inst)DU_INST;
-   pst.srcProcId = DU_PROC;
-   pst.dstEnt = (Ent)ENTSCTP;
-   pst.dstInst = (Inst)SCTP_INST;
-   pst.dstProcId = pst.srcProcId;
-   pst.event = EVTSCTPSTRT;
-   pst.selector = DU_SELECTOR_LC;
-   pst.pool= DU_POOL;
-
-   cmPkSctpAssocReq(&pst, duCfgParam.sctpParams);
-
-   RETVALUE(ROK);
-}
-
 /*******************************************************************
  *
  * @brief Handles SCTP notifications
@@ -957,7 +920,7 @@ S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
                {
                   DU_LOG("\nDU_APP : SCTP communication UP");
                   //Setup F1-C
-                  if(!duCb.f1Status)
+                  if(ntfy->u.assocChange.assocId == f1Params.assocId & (!duCb.f1Status))
                   {
                      /* Build and send F1 Setup response */
                      if(BuildAndSendF1SetupReq() != ROK)
@@ -965,11 +928,16 @@ S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
                         RETVALUE(RFAILED);
                      }
                   }
-                  else
+                  //Setup E2
+                  if(ntfy->u.assocChange.assocId == ricParams.assocId & (!duCb.e2Status))
                   {
-                     //Only SCTP is down, when SCTP comes up again, no need to
-                     //start from setting up F1 link
+                     /* Build and send F1 Setup response */
+                     if(BuildAndSendE2SetupReq() != ROK)
+                     {
+                        RETVALUE(RFAILED);
+                     }
                   }
+
                   break;
                }
          }
@@ -1430,6 +1398,79 @@ 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 
+ *  responsible for F1 and E2 interfaces
+ *
+ * @details
+ *
+ *      Function : duLayerConfigComplete
+ * 
+ *      Functionality:
+ *           Configures SCTP Params and responsible for handling
+ *           F1 and E2 interface.
+ *     
+ * @param[in]  void
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ***************************************************************************/
+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)
+   {
+      DU_LOG("\nDU_APP : Failed configuring Sctp Params");
+      ret = RFAILED;
+   }
+   duSctpAssocReq(duCfgParam.sctpParams.itfType.f1Itf, &cfm);
+   if((ret = duCheckReqStatus(&cfm)) != ROK)
+   {
+      DU_LOG("\nDU_APP : Failed to send AssocReq F1");
+      ret = RFAILED;
+   }
+   duSctpAssocReq(duCfgParam.sctpParams.itfType.e2Itf, &cfm);
+   if((ret = duCheckReqStatus(&cfm)) != ROK)
+   {
+      DU_LOG("\nDU_APP : Failed to send AssocReq E2");
+      ret = RFAILED;
+   }
+
+   RETVALUE(ret); 
+} 
+
 /**************************************************************************
  * @brief Function to handle  SCH Config Confirm from MAC
  *
@@ -1461,8 +1502,7 @@ S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm)
             break;
       }
    }
-   duSctpStartReq();
-
+   duLayerConfigComplete();
    duBuildEgtpCfgReq();
    return ROK;
 }
@@ -1513,21 +1553,21 @@ S16 duBuildAndSendMacCellCfg()
 {
    Pst pst;
    DU_SET_ZERO(&pst, sizeof(Pst));
-   MacCellCfg *pMacCellCfg = NULLP;
+   MacCellCfg *duMacCellCfg = NULLP;
 
-   DU_ALLOC(pMacCellCfg, sizeof(MacCellCfg));
-   if(pMacCellCfg == NULLP)
+   DU_ALLOC(duMacCellCfg, sizeof(MacCellCfg));
+   if(duMacCellCfg == NULLP)
    {
       return RFAILED;
    }
 
    /* store the address in the duCb so that we can free on confirm msg */
-   duCb.ptrMacCellCfg = pMacCellCfg;
+   duCb.duMacCellCfg = duMacCellCfg;
 
    /* copy the mac config structure from duCfgParams */
-   memcpy(pMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
+   memcpy(duMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
 
-   pMacCellCfg->transId = getTransId(); /* transaction ID */
+   duMacCellCfg->transId = getTransId(); /* transaction ID */
    
    /* Fill Pst */
    pst.selector  = DU_SELECTOR_LWLC;
@@ -1541,7 +1581,7 @@ S16 duBuildAndSendMacCellCfg()
    pst.event = EVENT_MAC_CELL_CONFIG_REQ;
 
    /* Send MAC cell config to MAC */
-   return (*packMacCellCfgMt[pst.selector])(&pst, pMacCellCfg);
+   return (*packMacCellCfgOpts[pst.selector])(&pst, duMacCellCfg);
 }
 
 /**************************************************************************
@@ -1563,11 +1603,11 @@ S16 duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
 {
    S16 ret = ROK;
 
-   if(macCellCfgCfm->transId == duCb.ptrMacCellCfg->transId)
+   if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
    {
       /* free the memory allocated during sending macCellCfg request */
-      DU_FREE(duCb.ptrMacCellCfg,sizeof(MacCellCfg));
-      duCb.ptrMacCellCfg = NULLP;
+      DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
+      duCb.duMacCellCfg = NULLP;
 
       /* Build and send GNB-DU config update */
       ret = BuildAndSendDUConfigUpdate();