Memory handling fixes [Issue-ID: ODUHIGH-337]

[o-du/l2.git] / src / cu_stub / cu_stub.c

diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c
index a94f24c..6c59800 100644 (file)
--- a/src/cu_stub/cu_stub.c
+++ b/src/cu_stub/cu_stub.c
@@ -23,14 +23,25 @@
 #include "cu_stub_egtp.h"
 #include "du_log.h"
 
+#ifdef O1_ENABLE
+#include "ConfigInterface.h"
+#endif
+
 #define CU_ID 1
 #define CU_NAME "ORAN_OAM_CU"
-#define DU_IP_V4_ADDR "192.168.130.81"
-#define CU_IP_V4_ADDR "192.168.130.82"
+
 #define DU_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0001"
 #define CU_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0011"
+
+#ifndef O1_ENABLE
+
+#define DU_IP_V4_ADDR "192.168.130.81"
+#define CU_IP_V4_ADDR "192.168.130.82"
 #define DU_PORT 38472
 #define CU_PORT 38472 
+
+#endif
+
 #define DU_EGTP_PORT 39001
 #define CU_EGTP_PORT 39002
 #define RRC_VER 0
@@ -42,6 +53,13 @@
 #define PLMN_MNC1 8
 #define PLMN_MNC2 0
 
+#ifdef O1_ENABLE
+
+extern StartupConfig g_cfg;
+
+#endif
+
+
 /*******************************************************************
  *
  * @brief Handles SCTP notification 
@@ -146,21 +164,36 @@ void readCuCfg()
 
    DU_LOG("\nDEBUG  -->  CU_STUB : Reading CU configurations");
 
+#ifdef O1_ENABLE
+   if( getStartupConfigForStub(&g_cfg) != ROK )
+   {
+      DU_LOG("\nError  -->  CU_STUB : Could not fetch startup "\
+             "configurations from Netconf interface\n");
+      exit(1);
+   }
+   
+   cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
+   cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu);
+
+   cuCfgParams.sctpParams.duPort = g_cfg.DU_Port;
+   cuCfgParams.sctpParams.cuPort = g_cfg.CU_Port;
+#else
    cmInetAddr((S8*)DU_IP_V4_ADDR, &ipv4_du);
    cmInetAddr((S8*)CU_IP_V4_ADDR, &ipv4_cu);
- 
+   cuCfgParams.sctpParams.duPort = DU_PORT;
+   cuCfgParams.sctpParams.cuPort = CU_PORT;
+#endif
+    
    cuCfgParams.cuId = CU_ID;
    strcpy(cuCfgParams.cuName, CU_NAME);
  
    /* DU IP Address and Port*/
    cuCfgParams.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
    cuCfgParams.sctpParams.duIpAddr.ipV6Pres = false;
-   cuCfgParams.sctpParams.duPort = DU_PORT;
 
    /* CU IP Address and Port*/
    cuCfgParams.sctpParams.cuIpAddr.ipV4Addr = ipv4_cu;
    cuCfgParams.sctpParams.cuIpAddr.ipV6Pres = false;
-   cuCfgParams.sctpParams.cuPort = CU_PORT;
 
    /*PLMN*/
    cuCfgParams.plmn.mcc[0] = PLMN_MCC0;