X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fric_stub%2Fric_stub_sctp.c;h=53e4d0caaed6a9a1183c3640ef5e4d131ae350f6;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=d4453cac09f0e269419ee4df4728e4c4bf40b8a1;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/ric_stub/ric_stub_sctp.c b/src/ric_stub/ric_stub_sctp.c index d4453cac0..53e4d0caa 100644 --- a/src/ric_stub/ric_stub_sctp.c +++ b/src/ric_stub/ric_stub_sctp.c @@ -82,7 +82,7 @@ S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, SctpIpAddr *ipAddr) { addrLstPtr->count++; addrLstPtr->addrs[(addrLstPtr->count - 1)].type = CM_INET_IPV4ADDR_TYPE; - addrLstPtr->addrs[(addrLstPtr->count - 1)].u.ipv4NetAddr = CM_INET_NTOH_U32(ipAddr->ipV4Addr); + addrLstPtr->addrs[(addrLstPtr->count - 1)].u.ipv4NetAddr = CM_INET_NTOH_UINT32(ipAddr->ipV4Addr); return ROK; } @@ -108,7 +108,7 @@ S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, SctpIpAddr *dstIpPtr) { /* Filling destination address */ destAddrPtr->type = CM_INET_IPV4ADDR_TYPE; - destAddrPtr->u.ipv4NetAddr = CM_INET_NTOH_U32(dstIpPtr->ipV4Addr); + destAddrPtr->u.ipv4NetAddr = CM_INET_NTOH_UINT32(dstIpPtr->ipV4Addr); return ROK; } @@ -210,7 +210,7 @@ S16 sctpSetSockOpts(CmInetFd *sock_Fd) * ****************************************************************/ S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd) { - U8 ret; + uint8_t ret; ret = cmInetListen(lstnSock_Fd, 1); if (ret != ROK) @@ -344,10 +344,10 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy) * ****************************************************************/ S16 sctpSockPoll() { - U16 ret = ROK; - U32 timeout; - U32 *timeoutPtr; - CmInetMemInfo memInfo; + uint16_t ret = ROK; + uint32_t timeout; + uint32_t *timeoutPtr; + CmInetMemInfo memInfo; sctpSockPollParams e2PollParams; memset(&e2PollParams, 0, sizeof(sctpSockPollParams)); @@ -404,9 +404,9 @@ S16 sctpSockPoll() * ****************************************************************/ -S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeoutPtr, CmInetMemInfo *memInfo) +S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, uint32_t *timeoutPtr, CmInetMemInfo *memInfo) { - U16 ret = ROK; + uint16_t ret = ROK; CM_INET_FD_SET(sockFd, &pollParams->readFd); ret = cmInetSelect(&pollParams->readFd, NULLP, timeoutPtr, &pollParams->numFd); if(CM_INET_FD_ISSET(sockFd, &pollParams->readFd)) @@ -430,11 +430,11 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou else if(connUp & (pollParams->port == ricParams.destPort)) { E2APMsgHdlr(pollParams->mBuf); - ODU_PUT_MSG(pollParams->mBuf); + ODU_PUT_MSG_BUF(pollParams->mBuf); } else { - ODU_PUT_MSG(pollParams->mBuf); + ODU_PUT_MSG_BUF(pollParams->mBuf); } } } @@ -459,7 +459,7 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou * ****************************************************************/ S16 sctpSend(Buffer *mBuf) { - U8 ret; + uint8_t ret; MsgLen len; /* number of actually sent octets */ CmInetMemInfo memInfo;