Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixes in current code for Multi-UE support [Issue-ID: ODUHIGH-354]
[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
d1c1b1d
..
ff9da8e
100644
(file)
--- a/
src/cu_stub/cu_stub.c
+++ b/
src/cu_stub/cu_stub.c
@@
-24,9
+24,7
@@
#include "du_log.h"
#ifdef O1_ENABLE
#include "du_log.h"
#ifdef O1_ENABLE
-
-#include "Config.h"
-
+#include "ConfigInterface.h"
#endif
#define CU_ID 1
#endif
#define CU_ID 1
@@
-84,7
+82,7
@@
void sctpNtfyInd(CmInetSctpNotification *ntfy)
void init_log()
{
void init_log()
{
-
openlog("CU_STUB",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
+ openlog("CU_STUB",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
}
/*******************************************************************
*
}
/*******************************************************************
*
@@
-112,7
+110,7
@@
uint8_t tst()
pthread_attr_t attr;
init_log();
pthread_attr_t attr;
init_log();
- DU_LOG("\nStarting CU_STUB\n");
+ DU_LOG("\n
INFO --> CU_STUB :
Starting CU_STUB\n");
/* Start thread to receive console input */
pthread_attr_init(&attr);
/* Start thread to receive console input */
pthread_attr_init(&attr);
@@
-122,7
+120,7
@@
uint8_t tst()
retVal = pthread_create(&conThrdId, &attr, cuConsoleHandler, NULLP);
if(retVal != 0)
{
retVal = pthread_create(&conThrdId, &attr, cuConsoleHandler, NULLP);
if(retVal != 0)
{
- DU_LOG("\n
CU_STUB:
Thread creation failed. Cause %d", retVal);
+ DU_LOG("\n
ERROR --> CU_STUB :
Thread creation failed. Cause %d", retVal);
}
pthread_attr_destroy(&attr);
}
pthread_attr_destroy(&attr);
@@
-164,16
+162,16
@@
void readCuCfg()
{
uint32_t ipv4_du, ipv4_cu;
{
uint32_t ipv4_du, ipv4_cu;
- DU_LOG("\nReading CU configurations");
+ DU_LOG("\n
DEBUG --> CU_STUB :
Reading CU configurations");
#ifdef O1_ENABLE
#ifdef O1_ENABLE
- if( getStartupConfig(&g_cfg) != ROK )
+ if( getStartupConfig
ForStub
(&g_cfg) != ROK )
{
{
- RETVALUE(RFAILED);
+ DU_LOG("\nError --> CU_STUB : Could not fetch startup "\
+ "configurations from Netconf interface\n");
+ exit(1);
}
}
- DU_LOG("\nReading CU configurations---");
- DU_LOG("\nReading CU configurations g_cfg.DU_IPV4_Addr=%s", g_cfg.DU_IPV4_Addr);
- DU_LOG("\nReading CU configurations g_cfg.CU_IPV4_Addr=%s", g_cfg.CU_IPV4_Addr);
+
cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu);
cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu);
@@
-218,6
+216,7
@@
void readCuCfg()
cuCfgParams.egtpParams.destIp.ipV4Addr = ipv4_du;
cuCfgParams.egtpParams.destPort = DU_EGTP_PORT;
cuCfgParams.egtpParams.minTunnelId = 0;
cuCfgParams.egtpParams.destIp.ipV4Addr = ipv4_du;
cuCfgParams.egtpParams.destPort = DU_EGTP_PORT;
cuCfgParams.egtpParams.minTunnelId = 0;
+ cuCfgParams.egtpParams.currTunnelId = cuCfgParams.egtpParams.minTunnelId;
cuCfgParams.egtpParams.maxTunnelId = 10;
} /* End of readCuCfg */
cuCfgParams.egtpParams.maxTunnelId = 10;
} /* End of readCuCfg */
@@
-246,7
+245,7
@@
void *cuConsoleHandler(void *args)
if((ch = getchar()) == 'd')
{
/* Start Pumping data from CU to DU */
if((ch = getchar()) == 'd')
{
/* Start Pumping data from CU to DU */
- DU_LOG("\nEGTP: Sending DL User Data");
+ DU_LOG("\n
DEBUG -->
EGTP: Sending DL User Data");
cuEgtpDatReq();
}
}
cuEgtpDatReq();
}
}