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
[Epic-ID: ODUHIGH-516][Task-ID: ODUHIGH-531] RIC Subscription Modification Refuse
[o-du/l2.git]
/
src
/
du_app
/
du_cfg.c
diff --git
a/src/du_app/du_cfg.c
b/src/du_app/du_cfg.c
index
44608b8
..
762a5c2
100644
(file)
--- a/
src/du_app/du_cfg.c
+++ b/
src/du_app/du_cfg.c
@@
-602,7
+602,7
@@
uint8_t readCfg()
MibParams mib;
Sib1Params sib1;
F1TaiSliceSuppLst *taiSliceSuppLst;
MibParams mib;
Sib1Params sib1;
F1TaiSliceSuppLst *taiSliceSuppLst;
- uint8_t
M
easurementInfoIdx =0, measurementInfoLen=0;
+ uint8_t
m
easurementInfoIdx =0, measurementInfoLen=0;
char shortName[] = SHORT_NAME;
char serviceModelOID[]= SERVICE_MODEL_OID;
char description[] = DESCRIPTION;
char shortName[] = SHORT_NAME;
char serviceModelOID[]= SERVICE_MODEL_OID;
char description[] = DESCRIPTION;
@@
-614,6
+614,9
@@
uint8_t readCfg()
Snssai snssai[NUM_OF_SUPPORTED_SLICE] = {{1,{2,3,4}},{5,{6,7,8}}};
#endif
Snssai snssai[NUM_OF_SUPPORTED_SLICE] = {{1,{2,3,4}},{5,{6,7,8}}};
#endif
+ /* Gnb Id */
+ duCb.gnbId = GNB_ID;
+
#ifdef O1_ENABLE
if( getStartupConfig(&g_cfg) != ROK )
{
#ifdef O1_ENABLE
if( getStartupConfig(&g_cfg) != ROK )
{
@@
-635,7
+638,7
@@
uint8_t readCfg()
#endif
fillDuPort(duCfgParam.sctpParams.duPort);
#endif
fillDuPort(duCfgParam.sctpParams.duPort);
-
+
/* F1 DU IP Address and Port*/
duCfgParam.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
/* F1 DU IP Address and Port*/
duCfgParam.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
@@
-656,7
+659,7
@@
uint8_t readCfg()
duCfgParam.egtpParams.maxTunnelId = MAX_TEID;
duCfgParam.maxUe = 32; //TODO: Check
duCfgParam.egtpParams.maxTunnelId = MAX_TEID;
duCfgParam.maxUe = 32; //TODO: Check
-
+
/* DU Info */
duCfgParam.duId = DU_ID;
DU_ALLOC(duCfgParam.duName, sizeof(DU_NAME));
/* DU Info */
duCfgParam.duId = DU_ID;
DU_ALLOC(duCfgParam.duName, sizeof(DU_NAME));
@@
-706,15
+709,15
@@
uint8_t readCfg()
duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].reportStyle.formatType = REPORT_ACTION_FORMAT_TYPE;
memcpy(duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].reportStyle.name, ric_report_style_name, sizeof(ric_report_style_name));
duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].reportStyle.formatType = REPORT_ACTION_FORMAT_TYPE;
memcpy(duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].reportStyle.name, ric_report_style_name, sizeof(ric_report_style_name));
- for(
MeasurementInfoIdx =0; MeasurementInfoIdx<NUM_OF_MEASUREMENT_INFO_SUPPORTED; M
easurementInfoIdx++)
+ for(
measurementInfoIdx =0; measurementInfoIdx<NUM_OF_MEASUREMENT_INFO_SUPPORTED(CONFIG_ADD); m
easurementInfoIdx++)
{
{
- measurementInfoLen= strlen(MEASUREMENT_TYPE_NAME[
M
easurementInfoIdx]);
+ measurementInfoLen= strlen(MEASUREMENT_TYPE_NAME[
m
easurementInfoIdx]);
MeasurementInfoForAction *measurementInfoForAction;
DU_ALLOC(measurementInfoForAction, sizeof(MeasurementInfoForAction));
if(measurementInfoForAction)
{
MeasurementInfoForAction *measurementInfoForAction;
DU_ALLOC(measurementInfoForAction, sizeof(MeasurementInfoForAction));
if(measurementInfoForAction)
{
- measurementInfoForAction->measurementTypeId =
M
easurementInfoIdx+1;
- memcpy(measurementInfoForAction->measurementTypeName, MEASUREMENT_TYPE_NAME[
M
easurementInfoIdx], measurementInfoLen+1);
+ measurementInfoForAction->measurementTypeId =
m
easurementInfoIdx+1;
+ memcpy(measurementInfoForAction->measurementTypeName, MEASUREMENT_TYPE_NAME[
m
easurementInfoIdx], measurementInfoLen+1);
}
DU_ALLOC(node, sizeof(CmLList));
if(node)
}
DU_ALLOC(node, sizeof(CmLList));
if(node)
@@
-733,7
+736,8
@@
uint8_t readCfg()
duCb.e2apDb.ranFunction[ranFuncIdx].ricIndicationHeaderFormat = RIC_INDICATION_HEADER_FORMAT;
duCb.e2apDb.ranFunction[ranFuncIdx].ricIndicationMessageFormat = RIC_INDICATION_MESSAGE_FORMAT;
}
duCb.e2apDb.ranFunction[ranFuncIdx].ricIndicationHeaderFormat = RIC_INDICATION_HEADER_FORMAT;
duCb.e2apDb.ranFunction[ranFuncIdx].ricIndicationMessageFormat = RIC_INDICATION_MESSAGE_FORMAT;
}
- memset(duCb.e2apDb.e2TransInfo.onGoingTransaction, 0, MAX_NUM_TRANSACTION * sizeof(E2TransInfo));
+ memset(duCb.e2apDb.e2TransInfo.e2InitTransaction, 0, MAX_NUM_TRANSACTION * sizeof(E2TransInfo));
+ memset(duCb.e2apDb.e2TransInfo.ricInitTransaction, 0, MAX_NUM_TRANSACTION * sizeof(E2TransInfo));
/* Mib Params */
mib.sysFrmNum = SYS_FRAME_NUM;
/* Mib Params */
mib.sysFrmNum = SYS_FRAME_NUM;
@@
-1162,6
+1166,8
@@
uint8_t duReadCfg()
/* Initialize the timer blocks */
cmInitTimers(&(duCb.e2apDb.e2TimersInfo.e2Timers.e2SetupTimer), 1);
/* Initialize the timer blocks */
cmInitTimers(&(duCb.e2apDb.e2TimersInfo.e2Timers.e2SetupTimer), 1);
+ cmInitTimers(&(duCb.e2apDb.e2TimersInfo.e2Timers.ricServiceUpdateTimer.timer), 1);
+ cmInitTimers(&(duCb.e2apDb.e2TimersInfo.e2Timers.e2NodeConfigUpdate.timer), 1);
/* Initialzie the timer queue */
memset(&(duCb.duTimersInfo.tmrTq), 0, sizeof(CmTqType) * DU_TQ_SIZE);
/* Initialzie the timer queue */
memset(&(duCb.duTimersInfo.tmrTq), 0, sizeof(CmTqType) * DU_TQ_SIZE);