X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fric_stub%2Fric_stub.c;h=429dc461bcb68337093acf8473c3596bcf1179da;hb=bb3c7e2fe3279bb31677ef97f8426c49e69dd639;hp=0f36cb52d59e901d88b93dca637b3e019354e74d;hpb=3a5197157c8a4ff70f26254c70ea0bbb2482423b;p=o-du%2Fl2.git

diff --git a/src/ric_stub/ric_stub.c b/src/ric_stub/ric_stub.c
index 0f36cb52d..429dc461b 100644
--- a/src/ric_stub/ric_stub.c
+++ b/src/ric_stub/ric_stub.c
@@ -18,38 +18,13 @@
 
 /* This functions contains main() for ric_app */
 #include "common_def.h"
-#include "ric_stub.h"
 #include "ric_stub_sctp.h"
-#include "du_log.h"
+#include "ric_stub.h"
 
 #ifdef O1_ENABLE
 #include "CmInterface.h"
 #endif
 
-#define RIC_ID 1
-#define RIC_NAME "ORAN_OAM_RIC"
-
-#define DU_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0001"
-#define RIC_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0011"
-
-#ifndef O1_ENABLE
-
-#define DU_IP_V4_ADDR "192.168.130.81"
-#define RIC_IP_V4_ADDR "192.168.130.80"
-#define DU_PORT 36421
-#define RIC_PORT 36421
-
-#endif
-
-#define RRC_VER 0
-#define EXT_RRC_VER 5
-#define PLMN_MCC0 3
-#define PLMN_MCC1 1
-#define PLMN_MCC2 1
-#define PLMN_MNC0 4
-#define PLMN_MNC1 8
-#define PLMN_MNC2 0
-
 #ifdef O1_ENABLE
 extern StartupConfig g_cfg;
 #endif
@@ -130,10 +105,13 @@ uint8_t tst()
 
 void readRicCfg()
 {
+   uint8_t *numDu;
    uint32_t ipv4_du, ipv4_ric;
 
    DU_LOG("\nINFO  --> RIC : Reading RIC configurations");
 
+   ricCfgParams.ricId = RIC_ID;
+   strcpy(ricCfgParams.ricName, RIC_NAME);
 #ifdef O1_ENABLE
    if( getStartupConfigForStub(&g_cfg) != ROK )
    {
@@ -148,23 +126,26 @@ void readRicCfg()
    ricCfgParams.sctpParams.duPort = g_cfg.RIC_Port;
    ricCfgParams.sctpParams.ricPort = g_cfg.RIC_Port;
 #else
-   cmInetAddr((S8*)DU_IP_V4_ADDR, &ipv4_du);
-   cmInetAddr((S8*)RIC_IP_V4_ADDR, &ipv4_ric);
-
-   ricCfgParams.sctpParams.duPort = DU_PORT;
-   ricCfgParams.sctpParams.ricPort = RIC_PORT;
+   ricCfgParams.sctpParams.numDu = 0;
+   numDu = &ricCfgParams.sctpParams.numDu;
+   while(*numDu < MAX_DU_SUPPORTED)
+   {   
+      /* DU IP Address and Port*/
+      memset(&ipv4_du, 0, sizeof(uint32_t));
+      cmInetAddr((S8*)DU_IP_V4_ADDR[*numDu], &ipv4_du);
+      ricCfgParams.sctpParams.sctpAssoc[*numDu].duIpAddr.ipV4Addr = ipv4_du;
+      ricCfgParams.sctpParams.sctpAssoc[*numDu].duIpAddr.ipV6Pres = false;
+      ricCfgParams.sctpParams.sctpAssoc[*numDu].duPort = DU_SCTP_PORT[*numDu];
+
+      /* RIC IP Address and Port*/
+      memset(&ipv4_du, 0, sizeof(uint32_t));
+      cmInetAddr((S8*)RIC_IP_V4_ADDR, &ipv4_ric);
+      ricCfgParams.sctpParams.sctpAssoc[*numDu].ricIpAddr.ipV4Addr = ipv4_ric;
+      ricCfgParams.sctpParams.sctpAssoc[*numDu].ricIpAddr.ipV6Pres = false;
+      ricCfgParams.sctpParams.sctpAssoc[*numDu].ricPort = RIC_SCTP_PORT_TO_DU[*numDu];
+      (*numDu)++;
+   }   
 #endif
-    
-   ricCfgParams.ricId = RIC_ID;
-   strcpy(ricCfgParams.ricName, RIC_NAME);
- 
-   /* DU IP Address and Port*/
-   ricCfgParams.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
-   ricCfgParams.sctpParams.duIpAddr.ipV6Pres = false;
-
-   /* RIC IP Address and Port*/
-   ricCfgParams.sctpParams.ricIpAddr.ipV4Addr = ipv4_ric;
-   ricCfgParams.sctpParams.ricIpAddr.ipV6Pres = false;
 
    /*PLMN*/
    ricCfgParams.plmn.mcc[0] = PLMN_MCC0;