***************************************************************************/
uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason)
{
- DU_LOG("\n\nEGTP : Initializing");
+ DU_LOG("\n\nDEBUG --> EGTP : Initializing");
memset (&egtpCb, 0, sizeof(EgtpGlobalCb));
protType = CM_INET_PROTO_UDP;
+ gDlDataRcvdCnt = 0;
return ROK;
}
}
default:
{
- DU_LOG("\nEGTP : Invalid event %d", pst->event);
+ DU_LOG("\nERROR --> EGTP : Invalid event %d", pst->event);
ODU_PUT_MSG_BUF(mBuf);
ret = RFAILED;
}
{
case EVTSTARTPOLL:
{
- DU_LOG("\nEGTP : Starting Socket Polling");
+ DU_LOG("\nDEBUG --> EGTP : Starting Socket Polling");
egtpRecvMsg();
ODU_PUT_MSG_BUF(mBuf);
break;
}
default:
{
- DU_LOG("\nEGTP : Invalid event %d", pst->event);
+ DU_LOG("\nERROR --> EGTP : Invalid event %d", pst->event);
ODU_PUT_MSG_BUF(mBuf);
ret = RFAILED;
}
}
default:
{
- DU_LOG("\nEGTP : Invalid event %d", pst->event);
+ DU_LOG("\nERROR --> EGTP : Invalid event %d", pst->event);
ret = RFAILED;
}
}
}
default:
{
- DU_LOG("\nEGTP : Invalid source entity %d", pst->srcEnt);
+ DU_LOG("\nERROR --> EGTP : Invalid source entity %d", pst->srcEnt);
ret = RFAILED;
}
}
if(ret != ROK)
{
- DU_LOG("\nEGTP : TeId hash list initialization failed");
+ DU_LOG("\nERROR --> EGTP : TeId hash list initialization failed");
cfgCfm.status = LCM_PRIM_NOK;
cfgCfm.reason = LCM_REASON_HASHING_FAILED;
}
else
{
- DU_LOG("\nEGTP : EGTP configuration successful");
+ DU_LOG("\nDEBUG --> EGTP : EGTP configuration successful");
cfgCfm.status = LCM_PRIM_OK;
cfgCfm.reason = LCM_REASON_NOT_APPL;
}
CmStatus cfm; /* Confirmation status */
uint8_t sockType; /* Socket type */
- DU_LOG("\nEGTP : Received EGTP open server request");
+ DU_LOG("\nDEBUG --> EGTP : Received EGTP open server request");
sockType = CM_INET_DGRAM;
ret = egtpSrvOpenPrc(sockType, &(egtpCb.recvTptSrvr));
/* Opening and Binding receiver socket */
if(ret != ROK)
{
- DU_LOG("\nEGTP : Failed while opening receiver transport server");
+ DU_LOG("\nERROR --> EGTP : Failed while opening receiver transport server");
return ret;
}
/* Opening and Binding sender socket */
ret = egtpSrvOpenPrc(sockType, &(egtpCb.dstCb.sendTptSrvr));
if(ret != ROK)
{
- DU_LOG("\nEGTP : Failed while opening sender transport server");
+ DU_LOG("\nERROR --> EGTP : Failed while opening sender transport server");
return ret;
}
- DU_LOG("\nEGTP : Receiver socket[%d] and Sender socket[%d] open", egtpCb.recvTptSrvr.sockFd.fd, egtpCb.dstCb.sendTptSrvr.sockFd.fd);
+ DU_LOG("\nDEBUG --> EGTP : Receiver socket[%d] and Sender socket[%d] open", egtpCb.recvTptSrvr.sockFd.fd,\
+ egtpCb.dstCb.sendTptSrvr.sockFd.fd);
/* Start Socket polling */
memset(&egtpPst, 0, sizeof(egtpPst));
ret = cmInetSocket(sockType, &(server->sockFd), protType);
if(ret != ROK)
{
- DU_LOG("\nEGTP : Failed to open UDP socket");
+ DU_LOG("\nERROR --> EGTP : Failed to open UDP socket");
return ret;
}
ret = cmInetBind(&(server->sockFd), &(server->addr));
if(ret != ROK)
{
- DU_LOG("\nEGTP : Failed to bind socket");
+ DU_LOG("\nERROR --> EGTP : Failed to bind socket");
return ret;
}
* ***************************************************************************/
uint8_t egtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt)
{
- S8 ret;
+ uint8_t ret = ROK;
- DU_LOG("\nEGTP : Received tunnel management request");
+ DU_LOG("\nDEBUG --> EGTP : Received tunnel management request");
switch(tnlEvt.action)
{
case EGTP_TNL_MGMT_ADD:
}
default:
{
- DU_LOG("\nEGTP : Invalid tunnel management action[%d]", tnlEvt.action);
+ DU_LOG("\nERROR --> EGTP : Invalid tunnel management action[%d]", tnlEvt.action);
ret = LCM_REASON_INVALID_ACTION;
}
}
tnlEvt.cfmStatus.reason = ret;
}
- DU_LOG("\nEGTP : Sending Tunnel management confirmation");
+ DU_LOG("\nDEBUG --> EGTP : Sending Tunnel management confirmation");
duHdlEgtpTnlMgmtCfm(tnlEvt);
- return ROK;
+ return ret;
}
/**************************************************************************
EgtpTeIdCb *teidCb; /* Tunnel endpoint control block */
EgtpMsgHdr preDefHdr; /* pre-define header for this tunnel */
- DU_LOG("\nEGTP : Tunnel addition : LocalTeid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid);
+ DU_LOG("\nINFO --> EGTP : Tunnel addition : LocalTeid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid);
DU_ALLOC(teidCb, sizeof(EgtpTeIdCb));
if(teidCb == NULLP)
{
- DU_LOG("\nEGTP : Memory allocation failed");
+ DU_LOG("\nERROR --> EGTP : Memory allocation failed");
return LCM_REASON_MEM_NOAVAIL;
}
ret = cmHashListInsert(&(egtpCb.dstCb.teIdLst), (PTR)teidCb, (uint8_t *)&(teidCb->teId), sizeof(uint32_t));
if(ret != ROK)
{
- DU_LOG("\nEGTP : Failed to insert in hash list");
+ DU_LOG("\nERROR --> EGTP : Failed to insert in hash list");
DU_FREE(teidCb, sizeof(EgtpTeIdCb));
return LCM_REASON_HASHING_FAILED;
}
* ***************************************************************************/
uint8_t egtpTnlMod(EgtpTnlEvt tnlEvt)
{
-#if 0
- uint8_t ret;
EgtpTeIdCb *teidCb = NULLP;
- printf("\nTunnel 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)
{
- printf("\nTunnel id not found");
+ DU_LOG("\nERROR --> EGTP : Tunnel id not found");
return RFAILED;
}
-
- teidCb->teId = tnlEvt.lclTeid;
+ teidCb->teId = tnlEvt.remTeid;
teidCb->remTeId = tnlEvt.remTeid;
-#endif
return ROK;
}
{
EgtpTeIdCb *teidCb = NULLP;
- DU_LOG("\nEGTP : Tunnel deletion : Local Teid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid);
+ DU_LOG("\nINFO --> EGTP : Tunnel deletion : Local Teid[%d] Remote Teid[%d]", tnlEvt.lclTeid, tnlEvt.remTeid);
cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(tnlEvt.lclTeid), sizeof(uint32_t), 0, (PTR *)&teidCb);
if(teidCb == NULLP)
{
- DU_LOG("\nEGTP : Tunnel id[%d] not configured", tnlEvt.lclTeid);
+ DU_LOG("\nERROR --> EGTP : Tunnel id[%d] not configured", tnlEvt.lclTeid);
return LCM_REASON_INVALID_PAR_VAL;
}
cmHashListDelete(&(egtpCb.dstCb.teIdLst), (PTR)teidCb);
DU_FREE(teidCb, sizeof(EgtpTeIdCb));
egtpCb.dstCb.numTunn--;
-
return ROK;
}
uint32_t msgLen;
EgtpMsgHdr *msgHdr;
- DU_LOG("\nEGTP : Received Data Indication");
+ DU_LOG("\nDEBUG --> EGTP : Received Data Indication");
cmHashListFind(&(egtpCb.dstCb.teIdLst), (uint8_t *)&(egtpMsg.msgHdr.teId), sizeof(uint32_t), 0, (PTR *)&teidCb);
if(teidCb == NULLP)
{
- DU_LOG("\nEGTP : Tunnel id[%d] not configured", egtpMsg.msgHdr.teId);
+ DU_LOG("\nERROR --> EGTP : Tunnel id[%d] not configured", egtpMsg.msgHdr.teId);
return LCM_REASON_INVALID_PAR_VAL;
}
teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 1] &= ~(EGTP_MASK_BIT2);
}
- DU_LOG("\nEGTP : UL Data buffer before encoding header");
+ DU_LOG("\nDEBUG --> EGTP : UL Data buffer before encoding header");
ODU_PRINT_MSG(egtpMsg.msg, 0, 0);
ODU_ADD_PRE_MSG_MULT(&teidCb->preEncodedHdr.hdr[hdrLen], (EGTP_MAX_HDR_LEN - hdrLen), egtpMsg.msg);
- DU_LOG("\nEGTP : UL Data buffer after encoding header");
+ DU_LOG("\nDEBUG --> EGTP : UL Data buffer after encoding header");
ODU_PRINT_MSG(egtpMsg.msg, 0, 0);
/* Send over UDP */
mBuf, (int16_t *)&txLen, CM_INET_NO_FLAG);
if(ret != ROK && ret != RWOULDBLOCK)
{
- DU_LOG("\nEGTP : Failed sending the message");
+ DU_LOG("\nERROR --> EGTP : Failed sending the message");
return RFAILED;
}
- DU_LOG("\nEGTP : Message Sent");
+ DU_LOG("\nDEBUG --> EGTP : Message Sent");
return ROK;
}
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;
&recvBuf, (int16_t *)&bufLen, CM_INET_NO_FLAG);
if(ret == ROK && recvBuf != NULLP)
{
- DU_LOG("\nEGTP : Received DL Message[%d]\n", nMsg+1);
+ DU_LOG("\nDEBUG --> EGTP : Received DL Message[%ld]\n", gDlDataRcvdCnt + 1);
ODU_PRINT_MSG(recvBuf, 0 ,0);
egtpHdlRecvData(recvBuf);
+ gDlDataRcvdCnt++;
}
- nMsg++;
}
return ROK;
/* Extracting version fro 1st byte */
version = tmpByte[0] >> 5;
- DU_LOG("\nEGTP : Version %d", version);
+ DU_LOG("\nDEBUG --> EGTP : Version %d", version);
/* Decode message type */
ODU_REM_PRE_MSG((Data*)&(egtpMsg->msgHdr.msgType), mBuf);
- DU_LOG("\nEGTP : 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
ODU_REM_PRE_MSG(&tmpByte[1], mBuf);
ODU_REM_PRE_MSG(&tmpByte[2], mBuf);
msgLen = (tmpByte[1] << 8) | tmpByte[2];
- DU_LOG("\nEGTP : msgLen %d", msgLen);
+ DU_LOG("\nDEBUG --> EGTP : msgLen %d", msgLen);
/****************************************************************************
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("\nEGTP : 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. */
egtpMsg->msg = mBuf;
- DU_LOG("\nEGTP : DL Data Buffer after decoding header ");
+ DU_LOG("\nDEBUG --> EGTP : DL Data Buffer after decoding header ");
ODU_PRINT_MSG(mBuf, 0, 0);
/* Forward the data to duApp/RLC */
Code Review / o-du / l2.git / blobdiff