From: Harshita Lal <harshita.lal@radisys.com>
Date: Fri, 18 Feb 2022 13:53:40 +0000 (+0000)
Subject: Merge "[Epic-ID: ODUHIGH-405][Task-ID: ODUHIGH-420] GNB-DU Configuration Query and... 
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1dc4874f3806146823871718c4450d4d77444947;hp=d43106e9959db218ce4a4c278f73405d6d70579f;p=o-du%2Fl2.git

Merge "[Epic-ID: ODUHIGH-405][Task-ID: ODUHIGH-420] GNB-DU Configuration Query and response"
---

diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c
index c8724d7e1..1694a14dd 100644
--- a/src/cu_stub/cu_stub.c
+++ b/src/cu_stub/cu_stub.c
@@ -204,10 +204,16 @@ void readCuCfg()
    }
    
    cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
+   cuCb.cuCfgParams.sctpParams.sctpAssoc[0].duIpAddr.ipV4Addr = ipv4_du;
+   cuCb.cuCfgParams.sctpParams.sctpAssoc[0].duIpAddr.ipV6Pres = false;
+   
    cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu);
-
-   cuCb.cuCfgParams.sctpParams.duPort = g_cfg.DU_Port;
-   cuCb.cuCfgParams.sctpParams.cuPort = g_cfg.CU_Port;
+   cuCb.cuCfgParams.sctpParams.sctpAssoc[0].cuIpAddr.ipV4Addr = ipv4_cu;
+   cuCb.cuCfgParams.sctpParams.sctpAssoc[0].cuIpAddr.ipV6Pres = false;
+   
+   cuCb.cuCfgParams.sctpParams.sctpAssoc[0].duPort = g_cfg.DU_Port;
+   cuCb.cuCfgParams.sctpParams.sctpAssoc[0].cuPort = g_cfg.CU_Port; 
+   cuCb.cuCfgParams.sctpParams.numDu = 1;
 #else
    cuCb.cuCfgParams.sctpParams.numDu = 0;
    numDu = &cuCb.cuCfgParams.sctpParams.numDu;
diff --git a/src/ric_stub/ric_stub.c b/src/ric_stub/ric_stub.c
index 429dc461b..e27f2acb4 100644
--- a/src/ric_stub/ric_stub.c
+++ b/src/ric_stub/ric_stub.c
@@ -122,9 +122,17 @@ void readRicCfg()
 
    cmInetAddr((S8*)g_cfg.DU_IPV4_Addr,  &ipv4_du);
    cmInetAddr((S8*)g_cfg.RIC_IPV4_Addr, &ipv4_ric);
+   
+   ricCfgParams.sctpParams.sctpAssoc[0].duIpAddr.ipV4Addr = ipv4_du;
+   ricCfgParams.sctpParams.sctpAssoc[0].duIpAddr.ipV6Pres = false;
+   ricCfgParams.sctpParams.sctpAssoc[0].duPort = g_cfg.RIC_Port;
+
+   ricCfgParams.sctpParams.sctpAssoc[0].ricIpAddr.ipV4Addr = ipv4_ric;
+   ricCfgParams.sctpParams.sctpAssoc[0].ricIpAddr.ipV6Pres = false;
+   ricCfgParams.sctpParams.sctpAssoc[0].ricPort = g_cfg.RIC_Port;
+
+   ricCfgParams.sctpParams.numDu = 1;
 
-   ricCfgParams.sctpParams.duPort = g_cfg.RIC_Port;
-   ricCfgParams.sctpParams.ricPort = g_cfg.RIC_Port;
 #else
    ricCfgParams.sctpParams.numDu = 0;
    numDu = &ricCfgParams.sctpParams.numDu;