Building mib PDU and SSB changes at scheduler

[o-du/l2.git] / src / du_app / du_msg_hdl.c

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 7d27911..ed91ea4 100644 (file)
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -921,39 +921,26 @@ S16 duBindUnbindRlcToMacSap(U8 inst, U8 action)
 
 S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
 {
-   switch(ntfy->header.nType)
+   if(f1Params.assocId == ntfy->u.assocChange.assocId)
    {
-      case CM_INET_SCTP_ASSOC_CHANGE:
-         switch(ntfy->u.assocChange.state)
-         {
-            case CM_INET_SCTP_COMM_UP:
-               {
-                  DU_LOG("\nDU_APP : SCTP communication UP");
-                  //Setup F1-C
-                  if(ntfy->u.assocChange.assocId == f1Params.assocId)
-                  {
-                     /* Build and send F1 Setup response */
-                     if(BuildAndSendF1SetupReq() != ROK)
-                     {
-                        RETVALUE(RFAILED);
-                     }
-                  }
-                  //Setup E2
-                  if(ntfy->u.assocChange.assocId == ricParams.assocId)
-                  {
-                     /* Build and send F1 Setup response */
-                     if(BuildAndSendE2SetupReq() != ROK)
-                     {
-                        RETVALUE(RFAILED);
-                     }
-                  }
-
-                  break;
-               }
-         }
-         break;
+      if(BuildAndSendF1SetupReq() != ROK)
+      {
+         return RFAILED;
+      }
    }
-   RETVALUE(ROK);
+   else if(ricParams.assocId == ntfy->u.assocChange.assocId)
+   {
+      if(BuildAndSendE2SetupReq() != ROK)
+      {
+         return RFAILED;
+      }
+   }
+   else
+       {
+      DU_LOG("\nDU_APP : Invalid assocId %d received", ntfy->u.assocChange.assocId);
+               return RFAILED;
+       }
+   return ROK;
 }
 
 /*******************************************************************
@@ -1442,7 +1429,7 @@ S16 duLayerConfigComplete()
       DU_LOG("\nDU_APP : Failed configuring Sctp Params");
       ret = RFAILED;
    }
-       if((ret = duSctpAssocReq(F1_INTERFACE)) != ROK)
+   if((ret = duSctpAssocReq(F1_INTERFACE)) != ROK)
    {
       DU_LOG("\nDU_APP : Failed to send AssocReq F1");
       ret = RFAILED;
@@ -1588,22 +1575,29 @@ S16 duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
 {
    S16 ret = ROK;
 
-   if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
-   {
-      /* free the memory allocated during sending macCellCfg request */
-      DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
-      duCb.duMacCellCfg = NULLP;
-
-      /* Build and send GNB-DU config update */
-      ret = BuildAndSendDUConfigUpdate();
-   }
-   else
-   {
-      /* transaction ID missmatch */
-      DU_LOG("\n transaction ID mismatch in macCellCfg");
-      ret = RFAILED;
-   }
-
+   if(macCellCfgCfm->rsp == ROK)  
+       {
+               if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
+               {
+                       /* free the memory allocated during sending macCellCfg request */
+                       DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
+                       duCb.duMacCellCfg = NULLP;
+
+                       /* Build and send GNB-DU config update */
+                       ret = BuildAndSendDUConfigUpdate();
+               }
+               else
+               {
+                       /* transaction ID missmatch */
+                       DU_LOG("\n transaction ID mismatch in macCellCfg");
+                       ret = RFAILED;
+               }
+       }
+       else
+       {
+               DU_LOG("\nMac cell cfg failed");
+               ret = RFAILED;
+       }
    return ret;
 }