X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcu_stub%2Fcu_stub.c;h=df86911b898f6bcb31ac30d9c85a005ced1fa02f;hb=b4e352a998576ab71aa74eb8b970f0ba39b471af;hp=d46ae04568e66e1a088a0e8d9063673139a9bd32;hpb=a0c99eea3978b9aa204e002c438a51df77cf92dd;p=o-du%2Fl2.git diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c index d46ae0456..df86911b8 100644 --- a/src/cu_stub/cu_stub.c +++ b/src/cu_stub/cu_stub.c @@ -133,8 +133,8 @@ uint8_t tst() void readCuCfg() { - uint8_t numDu; - uint32_t ipv4_du, ipv4_cu; + uint8_t numDu, *numRemoteCu; + uint32_t ipv4_du, ipv4_cu, ipv4_remote_cu; DU_LOG("\nDEBUG --> CU_STUB : Reading CU configurations"); @@ -150,57 +150,62 @@ 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; + cuCb.cuCfgParams.sctpParams.destCb[0].destIpAddr.ipV4Addr = ipv4_du; + cuCb.cuCfgParams.sctpParams.destCb[0].destIpAddr.ipV6Pres = false; cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu); - cuCb.cuCfgParams.sctpParams.sctpAssoc[0].cuIpAddr.ipV4Addr = ipv4_cu; - cuCb.cuCfgParams.sctpParams.sctpAssoc[0].cuIpAddr.ipV6Pres = false; + cuCb.cuCfgParams.sctpParams.localIpAddr.ipV4Addr = ipv4_cu; + cuCb.cuCfgParams.sctpParams.localIpAddr.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; + 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.egtpParams.egtpAssoc[0].localIp.ipV4Pres = TRUE; - cuCb.cuCfgParams.egtpParams.egtpAssoc[0].localIp.ipV4Addr = ipv4_cu; - cuCb.cuCfgParams.egtpParams.egtpAssoc[0].localPort = CU_EGTP_PORT[0]; - cuCb.cuCfgParams.egtpParams.egtpAssoc[0].destIp.ipV4Pres = TRUE; - cuCb.cuCfgParams.egtpParams.egtpAssoc[0].destIp.ipV4Addr = ipv4_du; - cuCb.cuCfgParams.egtpParams.egtpAssoc[0].destPort = DU_EGTP_PORT[0]; + cuCb.cuCfgParams.egtpParams.localIp.ipV4Pres = TRUE; + cuCb.cuCfgParams.egtpParams.localIp.ipV4Addr = ipv4_cu; + cuCb.cuCfgParams.egtpParams.localPort = F1_EGTP_PORT; + cuCb.cuCfgParams.egtpParams.dstCfg[0].dstIp.ipV4Pres = TRUE; + cuCb.cuCfgParams.egtpParams.dstCfg[0].dstIp.ipV4Addr = ipv4_du; + cuCb.cuCfgParams.egtpParams.dstCfg[0].dstPort = F1_EGTP_PORT; cuCb.cuCfgParams.egtpParams.minTunnelId = MIN_TEID; cuCb.cuCfgParams.egtpParams.currTunnelId = cuCb.cuCfgParams.egtpParams.minTunnelId; cuCb.cuCfgParams.egtpParams.maxTunnelId = MAX_TEID; cuCb.cuCfgParams.egtpParams.numDu = 1; #else - cuCb.cuCfgParams.sctpParams.numDu = 0; + /* CU IP Address and Port*/ + memset(&ipv4_du, 0, sizeof(uint32_t)); + cmInetAddr((S8*)LOCAL_IP_CU, &ipv4_cu); + + cuCb.cuCfgParams.sctpParams.localIpAddr.ipV4Addr = ipv4_cu; + cuCb.cuCfgParams.sctpParams.localIpAddr.ipV6Pres = false; + + /* SCTP and EGTP configuration for F1 Interface */ + cuCb.cuCfgParams.sctpParams.f1SctpInfo.port = F1_SCTP_PORT; + + cuCb.cuCfgParams.egtpParams.localIp.ipV4Pres = TRUE; + cuCb.cuCfgParams.egtpParams.localIp.ipV4Addr = ipv4_cu; + cuCb.cuCfgParams.egtpParams.localPort = F1_EGTP_PORT; + + cuCb.cuCfgParams.sctpParams.f1SctpInfo.numDestNode = 0; cuCb.cuCfgParams.egtpParams.numDu = 0; + numDu = 0; - while(numDu < MAX_DU_SUPPORTED) + while(numDu < NUM_F1_ASSOC) { - /* DU IP Address and Port*/ - memset(&ipv4_du, 0, sizeof(uint32_t)); - cmInetAddr((S8*)DU_IP_V4_ADDR[numDu], &ipv4_du); - cuCb.cuCfgParams.sctpParams.sctpAssoc[numDu].duIpAddr.ipV4Addr = ipv4_du; - cuCb.cuCfgParams.sctpParams.sctpAssoc[numDu].duIpAddr.ipV6Pres = false; - cuCb.cuCfgParams.sctpParams.sctpAssoc[numDu].duPort = DU_SCTP_PORT[numDu]; - - /* CU IP Address and Port*/ + /* DU IP Address */ memset(&ipv4_du, 0, sizeof(uint32_t)); - cmInetAddr((S8*)CU_IP_V4_ADDR, &ipv4_cu); - cuCb.cuCfgParams.sctpParams.sctpAssoc[numDu].cuIpAddr.ipV4Addr = ipv4_cu; - cuCb.cuCfgParams.sctpParams.sctpAssoc[numDu].cuIpAddr.ipV6Pres = false; - cuCb.cuCfgParams.sctpParams.sctpAssoc[numDu].cuPort = CU_SCTP_PORT_TO_DU[numDu]; + cmInetAddr((S8*)REMOTE_IP_DU[numDu], &ipv4_du); + + /* SCTP Parameters */ + cuCb.cuCfgParams.sctpParams.f1SctpInfo.destCb[numDu].destIpAddr.ipV4Addr = ipv4_du; + cuCb.cuCfgParams.sctpParams.f1SctpInfo.destCb[numDu].destIpAddr.ipV6Pres = false; + cuCb.cuCfgParams.sctpParams.f1SctpInfo.destCb[numDu].destPort = F1_SCTP_PORT; /* EGTP Parameters */ - memset(&ipv4_du, 0, sizeof(uint32_t)); - cmInetAddr((S8*)DU_IP_V4_ADDR[numDu], &ipv4_du); - cuCb.cuCfgParams.egtpParams.egtpAssoc[numDu].localIp.ipV4Pres = TRUE; - cuCb.cuCfgParams.egtpParams.egtpAssoc[numDu].localIp.ipV4Addr = ipv4_cu; - cuCb.cuCfgParams.egtpParams.egtpAssoc[numDu].localPort = CU_EGTP_PORT[numDu]; - cuCb.cuCfgParams.egtpParams.egtpAssoc[numDu].destIp.ipV4Pres = TRUE; - cuCb.cuCfgParams.egtpParams.egtpAssoc[numDu].destIp.ipV4Addr = ipv4_du; - cuCb.cuCfgParams.egtpParams.egtpAssoc[numDu].destPort = DU_EGTP_PORT[numDu]; + cuCb.cuCfgParams.egtpParams.dstCfg[numDu].dstIp.ipV4Pres = TRUE; + cuCb.cuCfgParams.egtpParams.dstCfg[numDu].dstIp.ipV4Addr = ipv4_du; + cuCb.cuCfgParams.egtpParams.dstCfg[numDu].dstPort = F1_EGTP_PORT; (numDu)++; } @@ -209,7 +214,26 @@ void readCuCfg() cuCb.cuCfgParams.egtpParams.currTunnelId = cuCb.cuCfgParams.egtpParams.minTunnelId; cuCb.cuCfgParams.egtpParams.maxTunnelId = MAX_TEID; cuCb.cuCfgParams.egtpParams.numDu = numDu; - cuCb.cuCfgParams.sctpParams.numDu = numDu; + cuCb.cuCfgParams.sctpParams.f1SctpInfo.numDestNode = numDu; + + /* SCTP configuration for Xn interface */ + cuCb.cuCfgParams.sctpParams.xnSctpInfo.port = XN_SCTP_PORT; + cuCb.cuCfgParams.sctpParams.xnSctpInfo.localNodeType = LOCAL_NODE_TYPE; + numRemoteCu = &cuCb.cuCfgParams.sctpParams.xnSctpInfo.numDestNode; + (*numRemoteCu) = 0; + while((*numRemoteCu) < NUM_XN_ASSOC) + { + /* Remote CU IP address */ + memset(&ipv4_remote_cu, 0, sizeof(uint32_t)); + cmInetAddr((S8*)REMOTE_IP_CU[*numRemoteCu], &ipv4_remote_cu); + + /* SCTP Parameters */ + cuCb.cuCfgParams.sctpParams.xnSctpInfo.destCb[*numRemoteCu].destIpAddr.ipV4Addr = ipv4_remote_cu; + cuCb.cuCfgParams.sctpParams.xnSctpInfo.destCb[*numRemoteCu].destIpAddr.ipV6Pres = false; + cuCb.cuCfgParams.sctpParams.xnSctpInfo.destCb[*numRemoteCu].destPort = XN_SCTP_PORT; + + (*numRemoteCu)++; + } #endif /*PLMN*/ @@ -267,29 +291,113 @@ void initiateInterDuHandover(uint32_t sourceDuId, uint32_t targetDuId, uint32_t BuildAndSendUeContextModificationReq(sourceDuId, ueCb, QUERY_CONFIG); } + /******************************************************************* * - * @brief Handles Console input + * @brief Initiates inter CU handover * * @details * - * Function : cuConsoleHandler + * Function : initiateInterCuHandover * - * Functionality: Handles Console input + * Functionality: Initiates the first procedure of inter-CU + * handover + * + * @params[in] Source CU Id + * Target CU Id + * UE Id to be handed off + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +void initiateInterCuHandover(uint32_t sourceCuId, uint32_t targetCuId, uint32_t ueId) +{ + DU_LOG("\nINFO --> CU_STUB: Inter-CU Handover Started for ueId [%d] from CU ID [%d] to CU ID [%d]", \ + ueId, sourceCuId, targetCuId); + //TODO : First message of HO procedure to be triggered here. Changes to be done in next commit. +} + +/******************************************************************* + * + * @brief start Dl data + * + * @details + * + * Function : startDlData + * + * Functionality: start the downlink data * * @params[in] * @return ROK - success * RFAILED - failure * * ****************************************************************/ -void *cuConsoleHandler(void *args) + +uint8_t startDlData() { - char ch; uint32_t teId = 0; uint32_t duId; uint8_t ret = ROK; uint8_t cnt = 0; + int32_t totalNumOfTestFlow = 20; EgtpTeIdCb *teidCb = NULLP; + + while(totalNumOfTestFlow) + { + for(duId = 1; duId <= cuCb.cuCfgParams.egtpParams.numDu; duId++) + { + for(teId = 1; teId <= NUM_TUNNEL_TO_PUMP_DATA; teId++) + { + teidCb = NULLP; + cmHashListFind(&(egtpCb.dstCb[duId-1].teIdLst), (uint8_t *)&(teId), sizeof(uint32_t), 0, (PTR *)&teidCb); + if(teidCb) + { + cnt =0; + DU_LOG("\nDEBUG --> EGTP: Sending DL User Data(duId %d, teId:%d)\n", duId, teId); + while(cnt < NUM_DL_PACKETS) + { + ret = cuEgtpDatReq(duId, teId); + if(ret != ROK) + { + DU_LOG("\nERROR --> EGTP: Issue with teid=%d\n",teId); + break; + } + /* TODO : sleep(1) will be removed later once we will be able to + * support the continuous data pack transfer */ + sleep(1); + cnt++; + } + } + else + { + DU_LOG("\nDEBUG --> EGTP: TunnelId Not Found for (duId %d, teId:%d)\n", duId, teId); + } + } + } + totalNumOfTestFlow--; + } + + return ROK; +} + +/******************************************************************* + * + * @brief Handles Console input + * + * @details + * + * Function : cuConsoleHandler + * + * Functionality: Handles Console input + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +void *cuConsoleHandler(void *args) +{ + char ch; while(true) { @@ -331,42 +439,8 @@ void *cuConsoleHandler(void *args) * NUM_TUNNEL_TO_PUMP_DATA = 9, NUM_DL_PACKETS = 1. * totalDataPacket = totalNumOfTestFlow * NUM_TUNNEL_TO_PUMP_DATA * NUM_DL_PACKETS * totalDataPacket = [500*9*1] */ - int32_t totalNumOfTestFlow = 2; - - while(totalNumOfTestFlow) - { - for(duId = 1; duId<=MAX_DU_SUPPORTED; duId++) - { - for(teId = 1; teId <= NUM_TUNNEL_TO_PUMP_DATA; teId++) - { - teidCb = NULLP; - cmHashListFind(&(egtpCb.dstCb[duId-1].teIdLst), (uint8_t *)&(teId), sizeof(uint32_t), 0, (PTR *)&teidCb); - if(teidCb) - { - cnt =0; - DU_LOG("\nDEBUG --> EGTP: Sending DL User Data(duId %d, teId:%d)\n", duId, teId); - while(cnt < NUM_DL_PACKETS) - { - ret = cuEgtpDatReq(duId, teId); - if(ret != ROK) - { - DU_LOG("\nERROR --> EGTP: Issue with teid=%d\n",teId); - break; - } - /* TODO : sleep(1) will be removed later once we will be able to - * support the continuous data pack transfer */ - sleep(1); - cnt++; - } - } - else - { - DU_LOG("\nDEBUG --> EGTP: TunnelId Not Found for (duId %d, teId:%d)\n", duId, teId); - } - } - } - totalNumOfTestFlow--; - } + + startDlData(); #endif continue; } @@ -374,16 +448,34 @@ void *cuConsoleHandler(void *args) /* Start Handover procedure towards DU when 'h' is received from console input */ else if(ch == 'h') { - uint32_t sourceDuId, targetDuId, ueId; + HandoverType hoType; + uint32_t sourceId, targetId, ueId; - DU_LOG("\nEnter Source DU ID for Inter-DU Handover"); - scanf("%d", &sourceDuId); - DU_LOG("\nEnter Target DU ID for Inter-DU Handover"); - scanf("%d", &targetDuId); - DU_LOG("\nEnter DU UE F1AP ID to be handed over"); - scanf("%d", &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); - initiateInterDuHandover(sourceDuId, targetDuId, ueId); + 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 : "); + scanf("%d", &targetId); + DU_LOG("\nEnter CU UE F1AP ID to be handed over : "); + scanf("%d", &ueId); + + initiateInterCuHandover(sourceId, targetId, ueId); + } + else if(hoType == Inter_DU_HO) + { + DU_LOG("\nEnter Source DU ID for Inter-DU Handover : "); + scanf("%d", &sourceId); + DU_LOG("\nEnter Target DU ID for Inter-DU Handover : "); + scanf("%d", &targetId); + DU_LOG("\nEnter DU UE F1AP ID to be handed over : "); + scanf("%d", &ueId); + + initiateInterDuHandover(sourceId, targetId, ueId); + } } /* Start Idle mode paging when 'p' is received from console input */ else if(ch == 'p') @@ -402,6 +494,23 @@ void *cuConsoleHandler(void *args) } continue; } + else if(ch == 'm') + { + uint8_t ueId = 1; + uint8_t duId = 1; + uint8_t duIdx = 0; + + DU_LOG("\nINFO --> CU_STUB: UE Context Mod for ueId [%d] at DU ID [%d]", \ + ueId, duId ); + DuDb *duDb = NULLP; + CuUeCb *ueCb = NULLP; + + SEARCH_DU_DB(duIdx, duId, duDb); + if(duDb) + ueCb = &duDb->ueCb[ueId-1]; + BuildAndSendUeContextModificationReq(duId, ueCb, MODIFY_UE); + + } } } /**********************************************************************