X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_egtp.c;h=f5fe7763833c430cf2fede54b989e00396cdadd6;hb=ca0353e5cb5699aecb6840efe9572934a1150e2b;hp=657a46ca1921dbed3ddd3dc43b011a57c05f2495;hpb=082b269b31990bb7ddc3b387e921bf7c68bf4292;p=o-du%2Fl2.git diff --git a/src/du_app/du_egtp.c b/src/du_app/du_egtp.c index 657a46ca1..f5fe77638 100644 --- a/src/du_app/du_egtp.c +++ b/src/du_app/du_egtp.c @@ -27,10 +27,10 @@ #include "du_app_mac_inf.h" #include "du_cfg.h" #include "du_egtp.h" +#include "du_app_rlc_inf.h" +#include "du_mgr.h" #include "du_utils.h" -/* Global variable declaration */ -EgtpGlobalCb egtpCb; /************************************************************************** * @brief Task Initiation callback function. @@ -58,10 +58,107 @@ uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason) memset (&egtpCb, 0, sizeof(EgtpGlobalCb)); protType = CM_INET_PROTO_UDP; + gDlDataRcvdCnt = 0; return ROK; } +/************************************************************************** +* @brief Function prints the src dest and msg reached to egtp. +* +* @details +* +* Function : callFlowEgtpActvTsk +* +* Functionality: +* Function prints the src dest and msg reached to egtp. +* +* @param[in] Pst *pst, Post structure of the primitive. +* +* @return void +* +***************************************************************************/ + +void callFlowEgtpActvTsk(Pst *pst) +{ + + char sourceTask[50]; + char destTask[50]="ENTEGTP"; + char message[100]; + + switch(pst->srcEnt) + { + case ENTDUAPP: + { + strcpy(sourceTask,"ENTDUAPP"); + switch(pst->event) + { + case EVTCFGREQ: + { + strcpy(message,"EVTCFGREQ"); + break; + } + case EVTSRVOPENREQ: + { + strcpy(message,"EVTSRVOPENREQ"); + break; + } + case EVTTNLMGMTREQ: + { + strcpy(message,"EVTTNLMGMTREQ"); + break; + } + default: + { + strcpy(message,"Invalid Event"); + break; + } + } + break; + } + case ENTEGTP: + { + strcpy(sourceTask,"ENTEGTP"); + switch(pst->event) + { + case EVTSTARTPOLL: + { + strcpy(message,"EVTSTARTPOLL"); + break; + } + default: + { + strcpy(message,"Invalid Event"); + break; + } + } + break; + } + case ENTRLC: + { + strcpy(sourceTask,"ENTRLC"); + switch(pst->event) + { + case EVTDATIND: + { + strcpy(message,"EVTDATIND"); + break; + } + default: + { + strcpy(message,"Invalid Event"); + break; + } + } + break; + } + default: + { + strcpy(sourceTask,"Invalid Source Entity Id"); + } + } + DU_LOG("\nCall Flow: %s -> %s : %s\n", sourceTask, destTask, message); +} /************************************************************************** * @brief Task Activation callback function. @@ -85,6 +182,10 @@ uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason) uint8_t egtpActvTsk(Pst *pst, Buffer *mBuf) { uint8_t ret = ROK; + +#ifdef CALL_FLOW_DEBUG_LOG + callFlowEgtpActvTsk(pst); +#endif switch(pst->srcEnt) { @@ -186,7 +287,7 @@ uint8_t egtpCfgReq(Pst *pst, EgtpConfig egtpCfg) memcpy(&egtpCb.egtpCfg, &egtpCfg, sizeof(EgtpConfig)); egtpCb.recvTptSrvr.addr.address = CM_INET_NTOH_UINT32(egtpCb.egtpCfg.localIp.ipV4Addr); - egtpCb.recvTptSrvr.addr.port = EGTP_DFLT_PORT; + egtpCb.recvTptSrvr.addr.port = EGTP_RECVR_PORT; egtpCb.dstCb.dstIp = CM_INET_NTOH_UINT32(egtpCb.egtpCfg.destIp.ipV4Addr); egtpCb.dstCb.dstPort = egtpCb.egtpCfg.destPort; @@ -374,7 +475,11 @@ uint8_t egtpSrvOpenPrc(uint8_t sockType, EgtpTptSrvr *server) * ***************************************************************************/ uint8_t egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) { - S8 ret; + uint8_t ret = ROK; + +#ifdef CALL_FLOW_DEBUG_LOG + DU_LOG("\nCall Flow: ENTDUAPP -> ENTEGTP : TNL_MGMT\n"); +#endif DU_LOG("\nDEBUG --> EGTP : Received tunnel management request"); switch(tnlEvt.action) @@ -415,7 +520,7 @@ uint8_t egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt) DU_LOG("\nDEBUG --> EGTP : Sending Tunnel management confirmation"); duHdlEgtpTnlMgmtCfm(tnlEvt); - return ROK; + return ret; } /************************************************************************** @@ -491,23 +596,18 @@ uint8_t egtpTnlAdd(EgtpTnlEvt tnlEvt) * ***************************************************************************/ uint8_t egtpTnlMod(EgtpTnlEvt tnlEvt) { -#if 0 - uint8_t ret; EgtpTeIdCb *teidCb = NULLP; - DU_LOG("\nINFO --> Tunnel modification : LocalTeid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid); + DU_LOG("\nINFO --> EGTP : Tunnel modification : LocalTeid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid); - cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(tnlEvt.teId), sizeof(uint32_t), 0, (PTR *)&teidCb); + cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(tnlEvt.lclTeid), sizeof(uint32_t), 0, (PTR *)&teidCb); if(teidCb == NULLP) { - DU_LOG("\nERROR --> Tunnel id not found"); + DU_LOG("\nERROR --> EGTP : Tunnel id not found"); return RFAILED; } - - teidCb->teId = tnlEvt.lclTeid; - DU_LOG("\nINFO --> Tunnel id is" , teidCb->teId); + teidCb->teId = tnlEvt.remTeid; teidCb->remTeId = tnlEvt.remTeid; -#endif return ROK; } @@ -542,7 +642,6 @@ uint8_t egtpTnlDel(EgtpTnlEvt tnlEvt) cmHashListDelete(&(egtpCb.dstCb.teIdLst), (PTR)teidCb); DU_FREE(teidCb, sizeof(EgtpTeIdCb)); egtpCb.dstCb.numTunn--; - return ROK; } @@ -571,6 +670,10 @@ uint8_t egtpHdlDatInd(EgtpMsg egtpMsg) uint32_t msgLen; EgtpMsgHdr *msgHdr; +#ifdef CALL_FLOW_DEBUG_LOG + DU_LOG("\nCall Flow: ENTDUAPP -> ENTEGTP : DATA_INDICATION\n"); +#endif + DU_LOG("\nDEBUG --> EGTP : Received Data Indication"); cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(egtpMsg.msgHdr.teId), sizeof(uint32_t), 0, (PTR *)&teidCb); @@ -771,11 +874,12 @@ uint8_t egtpSendMsg(Buffer *mBuf) uint16_t txLen; CmInetMemInfo info; CmInetAddr dstAddr; + static uint64_t numDataSent = 0; info.region = DU_APP_MEM_REGION; info.pool = DU_POOL; - dstAddr.port = EGTP_DFLT_PORT; + dstAddr.port = EGTP_RECVR_PORT; dstAddr.address = egtpCb.dstCb.dstIp; ret = cmInetSendMsg(&(egtpCb.dstCb.sendTptSrvr.sockFd), &dstAddr, &info, \ @@ -785,8 +889,11 @@ uint8_t egtpSendMsg(Buffer *mBuf) DU_LOG("\nERROR --> EGTP : Failed sending the message"); return RFAILED; } - - DU_LOG("\nDEBUG --> EGTP : Message Sent"); + else + { + DU_LOG("\nDEBUG --> EGTP : Sent UL Message [%ld]", numDataSent+1); + numDataSent++; + } return ROK; } @@ -811,13 +918,11 @@ uint8_t egtpSendMsg(Buffer *mBuf) uint8_t egtpRecvMsg() { uint8_t ret; /* Return value */ - uint8_t nMsg; /* Number of messages to read from UDP socked */ uint16_t bufLen; /* Length of received buffer */ Buffer *recvBuf; /* Received buffer */ CmInetAddr fromAddr; /* Egtp data sender address */ CmInetMemInfo memInfo; /* Buffer allocation info */ - nMsg = 0; memInfo.region = DU_APP_MEM_REGION; memInfo.pool = DU_POOL; @@ -831,11 +936,12 @@ uint8_t egtpRecvMsg() &recvBuf, (int16_t *)&bufLen, CM_INET_NO_FLAG); if(ret == ROK && recvBuf != NULLP) { - DU_LOG("\nDEBUG --> EGTP : Received DL Message[%d]\n", nMsg+1); - ODU_PRINT_MSG(recvBuf, 0 ,0); + DU_LOG("\nDEBUG --> EGTP : Received DL Message[%ld]\n", gDlDataRcvdCnt + 1); + //ODU_PRINT_MSG(recvBuf, 0 ,0); egtpHdlRecvData(recvBuf); + gDlDataRcvdCnt++; + } - nMsg++; } return ROK; @@ -902,11 +1008,11 @@ uint8_t egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) /* Extracting version fro 1st byte */ version = tmpByte[0] >> 5; - DU_LOG("\nDEBUG --> EGTP : Version %d", version); + //DU_LOG("\nDEBUG --> EGTP : Version %d", version); /* Decode message type */ ODU_REM_PRE_MSG((Data*)&(egtpMsg->msgHdr.msgType), mBuf); - DU_LOG("\nDEBUG --> EGTP : msgType %d", egtpMsg->msgHdr.msgType); + //DU_LOG("\nDEBUG --> EGTP : msgType %d", egtpMsg->msgHdr.msgType); /**************************************************************************** * Message length param is 2 bytes. So decode next 2 bytes from msg hdr and @@ -915,7 +1021,9 @@ uint8_t egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) ODU_REM_PRE_MSG(&tmpByte[1], mBuf); ODU_REM_PRE_MSG(&tmpByte[2], mBuf); msgLen = (tmpByte[1] << 8) | tmpByte[2]; - DU_LOG("\nDEBUG --> EGTP : msgLen %d", msgLen); + UNUSED(msgLen); + UNUSED(version); + //DU_LOG("\nDEBUG --> EGTP : msgLen %d", msgLen); /**************************************************************************** @@ -927,7 +1035,7 @@ uint8_t egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) ODU_REM_PRE_MSG(&tmpByte[3], mBuf); ODU_REM_PRE_MSG(&tmpByte[4], mBuf); egtpMsg->msgHdr.teId = (tmpByte[1] << 24) | (tmpByte[2] << 16) | (tmpByte[3] << 8) | tmpByte[4]; - DU_LOG("\nDEBUG --> EGTP : teId %d",egtpMsg->msgHdr.teId); + //DU_LOG("\nDEBUG --> EGTP : teId %d",egtpMsg->msgHdr.teId); /* If any one of S, E or PN flag is set, set extension present as true. */ @@ -1039,8 +1147,8 @@ uint8_t egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg) egtpMsg->msg = mBuf; - DU_LOG("\nDEBUG --> EGTP : DL Data Buffer after decoding header "); - ODU_PRINT_MSG(mBuf, 0, 0); + //DU_LOG("\nDEBUG --> EGTP : DL Data Buffer after decoding header "); + //ODU_PRINT_MSG(mBuf, 0, 0); /* Forward the data to duApp/RLC */