Merge "Added a new Flag ODU_LWR_MAC_DEBUG in the code"

[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..36f03fe 100644 (file)
--- a/src/du_app/du_egtp.c
+++ b/src/du_app/du_egtp.c
@@ -56,7 +56,7 @@ uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason)
 {
   DU_LOG("\n\nEGTP : Initializing");
 
-  memset ((uint8_t *)&egtpCb, 0, sizeof(EgtpGlobalCb));
+  memset (&egtpCb, 0, sizeof(EgtpGlobalCb));
   protType = CM_INET_PROTO_UDP;
 
   return ROK;
@@ -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)
          {
@@ -169,7 +169,7 @@ uint8_t egtpCfgReq(Pst *pst, EgtpConfig egtpCfg)
    Pst rspPst;      /* Response Pst structure */
    CmStatus cfgCfm; /* Configuration Confirm */
 
-   memcpy((uint8_t *)&egtpCb.egtpCfg, (uint8_t *)&egtpCfg, (PTR)sizeof(EgtpConfig));
+   memcpy(&egtpCb.egtpCfg, &egtpCfg, sizeof(EgtpConfig));
 
    egtpCb.recvTptSrvr.addr.address = CM_INET_NTOH_U32(egtpCb.egtpCfg.localIp.ipV4Addr);
    egtpCb.recvTptSrvr.addr.port = EGTP_DFLT_PORT;
@@ -222,7 +222,7 @@ uint8_t egtpCfgReq(Pst *pst, EgtpConfig egtpCfg)
 uint8_t egtpFillRspPst(Pst *pst, Pst *rspPst)
 {
 
-   memset((uint8_t *)rspPst, 0, sizeof(Pst));
+   memset(rspPst, 0, sizeof(Pst));
    rspPst->srcEnt = pst->dstEnt;
    rspPst->srcInst = pst->dstInst;
    rspPst->srcProcId = pst->dstProcId;
@@ -423,7 +423,7 @@ uint8_t egtpTnlAdd(EgtpTnlEvt tnlEvt)
       return LCM_REASON_MEM_NOAVAIL;
    }
 
-   memset((uint8_t *)teidCb, 0, sizeof(EgtpTeIdCb));
+   memset(teidCb, 0, sizeof(EgtpTeIdCb));
    teidCb->teId = tnlEvt.lclTeid;
    teidCb->remTeId = tnlEvt.remTeid;
 
@@ -437,7 +437,7 @@ uint8_t egtpTnlAdd(EgtpTnlEvt tnlEvt)
    egtpCb.dstCb.numTunn++;
 
    /* Encoding pre-defined header */
-   memset((uint8_t*)&preDefHdr, 0, sizeof(EgtpMsgHdr));
+   memset(&preDefHdr, 0, sizeof(EgtpMsgHdr));
    preDefHdr.msgType = EGTPU_MSG_GPDU;
    preDefHdr.teId = teidCb->remTeId;
    preDefHdr.extHdr.pdcpNmb.pres = FALSE;
@@ -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);