X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_egtp.c;h=3da1074434de00ac041251c32a91bd441b515771;hb=refs%2Fchanges%2F67%2F4867%2F1;hp=36d3978b18d9f17fcf02fb911b894bcb9b84e07d;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/du_app/du_egtp.c b/src/du_app/du_egtp.c index 36d3978b1..3da107443 100644 --- 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); - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); break; } default: { DU_LOG("\nEGTP : Invalid event %d", pst->event); - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); ret = RFAILED; } } break; } - case ENTKW: + case ENTRLC: { switch(pst->event) { @@ -572,7 +572,7 @@ uint8_t egtpHdlDatInd(EgtpMsg egtpMsg) 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; @@ -606,7 +606,7 @@ uint8_t egtpHdlDatInd(EgtpMsg egtpMsg) /* Send over UDP */ egtpSendMsg(egtpMsg.msg); - ODU_PUT_MSG(egtpMsg.msg); + ODU_PUT_MSG_BUF(egtpMsg.msg); return ROK; }/* EgtpHdlDatInd */ @@ -752,7 +752,8 @@ uint8_t egtpSendMsg(Buffer *mBuf) 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"); @@ -825,7 +826,8 @@ uint8_t egtpRecvMsg() 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); @@ -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 */ - 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);