X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_msg_router.c;h=c077fe0ad4d4fdb0e4f9680f09163f9f2dcabef5;hb=a14bf79bbc001990f96e01ada0dd291bcc9ddcad;hp=f66dae78e755381db884797f5ce72825c96b8628;hpb=5cf1b5ae6066676b1da1105618dfd845d648eeeb;p=o-du%2Fl2.git

diff --git a/src/du_app/du_mgr_msg_router.c b/src/du_app/du_mgr_msg_router.c
index f66dae78e..c077fe0ad 100644
--- a/src/du_app/du_mgr_msg_router.c
+++ b/src/du_app/du_mgr_msg_router.c
@@ -18,6 +18,7 @@
 /* File : du_mgr_msg_router.c */
 /* This file contains message handling functionality for DU APP */
 #include "common_def.h"
+#include "du_tmr.h"
 #include "lrg.h"
 #include "legtp.h"
 #include "lsctp.h"
@@ -29,13 +30,14 @@
 #include "kwu.x"
 #include "du_app_mac_inf.h"
 #include "du_app_rlc_inf.h"
+#include "du_e2ap_mgr.h"
+#include "du_e2ap_msg_hdl.h"
 #include "du_cfg.h"
 #include "du_mgr.h"
 #include "E2AP-PDU.h"
 #include "du_sctp.h"
 #include "F1AP-PDU.h"
 #include "du_f1ap_msg_hdl.h"
-#include "du_e2ap_msg_hdl.h"
 #include "du_app_mac_inf.h"
 #include "du_ue_mgr.h"
 #include "du_utils.h"
@@ -96,6 +98,7 @@ uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason)
    memset(duCb.ueCcchCtxt, 0, MAX_NUM_UE * sizeof(UeCcchCtxt));
    duCb.numCfgCells  = 0;
    duCb.numActvCells = 0;
+   duCb.gnbDuUeF1apIdGenerator = 0;
    cmLListInit(&duCb.reservedF1apPduList);
    ODU_SET_PROC_ID(DU_PROC);
 
@@ -103,6 +106,7 @@ uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason)
 
 }
 
+#ifdef CALL_FLOW_DEBUG_LOG   
 /**************************************************************************
 * @brief Function prints the src dest and msg reached to egtp.
 *
@@ -223,11 +227,6 @@ void callFlowduActvTsk(Pst *pst)
                      strcpy(message,"EVTLRGCFGCFM");
                      break;
                   }
-               case EVTLRGCNTRLCFM:
-                  {
-                     strcpy(message,"EVTLRGCNTRLCFM");
-                     break;
-                  }
                case EVTMACSCHGENCFGCFM:
                   {
                      strcpy(message,"EVTMACSCHGENCFGCFM");
@@ -243,6 +242,11 @@ void callFlowduActvTsk(Pst *pst)
                      strcpy(message,"EVENT_MAC_CELL_UP_IND");
                      break;
                   }
+               case EVENT_MAC_SLOT_IND:
+                  {
+                     strcpy(message,"EVENT_MAC_SLOT_IND");
+                     break;
+                  }
                case EVENT_MAC_STOP_IND:
                   {
                      strcpy(message,"EVENT_MAC_STOP_IND");
@@ -283,6 +287,11 @@ void callFlowduActvTsk(Pst *pst)
                      strcpy(message,"EVENT_MAC_SLICE_RECFG_RSP");
                      break;
                   }
+               case EVENT_MAC_STATISTICS_RSP:
+                  {
+                     strcpy(message,"EVENT_MAC_STATISTICS_RSP");
+                     break;
+                  }
                default:
                   {
                      strcpy(message,"Invalid Event");
@@ -357,6 +366,8 @@ void callFlowduActvTsk(Pst *pst)
    }
    DU_LOG("\nCall Flow: %s -> %s : %s\n", sourceTask, destTask, message);
 }
+#endif
+
 /**************************************************************************
  * @brief Task Activation callback function. 
  *
@@ -428,12 +439,12 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                   }
                case EVENT_RLC_UE_CREATE_RSP:
                   {
-                     ret = unpackRlcUeCfgRsp(DuProcRlcUeCfgRsp, pst, mBuf);
+                     ret = unpackRlcUeCreateRsp(DuProcRlcUeCreateRsp, pst, mBuf);
                      break;
                   }
                case EVENT_RLC_UE_RECONFIG_RSP:
                   {
-                     ret = unpackRlcUeCfgRsp(DuProcRlcUeCfgRsp, pst, mBuf);
+                     ret = unpackRlcUeReconfigRsp(DuProcRlcUeReconfigRsp, pst, mBuf);
                      break;
                   }
                case EVENT_RLC_UE_DELETE_RSP:
@@ -456,6 +467,11 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                      ret = unpackRlcDlRrcMsgRspToDu(DuProcRlcDlRrcMsgRsp, pst, mBuf);
                      break;
                   }
+               case EVENT_RLC_MAX_RETRANSMISSION:
+                  {
+                     ret = unpackRlcMaxRetransInd(DuProcRlcMaxRetransInd, pst, mBuf);
+                     break;
+                  }
                case EVENT_UL_USER_DATA_TRANS_TO_DU:
                   {
                      ret = unpackRlcUlUserDataToDu(DuProcRlcUlUserDataTrans, pst, mBuf);
@@ -466,6 +482,11 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                      ret = unpackRlcSlicePm(DuProcRlcSliceMetrics, pst, mBuf);
                      break;
                   }
+               case EVENT_RLC_UE_REESTABLISH_RSP:
+                  {
+                     ret = unpackRlcUeReestablishRsp(DuProcRlcUeReestablishRsp, pst, mBuf);
+                     break;
+                  }
                default:
                   {
                      DU_LOG("\nERROR  -->  DU_APP : Invalid event %d received at duActvTsk from ENTRLC", \
@@ -491,10 +512,6 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                      ret = cmUnpkLrgCfgCfm(duHdlMacCfgComplete, pst, mBuf);
                      break;
                   }
-               case EVTLRGCNTRLCFM:
-                  {
-                     break;
-                  }
                case EVTMACSCHGENCFGCFM:
                   {
                      ret = cmUnpkLrgSchCfgCfm(duHdlSchCfgComplete, pst, mBuf);
@@ -510,6 +527,11 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                      ret = unpackMacCellUpInd(duHandleCellUpInd, pst, mBuf);
                      break;
                   }
+               case EVENT_MAC_SLOT_IND:
+                  {
+                     ret = unpackDuMacSlotInd(duHandleSlotInd, pst, mBuf);
+                     break;
+                  }
                case EVENT_MAC_STOP_IND:
                   {
                      ret = unpackMacStopInd(duHandleStopInd, pst, mBuf);
@@ -522,12 +544,12 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                   }
                case EVENT_MAC_UE_CREATE_RSP:
                   {
-                     ret = unpackDuMacUeCfgRsp(DuProcMacUeCfgRsp, pst, mBuf); 
+                     ret = unpackDuMacUeCreateRsp(DuProcMacUeCreateRsp, pst, mBuf); 
                      break;
                   }
                case EVENT_MAC_UE_RECONFIG_RSP:
                   {
-                     ret = unpackDuMacUeCfgRsp(DuProcMacUeCfgRsp, pst, mBuf); 
+                     ret = unpackDuMacUeRecfgRsp(DuProcMacUeRecfgRsp, pst, mBuf); 
                      break;
                   }
                case EVENT_MAC_UE_DELETE_RSP:
@@ -545,9 +567,29 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
                      ret = unpackDuMacSliceCfgRsp(DuProcMacSliceCfgRsp, pst, mBuf);
                      break;
                   }
+               case EVENT_MAC_UE_SYNC_STATUS_IND:
+                  {
+                     ret = unpackDuMacUeSyncStatusInd(DuProcMacUeSyncStatusInd, pst, mBuf);
+                     break;
+                                                                                                }
                case EVENT_MAC_SLICE_RECFG_RSP:
                   {
-                     ret = unpackDuMacSliceReCfgRsp(DuProcMacSliceReCfgRsp, pst, mBuf);
+                     ret = unpackDuMacSliceRecfgRsp(DuProcMacSliceRecfgRsp, pst, mBuf);
+                     break;
+                  }
+               case EVENT_MAC_RACH_RESOURCE_RSP:
+                  {
+                     ret = unpackDuMacRachRsrcRsp(DuProcMacRachRsrcRsp, pst, mBuf);
+                     break;
+                  }
+               case EVENT_MAC_UE_RESET_RSP:
+                  {
+                     ret = unpackDuMacUeResetRsp(DuProcMacUeResetRsp, pst, mBuf);
+                     break;
+                  }
+               case EVENT_MAC_STATISTICS_RSP:
+                  {
+                     ret = unpackDuMacStatsRsp(DuProcMacStatsRsp, pst, mBuf);
                      break;
                   }
                default: