From: Harshita Lal <harshita.lal@radisys.com>
Date: Fri, 23 Jun 2023 07:00:04 +0000 (+0000)
Subject: Merge "[Epic-ID: ODUHIGH-475][Task-ID: ODUHIGH-476] O1 integration fixes"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e440deae5fa6f2cb8d96cdb4714ef25e3dba2413;hp=131089020214ee333453548430470a96f075d9e6;p=o-du%2Fl2.git

Merge "[Epic-ID: ODUHIGH-475][Task-ID: ODUHIGH-476] O1 integration fixes"
---

diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c
index 6a9c7ddd5..833e568ea 100644
--- a/src/cu_stub/cu_stub.c
+++ b/src/cu_stub/cu_stub.c
@@ -150,16 +150,16 @@ void readCuCfg()
    }
    
    cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
-   cuCb.cuCfgParams.sctpParams.destCb[0].destIpAddr.ipV4Addr = ipv4_du;
-   cuCb.cuCfgParams.sctpParams.destCb[0].destIpAddr.ipV6Pres = false;
+   cuCb.cuCfgParams.sctpParams.f1SctpInfo.destCb[0].destIpAddr.ipV4Addr = ipv4_du;
+   cuCb.cuCfgParams.sctpParams.f1SctpInfo.destCb[0].destIpAddr.ipV6Pres = false;
    
    cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu);
    cuCb.cuCfgParams.sctpParams.localIpAddr.ipV4Addr = ipv4_cu;
    cuCb.cuCfgParams.sctpParams.localIpAddr.ipV6Pres = false;
    
-   cuCb.cuCfgParams.sctpParams.destCb[0].destPort = g_cfg.DU_Port;
-   cuCb.cuCfgParams.sctpParams.f1SctpPort = g_cfg.CU_Port; 
-   cuCb.cuCfgParams.sctpParams.numDestNode = 1;
+   cuCb.cuCfgParams.sctpParams.f1SctpInfo.destCb[0].destPort = g_cfg.DU_Port;
+   cuCb.cuCfgParams.sctpParams.f1SctpInfo.port = g_cfg.CU_Port; 
+   cuCb.cuCfgParams.sctpParams.f1SctpInfo.numDestNode = 1;
    
    cuCb.cuCfgParams.egtpParams.localIp.ipV4Pres = TRUE;
    cuCb.cuCfgParams.egtpParams.localIp.ipV4Addr = ipv4_cu;
diff --git a/src/cu_stub/cu_stub.h b/src/cu_stub/cu_stub.h
index 5b764af85..1a5731717 100644
--- a/src/cu_stub/cu_stub.h
+++ b/src/cu_stub/cu_stub.h
@@ -35,9 +35,9 @@
 #define XN_SCTP_PORT 38422 /* As per 3GPP TS 38.422, The SCTP Destination Port number value assigned by IANA to be used for XnAP is 38422 */
 #define NUM_XN_ASSOC 0
 #define REMOTE_IP_CU (char*[]){"192.168.130.84"}
-#define LOCAL_NODE_TYPE SERVER
 #endif
 
+#define LOCAL_NODE_TYPE SERVER
 #define F1_EGTP_PORT 2152 /* As per the spec 29.281, the registered port number for GTP-U is 2152 */
 #define RRC_VER 0
 #define EXT_RRC_VER 5