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
Changing the buildPlmnId function
[o-du/l2.git]
/
src
/
du_app
/
du_egtp.c
diff --git
a/src/du_app/du_egtp.c
b/src/du_app/du_egtp.c
index
36d3978
..
3da1074
100644
(file)
--- a/
src/du_app/du_egtp.c
+++ b/
src/du_app/du_egtp.c
@@
-110,19
+110,19
@@
uint8_t egtpActvTsk(Pst *pst, Buffer *mBuf)
case EVTSLOTIND:
{
ret = unpackEgtpSlotInd(egtpSlotInd, pst, mBuf);
case EVTSLOTIND:
{
ret = unpackEgtpSlotInd(egtpSlotInd, pst, mBuf);
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
break;
}
default:
{
DU_LOG("\nEGTP : Invalid event %d", pst->event);
break;
}
default:
{
DU_LOG("\nEGTP : Invalid event %d", pst->event);
- ODU_PUT_MSG(mBuf);
+ ODU_PUT_MSG
_BUF
(mBuf);
ret = RFAILED;
}
}
break;
}
ret = RFAILED;
}
}
break;
}
- case ENT
KW
:
+ case ENT
RLC
:
{
switch(pst->event)
{
{
switch(pst->event)
{
@@
-572,7
+572,7
@@
uint8_t egtpHdlDatInd(EgtpMsg egtpMsg)
teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 1] &= ~(EGTP_MASK_BIT3);
}
teidCb->preEncodedHdr.hdr[EGTP_MAX_HDR_LEN - 1] &= ~(EGTP_MASK_BIT3);
}
- ODU_
FIND_MSG_LEN(egtpMsg.msg,
&tPduSize);
+ ODU_
GET_MSG_LEN(egtpMsg.msg, (int16_t *)
&tPduSize);
/*Adjust the header to fill the correct length*/
msgLen = tPduSize + (EGTP_MAX_HDR_LEN - hdrLen) - 0x08;
/*Adjust the header to fill the correct length*/
msgLen = tPduSize + (EGTP_MAX_HDR_LEN - hdrLen) - 0x08;
@@
-606,7
+606,7
@@
uint8_t egtpHdlDatInd(EgtpMsg egtpMsg)
/* Send over UDP */
egtpSendMsg(egtpMsg.msg);
/* Send over UDP */
egtpSendMsg(egtpMsg.msg);
- ODU_PUT_MSG(egtpMsg.msg);
+ ODU_PUT_MSG
_BUF
(egtpMsg.msg);
return ROK;
}/* EgtpHdlDatInd */
return ROK;
}/* EgtpHdlDatInd */
@@
-752,7
+752,8
@@
uint8_t egtpSendMsg(Buffer *mBuf)
dstAddr.port = EGTP_DFLT_PORT;
dstAddr.address = egtpCb.dstCb.dstIp;
dstAddr.port = EGTP_DFLT_PORT;
dstAddr.address = egtpCb.dstCb.dstIp;
- ret = cmInetSendMsg(&(egtpCb.dstCb.sendTptSrvr.sockFd), &dstAddr, &info, mBuf, &txLen, CM_INET_NO_FLAG);
+ ret = cmInetSendMsg(&(egtpCb.dstCb.sendTptSrvr.sockFd), &dstAddr, &info, \
+ mBuf, (int16_t *)&txLen, CM_INET_NO_FLAG);
if(ret != ROK && ret != RWOULDBLOCK)
{
DU_LOG("\nEGTP : Failed sending the message");
if(ret != ROK && ret != RWOULDBLOCK)
{
DU_LOG("\nEGTP : Failed sending the message");
@@
-825,7
+826,8
@@
uint8_t egtpRecvMsg()
while(nMsg < EGTP_MAX_MSG_RECV)
{
bufLen = -1;
while(nMsg < EGTP_MAX_MSG_RECV)
{
bufLen = -1;
- ret = cmInetRecvMsg(&(egtpCb.recvTptSrvr.sockFd), &fromAddr, &memInfo, &recvBuf, &bufLen, CM_INET_NO_FLAG);
+ ret = cmInetRecvMsg(&(egtpCb.recvTptSrvr.sockFd), &fromAddr, &memInfo, \
+ &recvBuf, (int16_t *)&bufLen, CM_INET_NO_FLAG);
if(ret == ROK && recvBuf != NULLP)
{
DU_LOG("\nEGTP : Received DL Message[%d]\n", nMsg+1);
if(ret == ROK && recvBuf != NULLP)
{
DU_LOG("\nEGTP : Received DL Message[%d]\n", nMsg+1);
@@
-861,7
+863,7
@@
uint8_t egtpDecodeHdr(Buffer *mBuf, EgtpMsg *egtpMsg)
uint8_t extHdrLen = 0; /* Extension hdr length */
bool extPres = FALSE; /* Flag for indication of S, E or P presense flag */
uint8_t extHdrLen = 0; /* Extension hdr length */
bool extPres = FALSE; /* Flag for indication of S, E or P presense flag */
- ODU_
FIND_MSG_LEN(mBuf,
&bufLen);
+ ODU_
GET_MSG_LEN(mBuf, (int16_t *)
&bufLen);
/* Decode first byte and storing in temporary variable */
ODU_REM_PRE_MSG(&tmpByte[0], mBuf);
/* Decode first byte and storing in temporary variable */
ODU_REM_PRE_MSG(&tmpByte[0], mBuf);