X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcu_stub%2Fcu_stub.c;h=d46ae04568e66e1a088a0e8d9063673139a9bd32;hb=4a17bf308d12edf226ccfbe0d728ab68d5e19622;hp=1a7fe9c57026c57cb8268c195fe617237c0015f1;hpb=b5a77f556b20a2acd7d653367fdcac030461f85b;p=o-du%2Fl2.git diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c index 1a7fe9c57..d46ae0456 100644 --- a/src/cu_stub/cu_stub.c +++ b/src/cu_stub/cu_stub.c @@ -133,7 +133,7 @@ uint8_t tst() void readCuCfg() { - uint8_t *numDu; + uint8_t numDu; uint32_t ipv4_du, ipv4_cu; DU_LOG("\nDEBUG --> CU_STUB : Reading CU configurations"); @@ -160,27 +160,56 @@ void readCuCfg() 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.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.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; - numDu = &cuCb.cuCfgParams.sctpParams.numDu; - while(*numDu < MAX_DU_SUPPORTED) + cuCb.cuCfgParams.egtpParams.numDu = 0; + numDu = 0; + while(numDu < MAX_DU_SUPPORTED) { /* 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]; + 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*/ 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]; - (*numDu)++; + 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]; + + /* 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]; + + (numDu)++; } + cuCb.cuCfgParams.egtpParams.minTunnelId = MIN_TEID; + cuCb.cuCfgParams.egtpParams.currTunnelId = cuCb.cuCfgParams.egtpParams.minTunnelId; + cuCb.cuCfgParams.egtpParams.maxTunnelId = MAX_TEID; + cuCb.cuCfgParams.egtpParams.numDu = numDu; + cuCb.cuCfgParams.sctpParams.numDu = numDu; #endif /*PLMN*/ @@ -196,16 +225,6 @@ void readCuCfg() cuCb.cuCfgParams.rrcVersion.extRrcVer = EXT_RRC_VER; - /* EGTP Parameters */ - cuCb.cuCfgParams.egtpParams.localIp.ipV4Pres = TRUE; - cuCb.cuCfgParams.egtpParams.localIp.ipV4Addr = ipv4_cu; - cuCb.cuCfgParams.egtpParams.localPort = CU_EGTP_PORT; - cuCb.cuCfgParams.egtpParams.destIp.ipV4Pres = TRUE; - cuCb.cuCfgParams.egtpParams.destIp.ipV4Addr = ipv4_du; - cuCb.cuCfgParams.egtpParams.destPort = DU_EGTP_PORT; - cuCb.cuCfgParams.egtpParams.minTunnelId = MIN_TEID; - cuCb.cuCfgParams.egtpParams.currTunnelId = cuCb.cuCfgParams.egtpParams.minTunnelId; - cuCb.cuCfgParams.egtpParams.maxTunnelId = MAX_TEID; } /* End of readCuCfg */ @@ -266,17 +285,11 @@ void initiateInterDuHandover(uint32_t sourceDuId, uint32_t targetDuId, uint32_t void *cuConsoleHandler(void *args) { char ch; - uint8_t teId = 0; + uint32_t teId = 0; + uint32_t duId; uint8_t ret = ROK; uint8_t cnt = 0; - - /* This variable is taken for sending specific number of downlink data packet. - * Presently the code is supporting total 4500 data packets trasfer for 3 UEs only with sleep(1). - * If you wants to pump data for 3 UE change the following macro values - * 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 = 500; + EgtpTeIdCb *teidCb = NULLP; while(true) { @@ -311,24 +324,45 @@ void *cuConsoleHandler(void *args) cnt++; } #else + + /* This variable is taken for sending specific number of downlink data packet. + * Presently the code is supporting total 4500 data packets trasfer for 3 UEs only with sleep(1). + * If you wants to pump data for 3 UE change the following macro values + * 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(teId = 1; teId <= NUM_TUNNEL_TO_PUMP_DATA; teId++) + for(duId = 1; duId<=MAX_DU_SUPPORTED; duId++) { - DU_LOG("\nDEBUG --> EGTP: Sending DL User Data(teId:%d)\n",teId); - cnt =0; - while(cnt < NUM_DL_PACKETS) + for(teId = 1; teId <= NUM_TUNNEL_TO_PUMP_DATA; teId++) { - ret = cuEgtpDatReq(teId); - if(ret != ROK) + 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("\nERROR --> EGTP: Issue with teid=%d\n",teId); - break; + DU_LOG("\nDEBUG --> EGTP: TunnelId Not Found for (duId %d, teId:%d)\n", duId, teId); } - /* TODO : sleep(1) will be removed later once we will be able to - * support the continuous data pack transfer */ - sleep(1); - cnt++; } } totalNumOfTestFlow--;