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-523] Statistics Indication between DU APP...
[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
b817edf
..
833e568
100644
(file)
--- 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);
}
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;
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.f1Sctp
P
ort = g_cfg.CU_Port;
- cuCb.cuCfgParams.sctpParams.numDestNode = 1;
+ cuCb.cuCfgParams.sctpParams.
f1SctpInfo.
destCb[0].destPort = g_cfg.DU_Port;
+ cuCb.cuCfgParams.sctpParams.f1Sctp
Info.p
ort = g_cfg.CU_Port;
+ cuCb.cuCfgParams.sctpParams.
f1SctpInfo.
numDestNode = 1;
cuCb.cuCfgParams.egtpParams.localIp.ipV4Pres = TRUE;
cuCb.cuCfgParams.egtpParams.localIp.ipV4Addr = ipv4_cu;
cuCb.cuCfgParams.egtpParams.localIp.ipV4Pres = TRUE;
cuCb.cuCfgParams.egtpParams.localIp.ipV4Addr = ipv4_cu;
@@
-286,8
+286,8
@@
void initiateInterDuHandover(uint32_t sourceDuId, uint32_t targetDuId, uint32_t
{
ueCb->state = UE_HANDOVER_IN_PROGRESS;
ueCb->hoInfo.HOType = Inter_DU_HO;
{
ueCb->state = UE_HANDOVER_IN_PROGRESS;
ueCb->hoInfo.HOType = Inter_DU_HO;
- ueCb->hoInfo.s
ourc
eId = sourceDuId;
- ueCb->hoInfo.t
arget
Id = targetDuId;
+ ueCb->hoInfo.s
rcNod
eId = sourceDuId;
+ ueCb->hoInfo.t
gtNode
Id = targetDuId;
BuildAndSendUeContextModificationReq(sourceDuId, ueCb, QUERY_CONFIG);
}
BuildAndSendUeContextModificationReq(sourceDuId, ueCb, QUERY_CONFIG);
}
@@
-316,13
+316,13
@@
void initiateInterDuHandover(uint32_t sourceDuId, uint32_t targetDuId, uint32_t
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-void initiateInterCuHandover(uint32_t
sourceCuId, uint32_t targetCu
Id, uint32_t cuUeF1apId)
+void initiateInterCuHandover(uint32_t
targetCuId, uint32_t cell
Id, uint32_t cuUeF1apId)
{
uint8_t duIdx, ueIdx;
CuUeCb *ueCb = NULLP;
{
uint8_t duIdx, ueIdx;
CuUeCb *ueCb = NULLP;
- DU_LOG("\nINFO --> CU_STUB: Inter-CU Handover Started for ueId [%d]
from CU ID [%d]
to CU ID [%d]", \
- cuUeF1apId,
sourceCuId,
targetCuId);
+ DU_LOG("\nINFO --> CU_STUB: Inter-CU Handover Started for ueId [%d] to CU ID [%d]", \
+ cuUeF1apId, targetCuId);
for(duIdx = 0; duIdx < cuCb.numDu; duIdx++)
{
for(duIdx = 0; duIdx < cuCb.numDu; duIdx++)
{
@@
-343,8
+343,11
@@
void initiateInterCuHandover(uint32_t sourceCuId, uint32_t targetCuId, uint32_t
{
ueCb->state = UE_HANDOVER_IN_PROGRESS;
ueCb->hoInfo.HOType = Xn_Based_Inter_CU_HO;
{
ueCb->state = UE_HANDOVER_IN_PROGRESS;
ueCb->hoInfo.HOType = Xn_Based_Inter_CU_HO;
- ueCb->hoInfo.sourceId = sourceCuId;
- ueCb->hoInfo.targetId = targetCuId;
+ ueCb->hoInfo.srcNodeId = cuCb.cuCfgParams.cuId;
+ ueCb->hoInfo.tgtNodeId = targetCuId;
+ ueCb->hoInfo.tgtCellId = cellId;
+ ueCb->hoInfo.cuUeF1apIdSrc = ueCb->gnbCuUeF1apId;
+
BuildAndSendUeContextModificationReq(cuCb.duInfo[duIdx].duId, ueCb, QUERY_CONFIG);
}
else
BuildAndSendUeContextModificationReq(cuCb.duInfo[duIdx].duId, ueCb, QUERY_CONFIG);
}
else
@@
-485,32
+488,32
@@
void *cuConsoleHandler(void *args)
else if(ch == 'h')
{
HandoverType hoType;
else if(ch == 'h')
{
HandoverType hoType;
- uint32_t s
ourceId, target
Id, ueId;
+ uint32_t s
rcNodeId, tgtNodeId, targetCell
Id, ueId;
DU_LOG("\n\nChoose the type of handover to initiate : \nEnter 1 for Inter-CU Handover over Xn interface\nEnter 2 for Inter-DU Handover\n");
scanf("%d", &hoType);
if(hoType == Xn_Based_Inter_CU_HO)
{
DU_LOG("\n\nChoose the type of handover to initiate : \nEnter 1 for Inter-CU Handover over Xn interface\nEnter 2 for Inter-DU Handover\n");
scanf("%d", &hoType);
if(hoType == Xn_Based_Inter_CU_HO)
{
- DU_LOG("\nEnter Source CU ID for Inter-CU Handover : ");
- scanf("%d", &sourceId);
DU_LOG("\nEnter Target CU ID for Inter-CU Handover : ");
DU_LOG("\nEnter Target CU ID for Inter-CU Handover : ");
- scanf("%d", &targetId);
+ scanf("%d", &tgtNodeId);
+ DU_LOG("\nEnter Target Physical Cell ID for Inter-CU Handover : ");
+ scanf("%d", &targetCellId);
DU_LOG("\nEnter CU UE F1AP ID to be handed over : ");
scanf("%d", &ueId);
DU_LOG("\nEnter CU UE F1AP ID to be handed over : ");
scanf("%d", &ueId);
- initiateInterCuHandover(
sourceId, target
Id, ueId);
+ initiateInterCuHandover(
tgtNodeId, targetCell
Id, ueId);
}
else if(hoType == Inter_DU_HO)
{
DU_LOG("\nEnter Source DU ID for Inter-DU Handover : ");
}
else if(hoType == Inter_DU_HO)
{
DU_LOG("\nEnter Source DU ID for Inter-DU Handover : ");
- scanf("%d", &s
ourc
eId);
+ scanf("%d", &s
rcNod
eId);
DU_LOG("\nEnter Target DU ID for Inter-DU Handover : ");
DU_LOG("\nEnter Target DU ID for Inter-DU Handover : ");
- scanf("%d", &t
arget
Id);
+ scanf("%d", &t
gtNode
Id);
DU_LOG("\nEnter DU UE F1AP ID to be handed over : ");
scanf("%d", &ueId);
DU_LOG("\nEnter DU UE F1AP ID to be handed over : ");
scanf("%d", &ueId);
- initiateInterDuHandover(s
ourceId, target
Id, ueId);
+ initiateInterDuHandover(s
rcNodeId, tgtNode
Id, ueId);
}
}
/* Start Idle mode paging when 'p' is received from console input */
}
}
/* Start Idle mode paging when 'p' is received from console input */