X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_inet.c;h=fc945f13e949812ee2af901b794db09b1743d477;hb=694adde1a08c393a8443fd5bbd4f036f5cf85403;hp=e7c600e4a688eda66544155d84c502f46d515995;hpb=6d3c64bdc3314b00244e259c4f5d5bd336d789db;p=o-du%2Fl2.git diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c index e7c600e4a..fc945f13e 100644 --- a/src/cm/cm_inet.c +++ b/src/cm/cm_inet.c @@ -152,6 +152,7 @@ extern "C" { #ifdef NTL_LIB #include "ntl_lib.h" #endif +#include "du_log.h" /* local defines */ @@ -320,7 +321,7 @@ Txt prntBuf[CMINET_PRNT_BUF_SIZE]; */ #ifdef ANSI -PUBLIC S16 cmInetPoll +S16 cmInetPoll ( CmInetPollFd *pollFdArr, /* poll FD Array */ U32 numFds, /* Number of Fds to be monitored */ @@ -328,7 +329,7 @@ S16 *numRdyFds, /* number of ready descriptors */ U32 timeout /* timeout value for Poll */ ) #else -PUBLIC S16 cmInetPoll(pollFdArr,numFds,numRdyFds,timeout) +S16 cmInetPoll(pollFdArr,numFds,numRdyFds,timeout) CmInetPollFd *pollFdArr; /* poll FD Array */ U32 numFds; /* Number of Fds to be monitored */ S16 *numRdyFds; /* number of ready descriptors */ @@ -337,7 +338,6 @@ U32 timeout; /* timeout value for Poll */ { S32 ret; - TRC2(cmInetPoll); ret = 0; *numRdyFds = 0; @@ -352,7 +352,7 @@ U32 timeout; /* timeout value for Poll */ #endif CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -364,21 +364,21 @@ U32 timeout; /* timeout value for Poll */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPoll() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ ret = poll(pollFdArr,numFds,timeout); if (ret == 0) { - RETVALUE(RTIMEOUT); + return (RTIMEOUT); } if (ret == INET_ERR) { switch(INET_ERR_CODE) { case ERR_EINTR: - RETVALUE(ROKDNA); + return (ROKDNA); default: #ifdef CMINETDBG @@ -387,14 +387,14 @@ U32 timeout; /* timeout value for Poll */ error(%d)\n", __FILE__, __LINE__, INET_ERR_CODE); SPrint(prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } /* end of switch */ } *numRdyFds = (S16)ret; - RETVALUE(ROK); + return ROK; } @@ -414,7 +414,7 @@ U32 timeout; /* timeout value for Poll */ */ #ifdef ANSI -PUBLIC S16 cmInetPollSetFd +S16 cmInetPollSetFd ( CmInetFd *sockFd, /* socket file descriptor */ CmInetPollFd *pollFdArr, /* poll FD Array */ @@ -422,7 +422,7 @@ S16 idx, /* poll Fd Array Index */ U16 eventMask /* Event Mask to be set */ ) #else -PUBLIC S16 cmInetPollSetFd(sockFd,pollFdArr,idx,eventMask) +S16 cmInetPollSetFd(sockFd,pollFdArr,idx,eventMask) CmInetFd *sockFd; /* socket file descriptor */ CmInetPollFd *pollFdArr; /* poll FD Array */ S16 idx; /* poll Fd Array Index */ @@ -430,7 +430,6 @@ U16 eventMask; /* Event Mask to be set */ #endif { - TRC2(cmInetPollSetFd); if ((idx) >= CM_INET_POLL_MAXFDSUPP || (idx) < 0) { @@ -440,7 +439,7 @@ U16 eventMask; /* Event Mask to be set */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -452,7 +451,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollSetFd() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -490,7 +489,7 @@ U16 eventMask; /* Event Mask to be set */ #endif /*ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(ROK); + return ROK; } @@ -511,14 +510,14 @@ U16 eventMask; /* Event Mask to be set */ */ #ifdef ANSI -PUBLIC S16 cmInetPollFdIsSet +S16 cmInetPollFdIsSet ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 idx, /* poll Fd Array Index */ U16 eventMask /* Event Mask to be set */ ) #else -PUBLIC S16 cmInetPollFdIsSet(pollFdArr,idx,eventMask) +S16 cmInetPollFdIsSet(pollFdArr,idx,eventMask) CmInetPollFd *pollFdArr; /* poll FD Array */ S16 idx; /* poll Fd Array Index */ U16 eventMask; /* Event Mask to be set */ @@ -526,7 +525,6 @@ U16 eventMask; /* Event Mask to be set */ { S16 ret; - TRC2(cmInetPollFdIsSet); if((idx < 0) || (idx > CM_INET_POLL_MAXFDSUPP)) { @@ -534,7 +532,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollFdIsSet() : Invalid Index (%d) \n",idx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -546,13 +544,13 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollFdIsSet() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ ret = (pollFdArr[idx].revents & eventMask); - RETVALUE(ret); + return (ret); } /* @@ -571,21 +569,20 @@ U16 eventMask; /* Event Mask to be set */ */ #ifdef ANSI -PUBLIC S16 cmInetPollClearFdREvent +S16 cmInetPollClearFdREvent ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 idx, /* poll Fd Array Index */ U16 eventMask /* Event Mask to be set */ ) #else -PUBLIC S16 cmInetPollClearFdREvent(sockFd,pollFdArr,eventMask) +S16 cmInetPollClearFdREvent(sockFd,pollFdArr,eventMask) CmInetPollFd *pollFdArr; /* poll FD Array */ S16 idx; /* poll Fd Array Index */ U16 eventMask; /* Event Mask to be set */ #endif { - TRC2(cmInetPollClearFdREvent); if((idx < 0) || (idx > CM_INET_POLL_MAXFDSUPP)) @@ -595,7 +592,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdREvent() : Invalid Index (%d) \n",idx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -607,7 +604,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdREvent() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -642,7 +639,7 @@ U16 eventMask; /* Event Mask to be set */ #endif /*ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(ROK); + return ROK; } @@ -663,21 +660,20 @@ U16 eventMask; /* Event Mask to be set */ */ #ifdef ANSI -PUBLIC S16 cmInetPollClearFdEvent +S16 cmInetPollClearFdEvent ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 idx, /* poll Fd Array Index */ U16 eventMask /* Event Mask to be set */ ) #else -PUBLIC S16 cmInetPollClearFdEvent(sockFd,pollFdArr,eventMask) +S16 cmInetPollClearFdEvent(sockFd,pollFdArr,eventMask) CmInetPollFd *pollFdArr; /* poll FD Array */ S16 idx; /* poll Fd Array Index */ U16 eventMask; /* Event Mask to be set */ #endif { - TRC2(cmInetPollClearFdEvent); if((idx < 0) || (idx > CM_INET_POLL_MAXFDSUPP)) @@ -687,7 +683,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdEvent() : Invalid Index (%d) \n",idx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) @@ -699,7 +695,7 @@ U16 eventMask; /* Event Mask to be set */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollClearFdEvent() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -734,7 +730,7 @@ U16 eventMask; /* Event Mask to be set */ #endif /*ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(ROK); + return ROK; } @@ -762,21 +758,20 @@ U16 eventMask; /* Event Mask to be set */ */ #ifdef ANSI -PUBLIC S16 cmInetPollDelFd +S16 cmInetPollDelFd ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 delIdx, /* poll Fd Array Index for which fd has to be deleted*/ S16 lastIdx /* Last index of poll Fd Array */ ) #else -PUBLIC S16 cmInetPollDelFd(pollFdArr, delIdx, lastIdx) +S16 cmInetPollDelFd(pollFdArr, delIdx, lastIdx) CmInetPollFd *pollFdArr; /* poll FD Array */ S16 delIdx; /* poll Fd Array Index for which fd has to be deleted*/ S16 lastIdx; /* Last index of poll Fd Array */ #endif { - TRC2(cmInetPollDelFd); if(lastIdx < delIdx || lastIdx < 0 || delIdx < 0) { @@ -785,7 +780,7 @@ S16 lastIdx; /* Last index of poll Fd Array */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollDelFd() : Invalid Index \n Current Index (%d) Delete Index (%d) \n",lastIdx,delIdx); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } @@ -797,7 +792,7 @@ S16 lastIdx; /* Last index of poll Fd Array */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollDelFd() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -823,7 +818,7 @@ S16 lastIdx; /* Last index of poll Fd Array */ pollFdArr[lastIdx].events = 0; pollFdArr[lastIdx].revents = 0; - RETVALUE(ROK); + return ROK; } @@ -845,18 +840,17 @@ S16 lastIdx; /* Last index of poll Fd Array */ */ #ifdef ANSI -PUBLIC S16 cmInetPollInitFdArr +S16 cmInetPollInitFdArr ( CmInetPollFd *pollFdArr /* poll FD Array */ ) #else -PUBLIC S16 cmInetPollInitFdArr(pollFdArr) +S16 cmInetPollInitFdArr(pollFdArr) CmInetPollFd *pollFdArr; /* poll FD Array */ #endif { S16 idx; - TRC2(cmInetPollInitFdArr); /* Sets each element of pollFdArr to initial value fd = -1 events = 0 @@ -871,7 +865,7 @@ CmInetPollFd *pollFdArr; /* poll FD Array */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetPollInitFdArr() : Invalid Parameter (pollFdArr is NULL)"); CMINETLOGERROR(ERRCLS_DEBUG, ECMINETXXX, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -881,7 +875,7 @@ CmInetPollFd *pollFdArr; /* poll FD Array */ pollFdArr[idx].events = 0; pollFdArr[idx].revents = 0; } - RETVALUE(ROK); + return ROK; } #if (!(defined(WIN32)) && !(defined(CMINETFLATBUF))) @@ -961,7 +955,7 @@ PRIVATE S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg) ret = SGetDBuf(info->region, info->pool, &dBuf[numBuf]); #endif if (ret != ROK) - RETVALUE(ret); + return (ret); /* Get the data part */ ret = SGetDataRx(dBuf[numBuf], 0, &dPtr, &dLen); @@ -1036,7 +1030,7 @@ PRIVATE S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg) msg->msg_iov = rxArr; msg->msg_iovlen = numBuf; - RETVALUE(ret); + return (ret); cleanup: /* cleanup */ @@ -1045,7 +1039,7 @@ cleanup: msg->msg_iovlen = 0; - RETVALUE(ret); + return (ret); } /* end of buildRecvBuf */ /* @@ -1140,7 +1134,7 @@ cleanup: i++; } - RETVALUE(ret); + return (ret); } /* end of buildRecvMsg */ @@ -1206,7 +1200,7 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in ret = SInitNxtDBuf(mBuf); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } iovIdx = 0; @@ -1221,7 +1215,7 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in { ret = SGetNxtDBuf(mBuf, &dBuf); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; dBufsToSkip --; } } @@ -1272,7 +1266,7 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in /* cm_inet_c_001.main_50 - Assign the value of dbufs packed in IO-vector */ *ioLen = allocLen; - RETVALUE(ret); + return (ret); } /* end of buildSendIovec */ #endif /* (defined(WIN32)) && !(defined(CMINETFLATBUF)) */ @@ -1301,7 +1295,7 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in #ifdef ANSI #ifdef CM_INET2 #ifdef IPV6_SUPPORTED -PUBLIC S16 cmInetSocket +S16 cmInetSocket ( U8 type, /* socket type */ CmInetFd *sockFd, /* socket file descriptor */ @@ -1309,7 +1303,7 @@ U8 protocol, /* protocol value */ U8 domain /* domain */ ) #else -PUBLIC S16 cmInetSocket +S16 cmInetSocket ( U8 type, /* socket type */ CmInetFd *sockFd, /* socket file descriptor */ @@ -1317,7 +1311,7 @@ U8 protocol /* protocol value */ ) #endif /* IPV6_SUPPORTED */ #else /* CM_INET2 */ -PUBLIC S16 cmInetSocket +S16 cmInetSocket ( U8 type, /* socket type */ CmInetFd *sockFd /* socket file descriptor */ @@ -1326,19 +1320,19 @@ CmInetFd *sockFd /* socket file descriptor */ #else #ifdef CM_INET2 #ifdef IPV6_SUPPORTED -PUBLIC S16 cmInetSocket(type, sockFd, protocol, domain) +S16 cmInetSocket(type, sockFd, protocol, domain) U8 type; /* socket type */ CmInetFd *sockFd; /* socket file descriptor */ U8 protocol; /* protocol value */ U8 domain; /* domain */ #else -PUBLIC S16 cmInetSocket(type, sockFd, protocol) +S16 cmInetSocket(type, sockFd, protocol) U8 type; /* socket type */ CmInetFd *sockFd; /* socket file descriptor */ U8 protocol; /* protocol value */ #endif /* IPV6_SUPPORTED */ #else /* CM_INET2 */ -PUBLIC S16 cmInetSocket(type, sockFd) +S16 cmInetSocket(type, sockFd) U8 type; /* socket type */ CmInetFd *sockFd; /* socket file descriptor */ #endif /* CM_INET2 */ @@ -1353,7 +1347,6 @@ CmInetFd *sockFd; /* socket file descriptor */ Bool bNewBehavior; #endif /* WIN2K && WIN32 */ - TRC2(cmInetSocket); #if (defined(WIN32) && defined(WIN2K)) bytesReturned = 0; @@ -1387,7 +1380,7 @@ CmInetFd *sockFd; /* socket file descriptor */ #endif /* CMINETDBG */ /* Set sockFd->fd to invalid socket */ sockFd->fd = CM_INET_INV_SOCKFD; - RETVALUE(RFAILED); + return RFAILED; } /* set socket type */ @@ -1409,7 +1402,7 @@ CmInetFd *sockFd; /* socket file descriptor */ if (ret != ROK) { ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_LINUX @@ -1419,7 +1412,7 @@ CmInetFd *sockFd; /* socket file descriptor */ if (ret != ROK) { ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } #endif /* CMINET_BSDCOMPAT */ #endif /* SS_LINUX */ @@ -1447,7 +1440,7 @@ CmInetFd *sockFd; /* socket file descriptor */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } } #endif /* WIN2K && WIN32 */ @@ -1466,12 +1459,12 @@ CmInetFd *sockFd; /* socket file descriptor */ if (ret != ROK) { ret = cmInetClose(sockFd); - RETVALUE(RFAILED); + return RFAILED; } } #endif /* CM_LKSCTP_NONBLOCK ends */ #endif - RETVALUE(ROK); + return ROK; } /* end of cmInetSocket */ @@ -1492,13 +1485,13 @@ CmInetFd *sockFd; /* socket file descriptor */ */ #ifdef ANSI -PUBLIC S16 cmInetBind +S16 cmInetBind ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *myAddr /* locale Internet address/port */ ) #else -PUBLIC S16 cmInetBind(sockFd, myAddr) +S16 cmInetBind(sockFd, myAddr) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *myAddr; /* locale Internet address/port */ #endif @@ -1514,21 +1507,20 @@ CmInetAddr *myAddr; /* locale Internet address/port */ U32 sizeOfAddr; /* sizeof address passed to the bind call */ CmInetSockAddr *sockAddrPtr; - TRC2(cmInetBind); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (myAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ #ifdef IPV6_SUPPORTED if (myAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&srcAddr6, 0, sizeof(srcAddr6)); + memset(&srcAddr6, 0, sizeof(srcAddr6)); srcAddr6.sin6_family = AF_INET6; srcAddr6.sin6_port = CM_INET_HTON_U16(myAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&srcAddr6.sin6_addr, @@ -1538,7 +1530,7 @@ CmInetAddr *myAddr; /* locale Internet address/port */ } else { - cmMemset((U8*)&srcAddr, 0, sizeof(srcAddr)); + memset(&srcAddr, 0, sizeof(srcAddr)); srcAddr.sin_family = AF_INET; srcAddr.sin_port = CM_INET_HTON_U16(myAddr->u.ipv4Addr.port); srcAddr.sin_addr.s_addr = CM_INET_HTON_U32(myAddr->u.ipv4Addr.address); @@ -1546,7 +1538,7 @@ CmInetAddr *myAddr; /* locale Internet address/port */ sockAddrPtr = (CmInetSockAddr *)&srcAddr; } #else - cmMemset((U8*)&srcAddr, 0, sizeof(srcAddr)); + memset(&srcAddr, 0, sizeof(srcAddr)); srcAddr.sin_family = AF_INET; srcAddr.sin_port = CM_INET_HTON_U16(myAddr->port); srcAddr.sin_addr.s_addr = CM_INET_HTON_U32(myAddr->address); @@ -1593,10 +1585,10 @@ CmInetAddr *myAddr; /* locale Internet address/port */ #endif /*ALIGN_64BIT*/ #endif /* IPV6_SUPPORTED */ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetBind */ /*cm_inet_c_001.main_38 Updated for TUCL 2.1 Release (Kernel SCTP Support) */ @@ -1618,14 +1610,14 @@ CmInetAddr *myAddr; /* locale Internet address/port */ * */ #ifdef ANSI -PUBLIC S16 cmInetSctpBindx +S16 cmInetSctpBindx ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddrLst *addrLst, /* local Internet address list */ U16 port /* port number */ ) #else -PUBLIC S16 cmInetSctpBindx(sockFd, addrLst, port) +S16 cmInetSctpBindx(sockFd, addrLst, port) CmInetFd *sockFd; /* socket file descriptor */ CmInetNetAddrLst *addrLst; /* locale Internet address list */ U16 port; /* port number */ @@ -1664,7 +1656,7 @@ U16 port; /* port number */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (addrLst == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } if(addrLst->count > CM_INET_NUM_NET_ADDR) @@ -1685,13 +1677,13 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET005, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); + memset(&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); #ifdef IPV6_SUPPORTED - cmMemset((U8*)&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); + memset(&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); #endif /* IPV6_SUPPORTED */ for (idx = 0; idx < addrLst->count; idx++) @@ -1717,7 +1709,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET057, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -1747,7 +1739,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET058, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -1755,7 +1747,7 @@ U16 port; /* port number */ addrLst->addrs[idx].u.ipv4NetAddr = CM_INET_HTON_U32(addrLst->addrs[idx].u.ipv4NetAddr); cmInetNtoa(addrLst->addrs[idx].u.ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)(addrs6[idx6].sin6_addr.s6_addr), ipv4Format); idx6++; @@ -1783,7 +1775,7 @@ U16 port; /* port number */ { sockAddrPtr = (struct sockaddr*)address_array; sockAddrLen = sizeof(struct sockaddr_in); - cmMemcpy((U8*)address_array, (U8*)addrs, ipv4_array_size); + memcpy(address_array, addrs, ipv4_array_size); } #ifdef IPV6_SUPPORTED else @@ -1794,7 +1786,7 @@ U16 port; /* port number */ if(ipv6_array_size > 0) { - cmMemcpy((U8*)(address_array + ipv4_array_size), (U8*)addrs6, ipv6_array_size); + memcpy((address_array + ipv4_array_size), addrs6, ipv6_array_size); } #endif /* IPV6_SUPPORTED */ @@ -1818,7 +1810,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET006, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } if (addrLst->count > 1) @@ -1849,7 +1841,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET059, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } ret = sctp_bindx(sockFd->fd, (Void*)tempAddrPtr, addrLst->count - 1, SCTP_BINDX_ADD_ADDR); @@ -1876,10 +1868,10 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET007, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* @@ -1897,7 +1889,7 @@ U16 port; /* port number */ * */ #ifdef ANSI -PUBLIC S16 cmInetSctpConnectx +S16 cmInetSctpConnectx ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddr *primAddr, /* primary destination Internet address */ @@ -1905,7 +1897,7 @@ CmInetNetAddrLst *addrLst, /* destination Internet address list */ U16 port /* port number */ ) #else -PUBLIC S16 cmInetSctpConnectx(sockFd, primAddr, addrLst, port) +S16 cmInetSctpConnectx(sockFd, primAddr, addrLst, port) CmInetFd *sockFd; /* socket file descriptor */ CmInetNetAddr *primAddr; /* primary destination Internet address */ CmInetNetAddrLst *addrLst; /* destination Internet address list */ @@ -1955,12 +1947,12 @@ U16 port; /* port number */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (primAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_58 : Added check for addrLst to fix klockwork issue */ if (addrLst == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_46: Included check for no of address aginst max */ if( addrLst->count > CM_INET_NUM_NET_ADDR ) @@ -1981,14 +1973,14 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET060, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); + memset(&addrs, 0, (sizeof(struct sockaddr_in) * CM_INET_NUM_NET_ADDR)); #ifdef IPV6_SUPPORTED - cmMemset((U8*)&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); + memset(&addrs6, 0, (sizeof(struct sockaddr_in6) * CM_INET_NUM_NET_ADDR)); #endif /* IPV6_SUPPORTED */ cnt = 0; @@ -2012,7 +2004,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET008, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -2041,14 +2033,14 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET061, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; addrs6[idx6].sin6_port = CM_INET_HTON_U16(port); ipv4NetAddr = CM_INET_HTON_U32(primAddr->u.ipv4NetAddr); cmInetNtoa(ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)&(addrs6[idx6].sin6_addr), ipv4Format); addresses_array_size += sizeof(struct sockaddr_in6); @@ -2118,7 +2110,7 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET009, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; @@ -2148,14 +2140,14 @@ U16 port; /* port number */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET062, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrs6[idx6].sin6_family = AF_INET6; addrs6[idx6].sin6_port = CM_INET_HTON_U16(port); ipv4NetAddr = CM_INET_HTON_U32(addrLst->addrs[idx].u.ipv4NetAddr); cmInetNtoa(ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)(addrs6[idx6].sin6_addr.s6_addr), ipv4Format); addresses_array_size += sizeof(struct sockaddr_in6); @@ -2189,22 +2181,22 @@ U16 port; /* port number */ if((ipv4_array_size > 0) && (ipv4_array_size <= (CM_INET_NUM_NET_ADDR * \ sizeof(struct sockaddr_in)))) { - cmMemcpy((U8*)address_array, (U8*)&addrs[0], ipv4_array_size); + memcpy(address_array, &addrs[0], ipv4_array_size); } else { - RETVALUE(RFAILED); + return RFAILED; } #ifdef IPV6_SUPPORTED if((ipv6_array_size > 0) && (ipv6_array_size <= (CM_INET_NUM_NET_ADDR * \ sizeof(struct sockaddr_in)))) { - cmMemcpy((U8*)(address_array + ipv4_array_size), (U8*)addrs6, ipv6_array_size); + memcpy((address_array + ipv4_array_size), addrs6, ipv6_array_size); } else { - RETVALUE(RFAILED); + return RFAILED; } #endif /* IPV6_SUPPORTED */ @@ -2296,10 +2288,8 @@ U16 port; /* port number */ " sockFd->fd(%ld)\n", INET_ERR_CODE, port, sockFd->fd); CMINETLOGERROR(ERRCLS_DEBUG, ECMINET010, 0, prntBuf); #else - /* cm_inet_c_001.main_62:Warning fix */ - snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "CmInetSctpConnectx() Failed : error(%d), port(0x%1x)," - " sockFd->fd(%d)\n", INET_ERR_CODE, port, sockFd->fd); - CMINETLOGERROR(ERRCLS_DEBUG, ECMINET010, 0, prntBuf); + DU_LOG("\nCmInetSctpConnectx() Failed : error(%d), port(0x%1x),\ + sockFd->fd(%d)\n", INET_ERR_CODE, port, sockFd->fd); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ @@ -2307,7 +2297,7 @@ U16 port; /* port number */ { /* non-blocking: connection is in progress */ case ERR_INPROGRESS: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* @@ -2315,37 +2305,37 @@ U16 port; /* port number */ * blocking : connection is already established */ case ERR_ISCONN: - RETVALUE(RISCONN); + return (RISCONN); break; /* resource temporarily unavailable */ case ERR_WOULDBLOCK: - RETVALUE(ROKDNA); + return (ROKDNA); break; /* non-blocking: connection is in progress */ case ERR_ALREADY: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; case ERR_INVAL: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* Check for connection refused and timeout errors */ case ERR_CONNREFUSED: case ERR_TIMEDOUT: - RETVALUE(RCLOSED); + return (RCLOSED); break; /* it is a real error */ default: - RETVALUE(RFAILED); + return RFAILED; break; } } - RETVALUE(ROK); + return ROK; } /* @@ -2363,14 +2353,14 @@ U16 port; /* port number */ * */ #ifdef ANSI -PUBLIC S16 cmInetSctpPeelOff +S16 cmInetSctpPeelOff ( CmInetFd *sockFd, /* socket file descriptor */ U32 assocId, /* association id */ CmInetFdType *assocFd /* association fd */ ) #else -PUBLIC S16 cmInetSctpPeelOff(sockFd, assocId, assocFd) +S16 cmInetSctpPeelOff(sockFd, assocId, assocFd) CmInetFd *sockFd; /* socket file descriptor */ U32 assocId; /* association id */ CmInetFdType *assocFd; /* association fd */ @@ -2382,7 +2372,7 @@ CmInetFdType *assocFd; /* association fd */ /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (assocFd == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -2406,12 +2396,12 @@ CmInetFdType *assocFd; /* association fd */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } *assocFd = ret; - RETVALUE(ROK); + return ROK; } /* @@ -2429,7 +2419,7 @@ CmInetFdType *assocFd; /* association fd */ * */ #ifdef ANSI -PUBLIC S16 cmInetSctpSendMsg +S16 cmInetSctpSendMsg ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddr *dstAddr, /* destination Internet address/port */ @@ -2444,7 +2434,7 @@ U32 ppId, /* opaque value passed along with the message */ U32 context /* value to be passed back, if error occurs */ ) #else -PUBLIC S16 cmInetSctpSendMsg(sockFd, dstAddr, port, info, mBuf, len, strmId, +S16 cmInetSctpSendMsg(sockFd, dstAddr, port, info, mBuf, len, strmId, unorderFlg, ttl, ppId, context) CmInetFd *sockFd; /* socket file descriptor */ CmInetNetAddr *dstAddr; /* destination Internet address/port */ @@ -2484,38 +2474,38 @@ U32 context; /* value to be passed back, if error occurs */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (mBuf == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&addr, 0, sizeof(struct sockaddr_in)); + memset(&addr, 0, sizeof(struct sockaddr_in)); #ifdef IPV6_SUPPORTED - cmMemset((U8*)&addr6, 0, sizeof(struct sockaddr_in6)); + memset(&addr6, 0, sizeof(struct sockaddr_in6)); #endif /* IPV6_SUPPORTED */ /* copy message to a flat buffer */ ret = SFndLenMsg(mBuf, &bufLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* max message length is limited to control the memory usage */ /* casting bufLen to avoid warnings */ if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN)) { - RETVALUE(RFAILED); + return RFAILED; } ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen); if ((ret != ROK) || (msgLen != bufLen)) { SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RFAILED); + return RFAILED; } if ( dstAddr != NULLP) @@ -2540,7 +2530,7 @@ U32 context; /* value to be passed back, if error occurs */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET012, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addr6.sin6_family = AF_INET6; @@ -2569,14 +2559,14 @@ U32 context; /* value to be passed back, if error occurs */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET064, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addr6.sin6_family = AF_INET6; addr6.sin6_port = CM_INET_HTON_U16(port); ipv4NetAddr = CM_INET_HTON_U32(dstAddr->u.ipv4NetAddr); cmInetNtoa(ipv4NetAddr, &addrString); addrLen = cmStrlen((U8*)addrString); - cmMemcpy((U8*)(ipv4Format+7), (U8*)addrString, addrLen); + memcpy((ipv4Format+7), addrString, addrLen); ipv4Format[7+addrLen] = '\0'; cmInetPton6((CmInetIpAddr6*)(addr6.sin6_addr.s6_addr), ipv4Format); sockAddrLen = sizeof(struct sockaddr_in6); @@ -2654,11 +2644,11 @@ U32 context; /* value to be passed back, if error occurs */ #endif /* CMINETDBG */ if ((INET_ERR_CODE == ERR_AGAIN) || (INET_ERR_CODE == ERR_WOULDBLOCK)) - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); else if (INET_ERR_CODE == ERR_PIPE) - RETVALUE(RCLOSED); + return (RCLOSED); else - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_58 : Fix for klockwork issue */ @@ -2667,7 +2657,7 @@ U32 context; /* value to be passed back, if error occurs */ /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(ROK); + return ROK; } /* @@ -2685,7 +2675,7 @@ U32 context; /* value to be passed back, if error occurs */ * */ #ifdef ANSI -PUBLIC S16 cmInetSctpRecvMsg +S16 cmInetSctpRecvMsg ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddr *srcAddr, /* source Internet address/port */ @@ -2698,7 +2688,7 @@ U32 *flag, /* flags */ CmInetSctpNotification *ntfy /* notification parameters */ ) #else -PUBLIC S16 cmInetSctpRecvMsg(sockFd, srcAddr, port, meminfo, mBuf, len, +S16 cmInetSctpRecvMsg(sockFd, srcAddr, port, meminfo, mBuf, len, sinfo, flag, ntfy) CmInetFd *sockFd; /* socket file descriptor */ CmInetNetAddr *srcAddr; /* source Internet address/port */ @@ -2734,14 +2724,14 @@ CmInetSctpNotification *ntfy; /* notification parameters */ (srcAddr == NULLP) || (port == NULLP) || (meminfo == NULLP) || (mBuf == NULLP) || (len == NULLP) || (sinfo == NULLP) || (flag == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ *mBuf = NULLP; *len = 0; - cmMemset((U8*)ntfy, 0, sizeof(CmInetSctpNotification)); + memset(ntfy, 0, sizeof(CmInetSctpNotification)); buflen = CM_INET_MAX_MSG_LEN; @@ -2755,13 +2745,13 @@ CmInetSctpNotification *ntfy; /* notification parameters */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failed to allocate memory\n"); CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET065, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } addrlen = sizeof(struct sockaddr_storage); msgFlags = 0; - cmMemset((U8*)&addr, 0, sizeof(struct sockaddr_storage)); - cmMemset((U8*)&info, 0, sizeof(struct sctp_sndrcvinfo)); + memset(&addr, 0, sizeof(struct sockaddr_storage)); + memset(&info, 0, sizeof(struct sctp_sndrcvinfo)); ret = sctp_recvmsg(sockFd->fd, (Void *)recvbuf, (size_t)buflen, (struct sockaddr*)&addr, &addrlen, &info, @@ -2778,14 +2768,12 @@ CmInetSctpNotification *ntfy; /* notification parameters */ " sockFd->fd(%ld)\n", INET_ERR_CODE, sockFd->fd); CMINETLOGERROR(ERRCLS_DEBUG, ECMINET014, 0, prntBuf); #else - /* cm_inet_c_001.main_62:Warning fix */ - snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetSctpRecvMsg() Failed : error(%d)," - " sockFd->fd(%d)\n", INET_ERR_CODE, sockFd->fd); - CMINETLOGERROR(ERRCLS_DEBUG, ECMINET014, 0, prntBuf); + DU_LOG("\ncmInetSctpRecvMsg() Failed : error(%d), sockFd->fd(%d)", \ + INET_ERR_CODE, sockFd->fd); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } /* save the length of the received message */ @@ -2802,7 +2790,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ if((cmMemcmp(ipv4Format, pAddr6->sin6_addr.s6_addr, 12)) == 0) { srcAddr->type = CM_INET_IPV4ADDR_TYPE; - cmMemcpy((U8*)&srcAddr->u.ipv4NetAddr, (U8*)((pAddr6->sin6_addr.s6_addr) + 12), sizeof(U32)); + memcpy(&srcAddr->u.ipv4NetAddr, ((pAddr6->sin6_addr.s6_addr) + 12), sizeof(U32)); srcAddr->u.ipv4NetAddr = CM_INET_HTON_U32(srcAddr->u.ipv4NetAddr); } @@ -2952,7 +2940,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ ntfy->u.remoteErr.data = NULLP; break; } - cmMemcpy(ntfy->u.remoteErr.data,\ + memcpy(ntfy->u.remoteErr.data,\ sctpNtfy->sn_remote_error.sre_data, datlen); #endif break; @@ -2972,7 +2960,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ ntfy->u.sndFailed.data = NULLP; break; } - cmMemcpy(ntfy->u.sndFailed.data,\ + memcpy(ntfy->u.sndFailed.data,\ sctpNtfy->sn_send_failed.ssf_data, datlen ); #endif ntfy->u.sndFailed.info.stream = sctpNtfy->sn_send_failed.ssf_info.sinfo_stream; @@ -3024,7 +3012,7 @@ CmInetSctpNotification *ntfy; /* notification parameters */ if (ret != ROK) { SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen); - RETVALUE(RFAILED); + return RFAILED; } ret = SAddPstMsgMult(recvbuf, *len, *mBuf); @@ -3032,14 +3020,14 @@ CmInetSctpNotification *ntfy; /* notification parameters */ { SPutMsg(*mBuf); SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen); - RETVALUE(RFAILED); + return RFAILED; } } /* cleanup */ SPutSBuf(meminfo->region, meminfo->pool, recvbuf, buflen); - RETVALUE(ROK); + return ROK; } /* @@ -3057,14 +3045,14 @@ CmInetSctpNotification *ntfy; /* notification parameters */ * */ #ifdef ANSI -PUBLIC S16 cmInetSctpGetPAddrs +S16 cmInetSctpGetPAddrs ( CmInetFd *sockFd, /* socket file descriptor */ U32 assocId, /* association id */ CmInetNetAddrLst *addrlst /* peer address list */ ) #else -PUBLIC S16 cmInetSctpGetPAddrs(sockFd, assocId, addrlst) +S16 cmInetSctpGetPAddrs(sockFd, assocId, addrlst) CmInetFd *sockFd; /* socket file descriptor */ U32 assocId; /* association id */ CmInetNetAddrLst *addrlst; /* peer address list */ @@ -3104,7 +3092,7 @@ CmInetNetAddrLst *addrlst; /* peer address list */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } byteAddress = (U8*)peerAddrList; @@ -3130,7 +3118,7 @@ CmInetNetAddrLst *addrlst; /* peer address list */ #endif /* CMINETDBG */ sctp_freepaddrs(peerAddrList); - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)byteAddress; @@ -3159,7 +3147,7 @@ CmInetNetAddrLst *addrlst; /* peer address list */ sctp_freepaddrs(peerAddrList); - RETVALUE(ROK); + return ROK; } /* @@ -3177,7 +3165,7 @@ CmInetNetAddrLst *addrlst; /* peer address list */ * */ #ifdef ANSI -PUBLIC S16 cmInetGetOpt +S16 cmInetGetOpt ( CmInetFd *sockFd, /* socket file descriptor */ U32 level, /* option level */ @@ -3185,7 +3173,7 @@ U32 type, /* option type */ Ptr value /* option value */ ) #else -PUBLIC S16 cmInetGetOpt(sockFd, level, type, value) +S16 cmInetGetOpt(sockFd, level, type, value) CmInetFd *sockFd; /* socket file descriptor */ U32 level; /* option level */ U32 type; /* option type */ @@ -3214,13 +3202,12 @@ Ptr value; /* option value */ /*cm_inet_c_001.main_58 : fix for klockwork issue */ S32 ret; - TRC2(cmInetGetOpt); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -3228,7 +3215,7 @@ Ptr value; /* option value */ { case CM_INET_OPT_SCTP_GET_ASSOC_STA: pSctpStatus = (CmInetSctpStatus*)value; - cmMemset((U8*)&status, 0, sizeof(struct sctp_status)); + memset(&status, 0, sizeof(struct sctp_status)); len = sizeof(status); status.sstat_assoc_id = pSctpStatus->assocId; @@ -3335,7 +3322,7 @@ Ptr value; /* option value */ default: { - RETVALUE(RFAILED); + return RFAILED; } break; } @@ -3368,16 +3355,18 @@ Ptr value; /* option value */ if (status.sstat_primary.spinfo_state == SCTP_ACTIVE) pSctpStatus->primary.isActive = TRUE; else + { pSctpStatus->primary.isActive = FALSE; pSctpStatus->primary.cwnd = status.sstat_primary.spinfo_cwnd; pSctpStatus->primary.srtt = status.sstat_primary.spinfo_srtt; pSctpStatus->primary.rto = status.sstat_primary.spinfo_rto; pSctpStatus->primary.mtu = status.sstat_primary.spinfo_mtu; - break; + } + break; case CM_INET_OPT_SCTP_GET_PADDR_INFO: pPeerAddrInfo = (CmInetSctpPeerAddrInfo*)value; - cmMemset((U8*)&addrInfo, 0, sizeof(struct sctp_paddrinfo)); + memset(&addrInfo, 0, sizeof(struct sctp_paddrinfo)); len = sizeof(addrInfo); addrInfo.spinfo_assoc_id = pPeerAddrInfo->assocId; @@ -3400,7 +3389,7 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET017, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(addrInfo.spinfo_address); @@ -3440,7 +3429,7 @@ Ptr value; /* option value */ pPeerAddrParams = (CmInetSctpPeerAddrParams *)value; - cmMemset((U8*)&addrParams, 0, sizeof(struct sctp_paddrparams)); + memset(&addrParams, 0, sizeof(struct sctp_paddrparams)); addrParams.spp_assoc_id = pPeerAddrParams->assocId; @@ -3465,7 +3454,7 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET066, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(addrParams.spp_address); @@ -3533,7 +3522,7 @@ Ptr value; /* option value */ pAssocParams = (CmInetSctpAssocParams *)value; - cmMemset((U8*)&assocParams, 0, sizeof(struct sctp_assocparams)); + memset(&assocParams, 0, sizeof(struct sctp_assocparams)); assocParams.sasoc_assoc_id = pAssocParams->assocId; @@ -3554,7 +3543,7 @@ Ptr value; /* option value */ pRtoInfo = (CmInetSctpRtoInfo *)value; - cmMemset((U8*)&rtoInfo, 0, sizeof(struct sctp_rtoinfo)); + memset(&rtoInfo, 0, sizeof(struct sctp_rtoinfo)); len = sizeof(rtoInfo); @@ -3571,7 +3560,7 @@ Ptr value; /* option value */ pInitMsg = (CmInetSctpInitMsg *)value; - cmMemset((U8*)&initMsg, 0, sizeof(struct sctp_initmsg)); + memset(&initMsg, 0, sizeof(struct sctp_initmsg)); len = sizeof(initMsg); @@ -3585,7 +3574,7 @@ Ptr value; /* option value */ break; default: - RETVALUE(RFAILED); + return RFAILED; } if (ret == INET_ERR) @@ -3604,10 +3593,10 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET067, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* cm_inet_c_001.main_54: Added new function cmInetShutDownSctp()*/ @@ -3626,12 +3615,12 @@ Ptr value; /* option value */ * */ #ifdef ANSI -PUBLIC S16 cmInetShutDownSctp +S16 cmInetShutDownSctp ( CmInetFd *sockFd /* socket file descriptor */ ) #else -PUBLIC S16 cmInetShutDownSctp(sockFd) +S16 cmInetShutDownSctp(sockFd) CmInetFd *sockFd; /* socket file descriptor */ #endif { @@ -3639,9 +3628,8 @@ PUBLIC S16 cmInetShutDownSctp(sockFd) S32 ret; struct sctp_sndrcvinfo sndRcvInfo; - TRC2(cmInetShutDownSctp); - cmMemset((U8*)&sndRcvInfo, 0, sizeof(sndRcvInfo)); + memset(&sndRcvInfo, 0, sizeof(sndRcvInfo)); #ifdef SUN_KSCTP sndRcvInfo.sinfo_flags = MSG_EOF; @@ -3669,10 +3657,10 @@ PUBLIC S16 cmInetShutDownSctp(sockFd) #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* cm_inet_c_001.main_61: Added new function cmInetAbortSctpAssoc()*/ @@ -3691,13 +3679,13 @@ PUBLIC S16 cmInetShutDownSctp(sockFd) * */ #ifdef ANSI -PUBLIC S16 cmInetAbortSctpAssoc +S16 cmInetAbortSctpAssoc ( CmInetFd *sockFd, /* socket file descriptor */ UConnId assocId /* Association ID */ ) #else -PUBLIC S16 cmInetAbortSctpAssoc(sockFd, assocId) +S16 cmInetAbortSctpAssoc(sockFd, assocId) CmInetFd *sockFd; /* socket file descriptor */ UConnId assocId; /* Association ID */ #endif @@ -3705,9 +3693,8 @@ PUBLIC S16 cmInetAbortSctpAssoc(sockFd, assocId) S32 ret; struct sctp_sndrcvinfo sndRcvInfo; - TRC2(cmInetAbortSctpAssoc); - cmMemset((U8*)&sndRcvInfo, 0, sizeof(sndRcvInfo)); + memset(&sndRcvInfo, 0, sizeof(sndRcvInfo)); #ifdef SUN_KSCTP sndRcvInfo.sinfo_flags = MSG_ABORT; @@ -3737,10 +3724,10 @@ PUBLIC S16 cmInetAbortSctpAssoc(sockFd, assocId) #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif @@ -3766,13 +3753,13 @@ PUBLIC S16 cmInetAbortSctpAssoc(sockFd, assocId) */ #ifdef ANSI -PUBLIC S16 cmInetConnect +S16 cmInetConnect ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *servAddr /* foreign Internet address/port */ ) #else -PUBLIC S16 cmInetConnect(sockFd, servAddr) +S16 cmInetConnect(sockFd, servAddr) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *servAddr; /* foreign Internet address/port */ #endif @@ -3788,21 +3775,20 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) S32 sizeOfAddr; CmInetSockAddr *sockAddrPtr; - TRC2(cmInetConnect); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (servAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ #ifdef IPV6_SUPPORTED if (servAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&dstAddr6, 0, sizeof(dstAddr6)); + memset(&dstAddr6, 0, sizeof(dstAddr6)); dstAddr6.sin6_family = AF_INET6; dstAddr6.sin6_port = CM_INET_HTON_U16(servAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&dstAddr6.sin6_addr, @@ -3812,7 +3798,7 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) } else { - cmMemset((U8*)&dstAddr, 0, sizeof(dstAddr)); + memset(&dstAddr, 0, sizeof(dstAddr)); dstAddr.sin_family = AF_INET; dstAddr.sin_port = CM_INET_HTON_U16(servAddr->u.ipv4Addr.port); dstAddr.sin_addr.s_addr = CM_INET_HTON_U32(servAddr->u.ipv4Addr.address); @@ -3820,7 +3806,7 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) sockAddrPtr = (CmInetSockAddr *)&dstAddr; } #else - cmMemset((U8*)&dstAddr, 0, sizeof(dstAddr)); + memset(&dstAddr, 0, sizeof(dstAddr)); dstAddr.sin_family = AF_INET; dstAddr.sin_port = CM_INET_HTON_U16(servAddr->port); dstAddr.sin_addr.s_addr = CM_INET_HTON_U32(servAddr->address); @@ -3835,7 +3821,7 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) { /* non-blocking: connection is in progress */ case ERR_INPROGRESS: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* @@ -3843,27 +3829,27 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) * blocking : connection is already established */ case ERR_ISCONN: - RETVALUE(RISCONN); + return (RISCONN); break; /* resource temporarily unavailable */ case ERR_WOULDBLOCK: - RETVALUE(ROKDNA); + return (ROKDNA); break; /* non-blocking: connection is in progress */ case ERR_ALREADY: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; case ERR_INVAL: - RETVALUE(RINPROGRESS); + return (RINPROGRESS); break; /* Check for connection refused and timeout errors */ case ERR_CONNREFUSED: case ERR_TIMEDOUT: - RETVALUE(RCLOSED); + return (RCLOSED); break; /* it is a real error */ @@ -3904,12 +3890,12 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) #endif /*ALIGN_64BIT*/ #endif /* IPV6_SUPPORTED */ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; break; } } - RETVALUE(ROK); + return ROK; } /* end of cmInetConnect */ @@ -3930,27 +3916,26 @@ PUBLIC S16 cmInetConnect(sockFd, servAddr) */ #ifdef ANSI -PUBLIC S16 cmInetListen +S16 cmInetListen ( CmInetFd *sockFd, /* socket file descriptor */ S16 backLog /* max. number of outstandig connections 0..5 */ ) #else -PUBLIC S16 cmInetListen(sockFd, backLog) +S16 cmInetListen(sockFd, backLog) CmInetFd *sockFd; /* socket file descriptor */ S16 backLog; /* max. number of outstandig connections 0..5 */ #endif { S32 ret; /* temporary return value */ - TRC2(cmInetListen); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (backLog < MIN_BACK_LOG) || (backLog > MAX_BACK_LOG)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -3971,10 +3956,10 @@ S16 backLog; /* max. number of outstandig connections 0..5 */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET021, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetListen */ @@ -3998,14 +3983,14 @@ S16 backLog; /* max. number of outstandig connections 0..5 */ */ #ifdef ANSI -PUBLIC S16 cmInetAccept +S16 cmInetAccept ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *fromAddr, /* calling Internet address/port */ CmInetFd *newSockFd /* socket file descriptor for new connection*/ ) #else -PUBLIC S16 cmInetAccept(sockFd, fromAddr, newSockFd) +S16 cmInetAccept(sockFd, fromAddr, newSockFd) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *fromAddr; /* calling Internet address/port */ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ @@ -4024,13 +4009,12 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ U32 optVal; /* added */ - TRC2(cmInetAccept) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -4053,7 +4037,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ if (INET_ERR_CODE == ERR_WOULDBLOCK) { /* no connection present to accept */ - RETVALUE(ROKDNA); + return (ROKDNA); } else { @@ -4071,7 +4055,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET022, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } @@ -4096,7 +4080,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET071, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* IPV6_SUPPORTED */ @@ -4109,11 +4093,11 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ if ( ret != ROK) { ret = cmInetClose(newSockFd); - RETVALUE(RFAILED); + return RFAILED; } #ifdef IPV6_SUPPORTED - cmMemset((U8*)fromAddr, 0, sizeof(fromAddr)); + memset(fromAddr, 0, sizeof(fromAddr)); if (addrLen == sizeof(struct sockaddr_in)) { peerAddr = (struct sockaddr_in *)&sockAddr; @@ -4135,7 +4119,7 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ fromAddr->port = CM_INET_NTOH_U16(peerAddr->sin_port); fromAddr->address = CM_INET_NTOH_U32(peerAddr->sin_addr.s_addr); #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; } /* end of cmInetAccept */ @@ -4172,7 +4156,6 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ struct cmsghdr *tempHdr; U8 len; - TRC2(cmInet4FillTos) len = 0; @@ -4194,7 +4177,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; }/* end of cmInet4FillTos */ /* @@ -4228,7 +4211,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ */ #ifdef ANSI -PUBLIC S16 cmInetSendDscpMsg +S16 cmInetSendDscpMsg ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *dstAddr, /* destination Internet address/port */ @@ -4241,7 +4224,7 @@ S16 flags /* additional control flags, unused */ ) #else /* added for IPv6 ext hdr */ -PUBLIC S16 cmInetSendDscpMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags) +S16 cmInetSendDscpMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *dstAddr; /* destination Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -4296,7 +4279,6 @@ S16 flags; /* additional control flags, unused */ MsgLen ioLen; #endif - TRC2(cmInetSendDscpMsg) UNUSED(flags); @@ -4305,14 +4287,14 @@ S16 flags; /* additional control flags, unused */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ /* added for IPv6 ext hdr */ #if !(defined(WIN32) || defined(CMINETFLATBUF)) #if (defined(SS_LINUX) || defined(_XPG4_2)) -/* cmMemset((U8*)cmsgData, 0, sizeof(cmsgData)); */ +/* memset(cmsgData, 0, sizeof(cmsgData)); */ #endif /* SS_LINUX || _XPG4_2 */ curMsgIdx = 0; #endif /* WIN32 | CMINETFLATBUF */ @@ -4327,7 +4309,7 @@ S16 flags; /* additional control flags, unused */ #ifdef IPV6_SUPPORTED if (dstAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&remAddr6, 0, sizeof(remAddr6)); + memset(&remAddr6, 0, sizeof(remAddr6)); remAddr6.sin6_family = AF_INET6; remAddr6.sin6_port = CM_INET_HTON_U16(dstAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&remAddr6.sin6_addr, @@ -4337,7 +4319,7 @@ S16 flags; /* additional control flags, unused */ } else { - cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); + memset(&remAddr, 0, sizeof(remAddr)); remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->u.ipv4Addr.port); remAddr.sin_addr.s_addr = @@ -4346,7 +4328,7 @@ S16 flags; /* additional control flags, unused */ sockAddrPtr = (CmInetSockAddr *)&remAddr; } #else -/* cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); */ +/* memset(&remAddr, 0, sizeof(remAddr)); */ remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->port); remAddr.sin_addr.s_addr = CM_INET_HTON_U32(dstAddr->address); @@ -4360,25 +4342,25 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &bufLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* max message length is limited to control the memory usage */ /* casting bufLen to avoid warnings */ if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN)) { - RETVALUE(RFAILED); + return RFAILED; } ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen); if ((ret != ROK) || (msgLen != bufLen)) { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RFAILED); + return RFAILED; } if (dstAddr == NULLP) @@ -4415,14 +4397,14 @@ S16 flags; /* additional control flags, unused */ if(INET_ERR_CODE == ERR_AGAIN) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* Check for ERR_WOULDBLOCK */ if(INET_ERR_CODE == ERR_WOULDBLOCK) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG @@ -4444,7 +4426,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble*/ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } @@ -4454,10 +4436,10 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } *len = ret; @@ -4468,7 +4450,7 @@ S16 flags; /* additional control flags, unused */ { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* cleanup */ @@ -4478,11 +4460,11 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &msgLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* added */ -/* cmMemset((U8*)&msg, 0, sizeof(msg)); */ +/* memset(&msg, 0, sizeof(msg)); */ msg.msg_flags = 0; if (dstAddr != NULLP) @@ -4603,7 +4585,7 @@ S16 flags; /* additional control flags, unused */ /* Compress the message into a single dBuf */ ret = SCompressMsg(mBuf); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; strtEndDBufNum = 0; /* Rebuild the send vector */ @@ -4612,13 +4594,13 @@ S16 flags; /* additional control flags, unused */ ret = buildSendIovec(mBuf, unSentLen, txArr, numDBufs, &i, &strtEndDBufNum, &ioLen); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; retVal = ROK; } } else - RETVALUE(RFAILED); + return RFAILED; } msg.msg_iov = txArr; msg.msg_iovlen = i; @@ -4643,7 +4625,7 @@ S16 flags; /* additional control flags, unused */ { /* cm_inet_c_001.main_50 - Return without making length 0, if in case the partial message was sent earlier */ - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG #ifndef ALIGN_64BIT @@ -4664,7 +4646,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble or not */ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } /* Check if connection was closed by the peer */ @@ -4673,9 +4655,9 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNABORTED)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_50 - Update the length only in successful cases */ @@ -4685,14 +4667,14 @@ S16 flags; /* additional control flags, unused */ * to be sent, then return WOULDBLOCK */ if (ret < ioLen) - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); unSentLen -= ret; } while (*len < msgLen); #endif /* WIN32 | CMINETFLATBUF */ - RETVALUE(ROK); + return ROK; } /* end of cmInetSendDscpMsg */ @@ -4727,7 +4709,7 @@ S16 flags; /* additional control flags, unused */ */ #ifdef ANSI -PUBLIC S16 cmInetSendMsg +S16 cmInetSendMsg ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *dstAddr, /* destination Internet address/port */ @@ -4743,7 +4725,7 @@ S16 flags /* additional control flags, unused */ #else /* added for IPv6 ext hdr */ #ifdef IPV6_OPTS_SUPPORTED -PUBLIC S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags) +S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *dstAddr; /* destination Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -4752,7 +4734,7 @@ MsgLen *len; /* number of actually sent octets */ CmInetIpHdrParm *ipHdrParams; /* IPv6 extensions headers */ S16 flags; /* additional control flags, unused */ #else -PUBLIC S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, flags) +S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, flags) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *dstAddr; /* destination Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -4808,7 +4790,6 @@ S16 flags; /* additional control flags, unused */ MsgLen ioLen; #endif - TRC2(cmInetSendMsg) UNUSED(flags); @@ -4817,14 +4798,14 @@ S16 flags; /* additional control flags, unused */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ /* added for IPv6 ext hdr */ #if !(defined(WIN32) || defined(CMINETFLATBUF)) #if (defined(SS_LINUX) || defined(_XPG4_2)) -/* cmMemset((U8*)cmsgData, 0, sizeof(cmsgData)); */ +/* memset(cmsgData, 0, sizeof(cmsgData)); */ #endif /* SS_LINUX || _XPG4_2 */ #ifdef IPV6_OPTS_SUPPORTED curMsgIdx = 0; @@ -4841,7 +4822,7 @@ S16 flags; /* additional control flags, unused */ #ifdef IPV6_SUPPORTED if (dstAddr->type == CM_INET_IPV6ADDR_TYPE) { - cmMemset((U8*)&remAddr6, 0, sizeof(remAddr6)); + memset(&remAddr6, 0, sizeof(remAddr6)); remAddr6.sin6_family = AF_INET6; remAddr6.sin6_port = CM_INET_HTON_U16(dstAddr->u.ipv6Addr.port); CM_INET_COPY_IPV6ADDR(&remAddr6.sin6_addr, @@ -4851,7 +4832,7 @@ S16 flags; /* additional control flags, unused */ } else { - cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); + memset(&remAddr, 0, sizeof(remAddr)); remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->u.ipv4Addr.port); remAddr.sin_addr.s_addr = @@ -4860,7 +4841,7 @@ S16 flags; /* additional control flags, unused */ sockAddrPtr = (CmInetSockAddr *)&remAddr; } #else -/* cmMemset((U8*)&remAddr, 0, sizeof(remAddr)); */ +/* memset(&remAddr, 0, sizeof(remAddr)); */ remAddr.sin_family = AF_INET; remAddr.sin_port = CM_INET_HTON_U16(dstAddr->port); remAddr.sin_addr.s_addr = CM_INET_HTON_U32(dstAddr->address); @@ -4874,25 +4855,25 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &bufLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* max message length is limited to control the memory usage */ /* casting bufLen to avoid warnings */ if ((bufLen > 0) && ((U32)bufLen > CM_INET_MAX_MSG_LEN)) { - RETVALUE(RFAILED); + return RFAILED; } ret = SGetSBuf(info->region, info->pool, &sendBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen); if ((ret != ROK) || (msgLen != bufLen)) { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RFAILED); + return RFAILED; } if (dstAddr == NULLP) @@ -4929,14 +4910,14 @@ S16 flags; /* additional control flags, unused */ if(INET_ERR_CODE == ERR_AGAIN) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* Check for ERR_WOULDBLOCK */ if(INET_ERR_CODE == ERR_WOULDBLOCK) { *len = 0; - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG @@ -4958,7 +4939,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble*/ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } @@ -4968,10 +4949,10 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } *len = ret; @@ -4982,7 +4963,7 @@ S16 flags; /* additional control flags, unused */ { /* cleanup */ SPutSBuf(info->region, info->pool, sendBuf, bufLen); - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } /* cleanup */ @@ -4992,11 +4973,11 @@ S16 flags; /* additional control flags, unused */ ret = SFndLenMsg(mBuf, &msgLen); if (ret != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* added */ -/* cmMemset((U8*)&msg, 0, sizeof(msg)); */ +/* memset(&msg, 0, sizeof(msg)); */ msg.msg_flags = 0; if (dstAddr != NULLP) @@ -5109,7 +5090,7 @@ S16 flags; /* additional control flags, unused */ /* Compress the message into a single dBuf */ ret = SCompressMsg(mBuf); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; strtEndDBufNum = 0; /* Rebuild the send vector */ @@ -5118,13 +5099,13 @@ S16 flags; /* additional control flags, unused */ ret = buildSendIovec(mBuf, unSentLen, txArr, numDBufs, &i, &strtEndDBufNum, &ioLen); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; retVal = ROK; } } else - RETVALUE(RFAILED); + return RFAILED; } msg.msg_iov = txArr; msg.msg_iovlen = i; @@ -5149,7 +5130,7 @@ S16 flags; /* additional control flags, unused */ { /* cm_inet_c_001.main_50 - Return without making length 0, if in case the partial message was sent earlier */ - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); } #ifdef CMINETDBG #ifndef ALIGN_64BIT @@ -5170,7 +5151,7 @@ S16 flags; /* additional control flags, unused */ /* check if network is reacheble or not */ if ((INET_ERR_CODE == ERR_NETUNREACH)) { - RETVALUE(RNETFAILED); + return (RNETFAILED); } /* Check if connection was closed by the peer */ @@ -5179,9 +5160,9 @@ S16 flags; /* additional control flags, unused */ (INET_ERR_CODE == ERR_CONNABORTED)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } /* cm_inet_c_001.main_50 - Update the length only in successful cases */ @@ -5191,14 +5172,14 @@ S16 flags; /* additional control flags, unused */ * to be sent, then return WOULDBLOCK */ if (ret < ioLen) - RETVALUE(RWOULDBLOCK); + return (RWOULDBLOCK); unSentLen -= ret; } while (*len < msgLen); #endif /* WIN32 | CMINETFLATBUF */ - RETVALUE(ROK); + return ROK; } /* end of cmInetSendMsg */ @@ -5243,7 +5224,6 @@ U8 protType; /* whether IPv4/IPv6 socket */ struct in6_addr lpBkAddr; U8 len; - TRC2(cmInet6BuildSendPktinfo) len = 0; @@ -5293,7 +5273,7 @@ U8 protType; /* whether IPv4/IPv6 socket */ if(protType == AF_INET6) { /* store ipv6 src addr */ - cmMemcpy((U8 *)&(ipv6Pktinfo->ipi6_addr), (U8 *)srcAddr, 16); + memcpy(&(ipv6Pktinfo->ipi6_addr), srcAddr, 16); len += 16; /* store interface index */ @@ -5318,7 +5298,7 @@ U8 protType; /* whether IPv4/IPv6 socket */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; }/* end of cmInet6BuildSendPktinfo */ #endif /* LOCAL_INTF */ @@ -5357,7 +5337,6 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ struct cmsghdr *tempHdr; U8 len; - TRC2(cmInetBuildSendHoplimit) len = 0; @@ -5383,7 +5362,7 @@ U32 *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; } /* end of cmInetBuildSendHoplimit */ #endif /* SS_LINUX */ @@ -5431,7 +5410,6 @@ U8 hdrId; /* 0: HBH hdr, 1:Dest Hdr */ U8 len; U8 optsIdx; - TRC2(cmInet6BuildSendHBHOpts) len = 0; optsIdx = 0; @@ -5482,8 +5460,8 @@ U8 hdrId; /* 0: HBH hdr, 1:Dest Hdr */ len += sizeof(hbhOptsArr->hbhOpts[optsIdx].length); /* copy all value bytes of current HBH/dest option to the flat buffer */ - cmMemcpy((U8 *)(cmsgBuf + len), - (U8 *)(hbhOptsArr->hbhOpts[optsIdx].value), + memcpy((cmsgBuf + len), + (hbhOptsArr->hbhOpts[optsIdx].value), hbhOptsArr->hbhOpts[optsIdx].length); len += hbhOptsArr->hbhOpts[optsIdx].length; } @@ -5512,7 +5490,7 @@ U8 hdrId; /* 0: HBH hdr, 1:Dest Hdr */ tempHdr->cmsg_len = len; *curMsgIdx += len; - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildSendHBHOpts */ @@ -5553,7 +5531,6 @@ U32 *curMsgIdx; /* idx in cmsgBuf where to start building RT hd */ U8 len; U8 addrIdx; - TRC2(cmInet6BuildSendRouteOpts); len = 0; addrIdx = 0; @@ -5602,13 +5579,13 @@ U32 *curMsgIdx; /* idx in cmsgBuf where to start building RT hd */ /* fill up all IPV6 addresses from rtOptsArr in the flat buffer */ for (addrIdx = 0; addrIdx < rtOptsArr->numAddrs; addrIdx++) { - cmMemcpy((U8 *)(cmsgBuf + len), - (U8 *)(rtOptsArr->ipv6Addrs[addrIdx]), 16); + memcpy((cmsgBuf + len), + (rtOptsArr->ipv6Addrs[addrIdx]), 16); len += 16; } *curMsgIdx += len; - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildSendRouteOpts */ @@ -5656,7 +5633,6 @@ CmInetMemInfo *info; /* Memory information */ U8 tempType; S16 ret; - TRC2(cmInet6BuildRecvHopOptsArr) /* get length of actual hbh ancillary data */ hbhDataLen -= sizeof(struct cmsghdr); @@ -5714,7 +5690,7 @@ CmInetMemInfo *info; /* Memory information */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failure 1 in cmInet6BuildRecvHopOptsArr\n"); CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET028, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(ROUTRES); + return (ROUTRES); } curDataIdx = 0; @@ -5813,11 +5789,11 @@ CmInetMemInfo *info; /* Memory information */ (Data *)hbhOptsArr->hbhOpts, numOpts * sizeof(CmInetIpv6HBHHdr)); hbhOptsArr->numHBHOpts = 0; hbhOptsArr->hbhOpts = NULLP; - RETVALUE(ROUTRES); + return (ROUTRES); } /* copy the value bytes */ - cmMemcpy((U8 *)hbhOptsArr->hbhOpts[optsIdx].value, - (U8 *)(cmsgData + curDataIdx), + memcpy(hbhOptsArr->hbhOpts[optsIdx].value, + (cmsgData + curDataIdx), hbhOptsArr->hbhOpts[optsIdx].length); curDataIdx += hbhOptsArr->hbhOpts[optsIdx].length; } @@ -5825,7 +5801,7 @@ CmInetMemInfo *info; /* Memory information */ /* get next option */ optsIdx++; } - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildRecvHopOptsArr() */ @@ -5867,7 +5843,6 @@ CmInetMemInfo *info; /* Memory information */ U8 i; /* loop counter */ S16 ret; /* temporary return value */ - TRC2(cmInet6BuildRecvRtHdr) /* byte len of actual rtHdr ancil data */ rtDataLen -= sizeof(struct cmsghdr); @@ -5892,8 +5867,8 @@ CmInetMemInfo *info; /* Memory information */ curDataIdx += 1; /* copy 1 reserve byte + 3 strict/loose bytes */ - cmMemcpy((U8 *)(&rtOptsArr->slMap), - (U8 *)(cmsgData + curDataIdx), 4); + memcpy((&rtOptsArr->slMap), + (cmsgData + curDataIdx), 4); curDataIdx += 4; /* also save reserv byte + 3 sl bytes to rtHdro struc */ @@ -5913,18 +5888,18 @@ CmInetMemInfo *info; /* Memory information */ snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SGetSBuf failure 1 in cmInet6BuildRecvRtHdr\n"); CMINETLOGERROR(ERRCLS_ADD_RES, ECMINET032, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(ROUTRES); + return (ROUTRES); } /* copy all the ipv6 addresses */ for(i=0; i < rtOptsArr->numAddrs; i++) { - cmMemcpy((U8 *)(rtOptsArr->ipv6Addrs[i]), - (U8 *)(cmsgData + curDataIdx), 16); + memcpy((rtOptsArr->ipv6Addrs[i]), + (cmsgData + curDataIdx), 16); curDataIdx += 16; } - RETVALUE(ROK); + return ROK; } /* end of cmInet6BuildRecvRtHdr() */ @@ -5977,7 +5952,7 @@ CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */ hopLimitValue = (U32 *)(cmsgData); ipv6HdrParam->ttl.val = (U8)(*hopLimitValue); - RETVALUE(ROK); + return ROK; } #endif /* IPV6_OPTS_SUPPORTED */ @@ -6011,7 +5986,7 @@ CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */ * */ #ifdef ANSI -PUBLIC S16 cmInetRecvMsg +S16 cmInetRecvMsg ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *fromAddr, /* sender Internet address/port */ @@ -6031,7 +6006,7 @@ S32 flags /* additional control flags */ /* added for IPv6 */ #ifdef IPV6_OPTS_SUPPORTED #ifdef LOCAL_INTF -PUBLIC S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, +S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, ipHdrParams, localIf, flags) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *fromAddr; /* sender Internet address/port */ @@ -6042,7 +6017,7 @@ CmInetIpHdrParm *ipHdrParams; /* IPv6 extensions headers */ CmInetLocalInf *localIf; /* local interface on which pkt was recvd */ S32 flags; /* additional control flags */ #else -PUBLIC S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, ipHdrParams, flags) +S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, ipHdrParams, flags) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *fromAddr; /* sender Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -6053,7 +6028,7 @@ S32 flags; /* additional control flags */ #endif /* LOCAL_INTF */ #else #ifdef LOCAL_INTF -PUBLIC S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, localIf, flags) +S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, localIf, flags) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *fromAddr; /* sender Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -6062,7 +6037,7 @@ MsgLen *len; /* number of octets to read */ CmInetLocalInf *localIf; /* local interface on which pkt was recvd */ S32 flags; /* additional control flags */ #else -PUBLIC S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, flags) +S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, flags) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *fromAddr; /* sender Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -6149,14 +6124,13 @@ S32 flags; /* additional control flags */ /* cm_inet_c_001.main_55:Removed unused variables errValue and optLen */ - TRC2(cmInetRecvMsg) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (info == NULLP) || (mPtr == NULLP) || (len == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -6180,13 +6154,13 @@ S32 flags; /* additional control flags */ #endif /* IPV6_SUPPORTED */ #if (defined(SS_LINUX) || defined(_XPG4_2)) - cmMemset((U8*)ancillData, 0, sizeof(ancillData)); + memset(ancillData, 0, sizeof(ancillData)); #endif /* SS_LINUX || _XPG4_2 */ #endif /* (WIN32 | CMINETFLATBUF) */ /* clear the structure */ - cmMemset((U8*)&remSockAddr, 0, sizeof(remSockAddr)); + memset(&remSockAddr, 0, sizeof(remSockAddr)); /* get number of pending data */ /* removed 3rd arg memInfo. MemInfo is no longer @@ -6202,7 +6176,7 @@ S32 flags; /* additional control flags */ if (ret != ROK) { /* ret may be RFAILED or ROUTRES */ - RETVALUE(ret); + return (ret); } } else @@ -6238,7 +6212,7 @@ S32 flags; /* additional control flags */ ret = cmInetPeekNew(sockFd, NULLP, info, 0, 1, readBuf); if (ret == RCLOSED) { - RETVALUE(ret); + return (ret); } /* cm_inet_c_001.main_56: * Returning ROKDNA even cmInetPeekNew returns ROK. Because currently @@ -6247,7 +6221,7 @@ S32 flags; /* additional control flags */ * cmInetGetNumRead at this point because of latency between the ioctl * call and recvfrom call issues on some machines ioctl call may * return ZERO even their a data to read. */ - RETVALUE(ROKDNA); + return (ROKDNA); } } /* cm_inet_c_001.main_52: Support for partial reception */ @@ -6314,7 +6288,7 @@ S32 flags; /* additional control flags */ ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } curLen = bufLen; bufPtr = recvBuf; @@ -6366,7 +6340,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { *len = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -6377,7 +6351,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } #ifdef CMINETDBG @@ -6395,7 +6369,7 @@ S32 flags; /* additional control flags */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } curLen -= recvLen; bufPtr += recvLen; @@ -6431,7 +6405,7 @@ S32 flags; /* additional control flags */ #endif { SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_48 : If Received @@ -6463,7 +6437,7 @@ S32 flags; /* additional control flags */ #endif /*ALIGN_64BIT*/ #endif SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_48 : copy data to a message structure */ @@ -6472,7 +6446,7 @@ S32 flags; /* additional control flags */ { /* cleanup */ SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ret); + return (ret); } #ifdef CM_INET2 @@ -6501,7 +6475,7 @@ S32 flags; /* additional control flags */ { SPutSBuf(info->region, info->pool, recvBuf, bufLen); SPutMsg(mBuf); - RETVALUE(ret); + return (ret); } *mPtr = mBuf; @@ -6553,7 +6527,7 @@ S32 flags; /* additional control flags */ numDBufs*sizeof(Buffer*)); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } /* Allocate dBufs for gather read */ @@ -6591,7 +6565,7 @@ S32 flags; /* additional control flags */ /* allocate flat receive buffer */ ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen); if (ret != ROK) - RETVALUE(ROUTRES); + return (ROUTRES); allocFlatBuf = TRUE; @@ -6611,7 +6585,7 @@ S32 flags; /* additional control flags */ { SPutSBuf(info->region, info->pool, (Data*)dBufs, numDBufs*sizeof(Buffer*)); - RETVALUE(ret); + return (ret); } } @@ -6683,9 +6657,9 @@ S32 flags; /* additional control flags */ * against unexpected WOULDBLOCKS observed in solaris */ if (*mPtr != NULLP) - RETVALUE(ROK); + return ROK; - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_50 - Free the buffer only when valid, it might be that @@ -6715,9 +6689,9 @@ S32 flags; /* additional control flags */ if (INET_ERR_CODE == ERR_CONNABORTED) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } bufLen -= recvLen; @@ -6765,7 +6739,7 @@ S32 flags; /* additional control flags */ &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.hbhOptsArr, 0, info); if (ret != ROK) - RETVALUE(ret); + return (ret); ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.hbhHdrPrsnt = TRUE; } @@ -6782,7 +6756,7 @@ S32 flags; /* additional control flags */ &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.destOptsArr, 1, info); if (ret != ROK) - RETVALUE(ret); + return (ret); ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.destOptsPrsnt = TRUE; } @@ -6794,7 +6768,7 @@ S32 flags; /* additional control flags */ &ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.rtOptsArr, info); if (ret != ROK) - RETVALUE(ret); + return (ret); ipHdrParams->u.ipv6HdrParm.ipv6ExtHdr.rtOptsPrsnt = TRUE; } @@ -6804,7 +6778,7 @@ S32 flags; /* additional control flags */ ret = cmInet6GetHopLimitValue((U8 *)CMSG_DATA(cmsgptr), cmsgptr->cmsg_len, &ipHdrParams->u.ipv6HdrParm); if (ret != ROK) - RETVALUE(ret); + return (ret); } } } /* for */ @@ -6822,8 +6796,8 @@ S32 flags; /* additional control flags */ localIf->intfPrsnt = TRUE; localIf->localIf = pkt6Info->ipi6_ifindex; localIf->localIfAddr.type = CM_INET_IPV6ADDR_TYPE; - cmMemcpy((U8 *)&localIf->localIfAddr.u.ipv6NetAddr, - (U8 *)(int *)&pkt6Info->ipi6_addr, 16); + memcpy(&localIf->localIfAddr.u.ipv6NetAddr, + &pkt6Info->ipi6_addr, 16); } } #endif /* LOCAL_INTF */ @@ -6895,7 +6869,7 @@ S32 flags; /* additional control flags */ { /* cleanup */ SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ret); + return (ret); } /* cm_inet_c_001.main_48 : A 0 len UDP packet could be received */ @@ -6906,7 +6880,7 @@ S32 flags; /* additional control flags */ { SPutSBuf(info->region, info->pool, recvBuf, bufLen); SPutMsg(tempMsg); - RETVALUE(ret); + return (ret); } } @@ -6933,7 +6907,7 @@ S32 flags; /* additional control flags */ SPutMsg(*mPtr); SPutSBuf(info->region, info->pool, (Data*)dBufs, numDBufs*sizeof(Buffer*)); - RETVALUE(ret); + return (ret); } } @@ -6953,7 +6927,7 @@ S32 flags; /* additional control flags */ SPutMsg(tempMsg); SPutSBuf(info->region, info->pool, (Data*)dBufs, numDBufs*sizeof(Buffer*)); - RETVALUE(RFAILED); + return RFAILED; } SPutMsg(tempMsg); } @@ -6999,7 +6973,7 @@ S32 flags; /* additional control flags */ { SPutMsg(*mPtr); } - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -7037,7 +7011,7 @@ S32 flags; /* additional control flags */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET069, 0, prntBuf); #endif #endif - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -7046,10 +7020,10 @@ S32 flags; /* additional control flags */ else { /* not enough data pending yet */ - RETVALUE(ROKDNA); + return (ROKDNA); } - RETVALUE(ROK); + return ROK; } /* end of cmInetRecvMsg */ @@ -7090,7 +7064,7 @@ S32 flags; /* additional control flags */ */ #ifdef ANSI -PUBLIC S16 cmInetPeekNew +S16 cmInetPeekNew ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *fromAddr, /* sender Internet address/port */ @@ -7100,7 +7074,7 @@ PUBLIC S16 cmInetPeekNew Data *data /* read data */ ) #else -PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) +S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *fromAddr; /* sender Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -7120,7 +7094,6 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) CmInetSockAddr remSockAddr; /* to get packet's source IP address */ #endif /* IPV6_SUPPORTED */ - TRC2(cmInetPeeknew); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -7128,7 +7101,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) (info == NULLP) || (data == NULLP) || (dataPos < 0) || (dataLen < 0)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7178,7 +7151,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) (INET_ERR_CODE == ERR_WOULDBLOCK)) { recvLen = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } /* cm_inet_c_001.main_61: added host unreachable check */ if ((INET_ERR_CODE == ERR_CONNABORTED) || @@ -7187,7 +7160,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) (INET_ERR_CODE == ERR_CONNREFUSED)) { recvLen = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } #ifdef CMINETDBG #ifndef ALIGN_64BIT @@ -7204,17 +7177,17 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) #endif #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else if (recvLen == 0) { - RETVALUE(RCLOSED); + return (RCLOSED); } /* cm_inet_c_001.main_57 - Fix for validation */ if (recvLen < (S32)dataLen) /* maybe happen */ { - RETVALUE(ROKDNA); + return (ROKDNA); } /* setup return destination Internet address */ @@ -7222,7 +7195,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) if ((fromAddr != NULLP) && (remAddrLen > 0)) { #ifdef IPV6_SUPPORTED - cmMemset((U8*)fromAddr, 0, sizeof(fromAddr)); + memset(fromAddr, 0, sizeof(fromAddr)); if (remAddrLen == sizeof(struct sockaddr_in6)) { remAddr6 = (struct sockaddr_in6 *)&remSockAddr; @@ -7247,7 +7220,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) #endif /* IPV6_SUPPORTED */ } - RETVALUE(ROK); + return ROK; } /* end of cmInetPeeknew */ @@ -7272,7 +7245,7 @@ PUBLIC S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) */ #ifdef ANSI -PUBLIC S16 cmInetPeek +S16 cmInetPeek ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *fromAddr, /* sender Internet address/port */ @@ -7282,7 +7255,7 @@ MsgLen dataLen, /* length of read data */ Data *data /* read data */ ) #else -PUBLIC S16 cmInetPeek(sockFd, fromAddr, info, dataPos, dataLen, data) +S16 cmInetPeek(sockFd, fromAddr, info, dataPos, dataLen, data) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *fromAddr; /* sender Internet address/port */ CmInetMemInfo *info; /* buffer allocation info */ @@ -7314,7 +7287,6 @@ Data *data; /* read data */ CmInetSockAddr remSockAddr; /* to get packet's source IP address */ #endif /* IPV6_SUPPORTED */ - TRC2(cmInetPeek); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -7322,7 +7294,7 @@ Data *data; /* read data */ (info == NULLP) || (data == NULLP) || (dataPos < 0) || (dataLen < 0)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7355,9 +7327,9 @@ Data *data; /* read data */ * errors just return RFAILED. */ if (ret == RCLOSED) - RETVALUE(RCLOSED); + return (RCLOSED); - RETVALUE(RFAILED); + return RFAILED; } /* check if connection got closed */ @@ -7371,7 +7343,7 @@ Data *data; /* read data */ * considered as connection closed. So return ROKDNA instead of * RCLOSED even for TCP sockets */ - RETVALUE(ROKDNA); + return (ROKDNA); } /* added check for TCP/UDP socket. Pending data len in the socket recv buffer is determined by ioctl call in cmInetGetNumRead. @@ -7413,7 +7385,7 @@ Data *data; /* read data */ ret = SGetSBuf(info->region, info->pool, &recvBuf, bufLen); if (ret != ROK) { - RETVALUE(ROUTRES); + return (ROUTRES); } /* added different recvfrom calls with @@ -7458,7 +7430,7 @@ Data *data; /* read data */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { recvLen = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } /* moved up the cleanup */ @@ -7482,16 +7454,16 @@ Data *data; /* read data */ (INET_ERR_CODE == ERR_CONNRESET)) { recvLen = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; } if (recvLen < (S32)bufLen) /* maybe happen */ { /* cleanup */ SPutSBuf(info->region, info->pool, recvBuf, bufLen); - RETVALUE(ROKDNA); + return (ROKDNA); } /* copy data */ @@ -7503,7 +7475,7 @@ Data *data; /* read data */ if ((fromAddr != NULLP) && (remAddrLen > 0)) { #ifdef IPV6_SUPPORTED - cmMemset((U8*)fromAddr, 0, sizeof(fromAddr)); + memset(fromAddr, 0, sizeof(fromAddr)); if (remAddrLen == sizeof(struct sockaddr_in6)) { remAddr6 = (struct sockaddr_in6 *)&remSockAddr; @@ -7534,16 +7506,16 @@ Data *data; /* read data */ else { /* not enough data pending yet */ - RETVALUE(ROKDNA); + return (ROKDNA); } } else { /* no data pending */ - RETVALUE(ROKDNA); + return (ROKDNA); } - RETVALUE(ROK); + return ROK; } /* end of cmInetPeek */ @@ -7563,24 +7535,23 @@ Data *data; /* read data */ */ #ifdef ANSI -PUBLIC S16 cmInetClose +S16 cmInetClose ( CmInetFd *sockFd /* socket file descriptor */ ) #else -PUBLIC S16 cmInetClose(sockFd) +S16 cmInetClose(sockFd) CmInetFd *sockFd; /* socket file descriptor */ #endif { S32 ret; /* temporary return value */ - TRC2(cmInetClose); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7605,10 +7576,10 @@ CmInetFd *sockFd; /* socket file descriptor */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET037, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetClose */ @@ -7637,26 +7608,25 @@ CmInetFd *sockFd; /* socket file descriptor */ */ #ifdef ANSI -PUBLIC S16 cmInetShutdown +S16 cmInetShutdown ( CmInetFd *sockFd, /* socket file descriptor */ S32 howTo /* operation flag */ ) #else -PUBLIC S16 cmInetShutdown(sockFd, howTo) +S16 cmInetShutdown(sockFd, howTo) CmInetFd *sockFd; /* socket file descriptor */ S32 howTo; /* operation flag */ #endif { S32 ret; /* temporary return value */ - TRC2(cmInetShutdown); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7666,7 +7636,7 @@ S32 howTo; /* operation flag */ if (INET_ERR_CODE == ERR_NOTCONN) { /* socket is not connected */ - RETVALUE(ROK); + return ROK; } else { @@ -7685,11 +7655,11 @@ S32 howTo; /* operation flag */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET038, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* end of cmInetShutdown */ @@ -7715,7 +7685,7 @@ S32 howTo; /* operation flag */ */ #ifdef ANSI -PUBLIC S16 cmInetSelect +S16 cmInetSelect ( CmInetFdSet *readFdS, /* read socket descriptor file set */ CmInetFdSet *writeFdS, /* write socket descriptor file set */ @@ -7723,7 +7693,7 @@ U32 *mSecTimeout, /* timeout in msecs */ S16 *numFdS /* number of ready descriptors */ ) #else -PUBLIC S16 cmInetSelect(readFdS, writeFdS, mSecTimeout, numFdS) +S16 cmInetSelect(readFdS, writeFdS, mSecTimeout, numFdS) CmInetFdSet *readFdS; /* read socket descriptor file set */ CmInetFdSet *writeFdS; /* write socket descriptor file set */ U32 *mSecTimeout; /* timeout in msecs */ @@ -7739,7 +7709,7 @@ S16 *numFdS; /* number of ready descriptors */ /* error check on parameters */ if (numFdS == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -7768,13 +7738,13 @@ S16 *numFdS; /* number of ready descriptors */ /* cm_inet_c_001.main_53 - Return ROKDNA in case select was interrupted */ if ((ret == INET_ERR) && (INET_ERR_CODE == ERR_EINTR)) { - RETVALUE(ROKDNA); + return (ROKDNA); } /* timeout occured */ if (ret == 0) { - RETVALUE(RTIMEOUT); + return (RTIMEOUT); } if (ret == INET_ERR) @@ -7786,7 +7756,7 @@ S16 *numFdS; /* number of ready descriptors */ switch(errCode = INET_ERR_CODE) { case ERR_INVAL: - RETVALUE(ROK); + return ROK; default: #ifdef CMINETDBG @@ -7796,7 +7766,7 @@ S16 *numFdS; /* number of ready descriptors */ INET_ERR_CODE); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET039, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } /* end of switch */ } @@ -7805,7 +7775,7 @@ S16 *numFdS; /* number of ready descriptors */ /* cm_inet_c_001.main_54: Fix for Klockworks issue */ *numFdS = (S16)ret; - RETVALUE(ROK); + return ROK; } /* end of cmInetSelect */ @@ -7967,7 +7937,7 @@ S16 *numFdS; /* number of ready descriptors */ * */ #ifdef ANSI -PUBLIC S16 cmInetSetOpt +S16 cmInetSetOpt ( CmInetFd *sockFd, /* socket file descriptor */ U32 level, /* option level */ @@ -7975,7 +7945,7 @@ U32 type, /* option type */ Ptr value /* option value */ ) #else -PUBLIC S16 cmInetSetOpt(sockFd, level, type, value) +S16 cmInetSetOpt(sockFd, level, type, value) CmInetFd *sockFd; /* socket file descriptor */ U32 level; /* option level */ U32 type; /* option type */ @@ -8061,19 +8031,18 @@ Ptr value; /* option value */ U32 *optVal; - TRC2(cmInetSetOpt); /* cm_inet_c_001.main_58 : Added NULL check for value field */ if(value == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -8123,7 +8092,7 @@ Ptr value; /* option value */ default: /* wrong value */ - RETVALUE(RFAILED); + return RFAILED; break; } break; @@ -8313,7 +8282,7 @@ Ptr value; /* option value */ if (*optVal == CM_INET_OPT_ENABLE) { #ifdef WIN32 - RETVALUE(RNA); + return (RNA); #else ret = setsockopt(sockFd->fd, level, IP_HDRINCL, (char*)&enable, sizeof(enable)); @@ -8322,7 +8291,7 @@ Ptr value; /* option value */ else if (*optVal == CM_INET_OPT_DISABLE) { #ifdef WIN32 - RETVALUE(RNA); + return (RNA); #else ret = setsockopt(sockFd->fd, level, IP_HDRINCL, (char*)&disable, sizeof(disable)); @@ -8344,14 +8313,14 @@ Ptr value; /* option value */ ret = setsockopt(sockFd->fd, level, IP_ROUTER_ALERT, (char*)&enable, sizeof(enable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } else if (*optVal == CM_INET_OPT_DISABLE) { ret = setsockopt(sockFd->fd, level, IP_ROUTER_ALERT, (char*)&disable, sizeof(disable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } break; #endif /* SS_LINUX */ @@ -8359,7 +8328,7 @@ Ptr value; /* option value */ /* set Router Alert socket option */ case CM_INET_OPT_IP_OPTIONS: #if (defined (SS_VW) || defined(SS_LINUX)) - RETVALUE(RNA); + return (RNA); #else tempTknStr64=(TknStr64 *)value; if (tempTknStr64->pres == TRUE) @@ -8380,7 +8349,7 @@ Ptr value; /* option value */ (char *)tempTknStr64->val, tempTknStr64->len); } else - RETVALUE(RFAILED); /* Trying to set IPv4 Hdr option + return RFAILED; /* Trying to set IPv4 Hdr option * without giving option values*/ #endif /* SS_VW || SS_LINUX */ break; @@ -8398,7 +8367,7 @@ Ptr value; /* option value */ (char*)&enable, sizeof(enable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } else if (*optVal == CM_INET_OPT_DISABLE) { @@ -8407,7 +8376,7 @@ Ptr value; /* option value */ (char*)&disable, sizeof(disable)); if (ret != ROK) - RETVALUE(RFAILED); + return RFAILED; } break; #endif /* LOCAL_INTF */ @@ -8642,7 +8611,7 @@ Ptr value; /* option value */ case CM_INET_OPT_LINGER: pSockLinger = (CmInetSockLinger *)value; - cmMemset((U8*)&lngr, 0, sizeof(struct linger)); + memset(&lngr, 0, sizeof(struct linger)); if (pSockLinger->enable == TRUE) lngr.l_onoff = 1; @@ -8656,7 +8625,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_EVENTS: pSctpEvent = (CmInetSctpSockEvent *)value; - cmMemset((U8*)&event, 0, sizeof(struct sctp_event_subscribe)); + memset(&event, 0, sizeof(struct sctp_event_subscribe)); if (pSctpEvent->dataIoEvent == TRUE) event.sctp_data_io_event = 1; @@ -8692,7 +8661,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_PRIM_ADDR: pSctpPrimAddr = (CmInetSctpPrimAddr *)value; - cmMemset((U8*)&setPrim, 0, sizeof(struct sctp_setprim)); + memset(&setPrim, 0, sizeof(struct sctp_setprim)); #ifdef IPV6_SUPPORTED if (pSctpPrimAddr->addr.type == CM_INET_IPV6ADDR_TYPE) @@ -8713,7 +8682,7 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET040, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(setPrim.ssp_addr); @@ -8743,7 +8712,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_PEERADDR_PARAMS: pSctpPAddrParams = (CmInetSctpPeerAddrParams *)value; - cmMemset((U8*)&addrParams, 0, sizeof(struct sctp_paddrparams)); + memset(&addrParams, 0, sizeof(struct sctp_paddrparams)); if (pSctpPAddrParams->s.addrPres == TRUE) @@ -8768,7 +8737,7 @@ Ptr value; /* option value */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } pAddr6 = (struct sockaddr_in6*)&(addrParams.spp_address); @@ -8846,7 +8815,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_ASSOC_PARAMS: pSctpAssocParams = (CmInetSctpAssocParams *)value; - cmMemset((U8*)&assocParams, 0, sizeof(struct sctp_assocparams)); + memset(&assocParams, 0, sizeof(struct sctp_assocparams)); assocParams.sasoc_cookie_life = pSctpAssocParams->cookieLife; assocParams.sasoc_asocmaxrxt = pSctpAssocParams->assocMaxReTx; @@ -8861,7 +8830,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_RTO_INFO: pSctpRtoInfo = (CmInetSctpRtoInfo *)value; - cmMemset((U8*)&rtoinfo, 0, sizeof(struct sctp_rtoinfo)); + memset(&rtoinfo, 0, sizeof(struct sctp_rtoinfo)); rtoinfo.srto_assoc_id = pSctpRtoInfo->assocId; rtoinfo.srto_initial = pSctpRtoInfo->rtoInitial; @@ -8874,7 +8843,7 @@ Ptr value; /* option value */ case CM_INET_OPT_SCTP_INIT_MSG: pSctpInitMsg = (CmInetSctpInitMsg *)value; - cmMemset((U8*)&initmsg, 0, sizeof(struct sctp_initmsg)); + memset(&initmsg, 0, sizeof(struct sctp_initmsg)); initmsg.sinit_max_attempts = pSctpInitMsg->maxInitReTx; initmsg.sinit_max_init_timeo = pSctpInitMsg->maxInitTimeout; @@ -8901,7 +8870,7 @@ Ptr value; /* option value */ default: /* wrong socket option type */ - RETVALUE(RFAILED); + return RFAILED; break; } @@ -8921,9 +8890,9 @@ Ptr value; /* option value */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET042, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetSetOpt */ @@ -8944,14 +8913,14 @@ Ptr value; /* option value */ */ #ifdef ANSI -PUBLIC S16 cmInetGetNumRead +S16 cmInetGetNumRead ( CmInetFd *sockFd, /* socket file descriptor */ U32 *dataLen /* number of pending octets */ /* removed 3rd argument memInfo */ ) #else -PUBLIC S16 cmInetGetNumRead(sockFd, dataLen) +S16 cmInetGetNumRead(sockFd, dataLen) CmInetFd *sockFd; /* socket file descriptor */ U32 *dataLen; /* number of pending octets */ /* removed 3rd argument memInfo */ @@ -8961,14 +8930,13 @@ U32 *dataLen; /* number of pending octets */ /* removed local variables added for recvfrom call */ - TRC2(cmInetGetNumRead); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (dataLen == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -9016,7 +8984,7 @@ U32 *dataLen; /* number of pending octets */ * select says is ready to read. This should not be considered as * connection closed. */ - RETVALUE(RCLOSED); + return (RCLOSED); } /* removed error check ERR_WOULDBLOCK */ @@ -9025,13 +8993,13 @@ U32 *dataLen; /* number of pending octets */ (INET_ERR_CODE == ERR_CONNRESET)) { *dataLen = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } #ifdef SS_LINUX /* cm_inet_c_001.main_45: Change 2048 to CM_INET_MAX_UDPRAW_MSGSIZE */ *dataLen = CM_INET_MAX_UDPRAW_MSGSIZE; - RETVALUE(ROK); + return ROK; #endif /* SS_LINUX */ /* removed error debug printing added for recvfrom call. */ @@ -9050,10 +9018,10 @@ U32 *dataLen; /* number of pending octets */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET043, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetGetNumRead */ @@ -9075,13 +9043,13 @@ U32 *dataLen; /* number of pending octets */ */ #ifdef ANSI -PUBLIC S16 cmInetGetHostByName +S16 cmInetGetHostByName ( S8 *hostName, /* host name */ CmInetIpAddrTbl *addrTbl /* Address Table of IPV4 Addresses */ ) #else -PUBLIC S16 cmInetGetHostByName (hostName, addrTbl) +S16 cmInetGetHostByName (hostName, addrTbl) S8 *hostName; /* host name */ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ #endif @@ -9100,13 +9068,12 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ #endif /* SS_VW */ #endif /* WIN32 || SS_LINUX || HPOS */ - TRC2(cmInetGetHostByName) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((hostName == NULLP) || (addrTbl == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9128,7 +9095,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ " hostName(%p)\n", INET_ERR_CODE, hostName); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET044, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } if (hostid->h_addrtype != AF_INET) { @@ -9140,7 +9107,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ INET_ERR_CODE, hostName, hostid->h_addrtype); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET045, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else { @@ -9168,7 +9135,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ " hostName(%p)\n", INET_ERR_CODE, hostName); CMINETLOGERROR(ERRCLS_DEBUG, ECMINET046, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } CM_COPY_VWIPADDR(vwIpAddr, &(addrTbl->netAddr[addrTbl->count])); addrTbl->count++; @@ -9187,7 +9154,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ INET_ERR_CODE, hostName, hostid.h_addrtype); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET047, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else { @@ -9203,7 +9170,7 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ #endif /* WIN32 || SS_LINUX || HPOS */ - RETVALUE(ROK); + return ROK; } /* end of cmInetGetHostByName */ @@ -9234,13 +9201,13 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ * */ #ifdef ANSI -PUBLIC S16 cmInetGetIpNodeByName +S16 cmInetGetIpNodeByName ( S8 *hostName, /* host name */ CmInetIpAddrArr *addrArr /* Array of addressed filled in */ ) #else -PUBLIC S16 cmInetGetIpNodeByName(hostName, addrArr) +S16 cmInetGetIpNodeByName(hostName, addrArr) S8 *hostName; /* host name */ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ #endif @@ -9258,14 +9225,13 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ #endif /* SUNOS */ #endif /* IPV6_SUPPORTED */ - TRC2(cmInetGetIpNodeByName) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((hostName == NULLP) || (addrArr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9289,7 +9255,7 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ err, hostName, addrArr->type); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET048, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } #ifdef IPV6_SUPPORTED @@ -9317,7 +9283,7 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ err, hostName, addrArr->type, hostid->h_addrtype); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET049, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } else @@ -9344,16 +9310,16 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ err, hostName, hostid->h_addrtype, addrArr->type); CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET050, 0, prntBuf); #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } } #endif /* SS_LINUX */ #endif /* SUNOS */ - RETVALUE(ROK); + return ROK; #else ret = cmInetGetHostByName(hostName, &addrArr->u.ipv4AddrArr); - RETVALUE(ret); + return (ret); #endif /* IPV6_SUPPORTED */ } /* end of cmInetGetIpNodeByName */ @@ -9377,23 +9343,22 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ */ #ifdef ANSI -PUBLIC S16 cmInetAddr( +S16 cmInetAddr( S8 *asciiAddr, /* ascii address representation */ CmInetIpAddr *address /* 4 byte interent address */ ) #else -PUBLIC S16 cmInetAddr(asciiAddr, address) +S16 cmInetAddr(asciiAddr, address) S8 *asciiAddr; /* ascii address representation */ CmInetIpAddr *address; /* 4 byte interent address */ #endif { - TRC2(cmInetAddr); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if (asciiAddr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9401,10 +9366,10 @@ CmInetIpAddr *address; /* 4 byte interent address */ if (*address == (U32)ERR_INADDRNONE) { /* asciiAddr does not contain a valid internet address */ - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9428,25 +9393,24 @@ CmInetIpAddr *address; /* 4 byte interent address */ */ #ifdef ANSI -PUBLIC S16 cmInetNtoa( +S16 cmInetNtoa( CmInetIpAddr address, /* 4 byte interent address */ S8 **asciiAddr /* ascii address representation */ ) #else -PUBLIC S16 cmInetNtoa(address, asciiAddr) +S16 cmInetNtoa(address, asciiAddr) CmInetIpAddr address; /* 4 byte interent address */ S8 **asciiAddr; /* ascii address representation */ #endif { struct in_addr inetAddr; /* internet address structure */ - TRC2(cmInetNtoa); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if (asciiAddr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9455,10 +9419,10 @@ S8 **asciiAddr; /* ascii address representation */ *asciiAddr = inet_ntoa(inetAddr); if (*asciiAddr == NULL) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* * @@ -9479,14 +9443,14 @@ S8 **asciiAddr; /* ascii address representation */ */ #ifdef ANSI -PUBLIC S16 cmInetNtop( +S16 cmInetNtop( U8 type, /* ip address type */ Void *address, /* 4/16 byte interent address */ S8 *asciiAddr, /* ascii adress representation */ U32 len ) #else -PUBLIC S16 cmInetNtop(type,address, asciiAddr,len) +S16 cmInetNtop(type,address, asciiAddr,len) U8 type; /* ip address type */ Void *address; /* 4/16 byte interent address */ S8 *asciiAddr; /* ascii adress representation */ @@ -9495,13 +9459,12 @@ U32 len; { S32 domain = 0; - TRC2(cmInetNtop); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if (asciiAddr == NULLP || address == NULLP || len == 0 ) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9516,10 +9479,10 @@ U32 len; } if(inet_ntop(domain,address,asciiAddr,len) == NULL) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9546,35 +9509,34 @@ U32 len; */ #ifdef ANSI -PUBLIC S16 cmInetPton( +S16 cmInetPton( CmInetIpAddr *address, /* 4 byte interent address */ S8 *asciiAddr /* ascii address representation */ ) #else -PUBLIC S16 cmInetPton(address, asciiAddr) +S16 cmInetPton(address, asciiAddr) CmInetIpAddr *address; /* 4 byte interent address */ S8 *asciiAddr; /* ascii address representation */ #endif { S16 ret; - TRC2(cmInetPton); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((asciiAddr == NULLP) || (address == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ ret = inet_pton(AF_INET, asciiAddr, (void *)address); if (ret != 1) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmInetPton */ #endif /* SUNOS */ #endif /* IPV6_SUPPORTED */ @@ -9597,12 +9559,12 @@ S8 *asciiAddr; /* ascii address representation */ * */ #ifdef ANSI -PUBLIC S16 cmInetPton6( +S16 cmInetPton6( CmInetIpAddr6 *address6, /* 16 byte interent address */ S8 *asciiAddr /* ascii address representation */ ) #else -PUBLIC S16 cmInetPton6(address6, asciiAddr) +S16 cmInetPton6(address6, asciiAddr) CmInetIpAddr6 *address6; /* 16 byte interent address */ S8 *asciiAddr; /* ascii address representation */ #endif @@ -9613,13 +9575,12 @@ S8 *asciiAddr; /* ascii address representation */ struct sockaddr_storage ss; U32 sslen = sizeof(ss); #endif /* WIN32 */ - TRC2(cmInetPton); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((asciiAddr == NULLP) || (address6 == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -9627,16 +9588,16 @@ S8 *asciiAddr; /* ascii address representation */ ret = inet_pton(AF_INET6, asciiAddr, (void *)address6); if (ret != 1) { - RETVALUE(RFAILED); + return RFAILED; } #else /* cm_inet_c_001.main_44 : In windows inet_pton is not implemented. so we are using the below function * to convert the ipv6 address string to appropriate form */ WSAStringToAddressA((LPTSTR)asciiAddr, AF_INET6, NULL, (struct sockaddr*)&ss, &sslen); - cmMemcpy((U8*)address6, (U8*)&(((struct sockaddr_in6 *)&ss)->sin6_addr), sizeof(CmInetIpAddr6)); + memcpy(address6, &(((struct sockaddr_in6 *)&ss)->sin6_addr), sizeof(CmInetIpAddr6)); #endif /* WIN32 */ - RETVALUE(ROK); + return ROK; } /* end of cmInetPton6 */ #endif /* IPV6_SUPPORTED */ #endif /* SS_PS */ @@ -9658,11 +9619,11 @@ S8 *asciiAddr; /* ascii address representation */ */ #ifdef ANSI -PUBLIC S16 cmInetGetMemSize( +S16 cmInetGetMemSize( S32 *size /* max used memory size */ ) #else -PUBLIC S16 cmInetGetMemSize(size) +S16 cmInetGetMemSize(size) S32 *size; /* max used memory size */ #endif { @@ -9674,7 +9635,7 @@ S32 *size; /* max used memory size */ *size = CM_INET_MAX_MSG_LEN; #endif - RETVALUE(ROK); + return ROK; } @@ -9694,11 +9655,11 @@ S32 *size; /* max used memory size */ */ #ifdef ANSI -PUBLIC S16 cmInetInit( +S16 cmInetInit( Void ) #else -PUBLIC S16 cmInetInit(Void) +S16 cmInetInit(Void) #endif { #ifdef WIN32 @@ -9710,11 +9671,11 @@ PUBLIC S16 cmInetInit(Void) err = WSAStartup(version, &data); if (err != 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; } @@ -9736,11 +9697,11 @@ PUBLIC S16 cmInetInit(Void) */ #ifdef ANSI -PUBLIC S16 cmInetDeInit( +S16 cmInetDeInit( Void ) #else -PUBLIC S16 cmInetDeInit(Void) +S16 cmInetDeInit(Void) #endif { #ifdef WIN32 @@ -9749,11 +9710,11 @@ PUBLIC S16 cmInetDeInit(Void) err = WSACleanup(); if (err != 0) { - RETVALUE(RFAILED); + return RFAILED; } #endif - RETVALUE(ROK); + return ROK; }/* end of cmInetDeInit() */ @@ -9777,13 +9738,13 @@ PUBLIC S16 cmInetDeInit(Void) */ #ifdef ANSI -PUBLIC S16 cmInetGetSockName +S16 cmInetGetSockName ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *locAddr ) #else -PUBLIC S16 cmInetGetSockName(sockFd, locAddr) +S16 cmInetGetSockName(sockFd, locAddr) CmInetFd *sockFd; /* socket file descriptor */ CmInetAddr *locAddr; #endif @@ -9804,18 +9765,17 @@ CmInetAddr *locAddr; /*cm_inet_c_001.main_58 : fix for klockwork issue */ S32 ret; - TRC2(cmInetGetSockName); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd) || (locAddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ - cmMemset((U8*)&lclSockAddr, 0, sizeof(lclSockAddr)); + memset(&lclSockAddr, 0, sizeof(lclSockAddr)); size = sizeof(lclSockAddr); #ifdef UNIX @@ -9837,7 +9797,7 @@ CmInetAddr *locAddr; #else locAddr->port = CM_INET_NTOH_U16(sockAddr->sin_port); #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; default: #ifdef CMINETDBG @@ -9854,14 +9814,14 @@ CmInetAddr *locAddr; CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET051, 0, prntBuf); #endif /* ALIGN_64BIT */ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; }/* end of switch */ }/* end if */ /* Fill the returned address in to locAddr */ #ifdef IPV6_SUPPORTED - cmMemset((U8*)locAddr, 0, sizeof(CmInetAddr)); + memset(locAddr, 0, sizeof(CmInetAddr)); if (size == sizeof(struct sockaddr_in6)) { sockAddr6 = (struct sockaddr_in6 *)&lclSockAddr; @@ -9883,7 +9843,7 @@ CmInetAddr *locAddr; locAddr->port = CM_INET_NTOH_U16(sockAddr->sin_port); locAddr->address = CM_INET_NTOH_U32(sockAddr->sin_addr.s_addr); #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; }/* end of cmInetGetSockName() */ /* New functions to peek into the file descriptor @@ -9909,12 +9869,12 @@ CmInetAddr *locAddr; */ #ifdef ANSI -PUBLIC S16 cmInetFdSetInfoInit +S16 cmInetFdSetInfoInit ( CmInetFdSetInfo *fdSetInfo ) #else -PUBLIC S16 cmInetFdSetInfoInit(fdSetInfo) +S16 cmInetFdSetInfoInit(fdSetInfo) CmInetFdSetInfo *fdSetInfo; #endif { @@ -9927,11 +9887,11 @@ CmInetFdSetInfo *fdSetInfo; #if (ERRCLASS & ERRCLS_INT_PAR) if (fdSetInfo == NULLP) - RETVALUE(RFAILED); + return RFAILED; #endif /* ERRCLASS & ERRCLS_INT_PAR */ if (fdSetInfo->initDone == TRUE) - RETVALUE(ROK); + return ROK; #ifdef WIN32 fdSetInfo->numFds = 0; @@ -9978,7 +9938,7 @@ CmInetFdSetInfo *fdSetInfo; #endif /* SUNOS || SS_LINUX || SS_VW || HPOS */ fdSetInfo->initDone = TRUE; - RETVALUE(ROK); + return ROK; }/* end of cmInetFdSetInfoInit() */ @@ -10004,14 +9964,14 @@ CmInetFdSetInfo *fdSetInfo; */ #ifdef ANSI -PUBLIC S16 cmInetGetFd +S16 cmInetGetFd ( CmInetFdSetInfo *fdSetInfo, CmInetFdSet *fdSet, CmInetFdType *sockFd ) #else -PUBLIC S16 cmInetGetFd(fdSetInfo, fdSet, sockFd) +S16 cmInetGetFd(fdSetInfo, fdSet, sockFd) CmInetFdSetInfo *fdSetInfo; CmInetFdSet *fdSet; CmInetFdType *sockFd; @@ -10029,25 +9989,25 @@ CmInetFdType *sockFd; #if (ERRCLASS & ERRCLS_INT_PAR) if ((fdSetInfo == NULLP) || (fdSet == NULLP) || (sockFd == NULLP)) - RETVALUE(RFAILED); + return RFAILED; if (fdSetInfo->initDone != TRUE) - RETVALUE(RNA); + return (RNA); #endif /* ERRCLASS & ERRCLS_INT_PAR */ #ifdef WIN32 #if (ERRCLASS & ERRCLS_DEBUG) if (fdSetInfo->numFds > FD_SETSIZE) - RETVALUE(RFAILED); + return RFAILED; #endif /* ERRCLASS & ERRCLS_DEBUG */ /* cm_inet_c_001.main_32 : Corrected check for number of fd set in a fdset for WIN32*/ if (fdSetInfo->numFds >= fdSet->fd_count) - RETVALUE(ROKDNA); + return (ROKDNA); *sockFd = fdSet->fd_array[fdSetInfo->numFds]; fdSetInfo->numFds += 1; - RETVALUE(ROK); + return ROK; #endif /* WIN32 */ /* cm_inet_c_001.main_59: Protected under if not defined WIN32 */ @@ -10095,7 +10055,7 @@ CmInetFdType *sockFd; *sockFd += (curIdx * (sizOfFdSetArElem << 3)); /* Clear the file descriptor */ *tempByte &= ~(1 << bitPos); - RETVALUE(ROK); + return ROK; } if (fdSetInfo->bigEndian) tempByte -= 1; @@ -10107,9 +10067,9 @@ CmInetFdType *sockFd; } if (!found) - RETVALUE(ROKDNA); + return (ROKDNA); - RETVALUE(ROK); + return ROK; #endif /* SUNOS || SS_LINUX || SS_VW || HPOS */ } /* end of cmInetGetFd */ @@ -10141,14 +10101,14 @@ CmInetFdType *sockFd; */ #ifdef ANSI -PUBLIC S16 cmInetConvertStrToIpAddr +S16 cmInetConvertStrToIpAddr ( U16 len, /* Length of IP address */ U8 *val, /* Domain Name String */ CmInetNetAddr *address /* IP Address */ ) #else -PUBLIC S16 cmInetConvertStrToIpAddr(len, val, address) +S16 cmInetConvertStrToIpAddr(len, val, address) U16 len; /* Length of IP address */ U8 *val; /* Domain Name String */ CmInetNetAddr *address; /* IP Address */ @@ -10170,7 +10130,6 @@ CmInetNetAddr *address; /* IP Address */ Bool embedIPV4 = FALSE; /* IPV4 embedded in IPV6 ? */ #endif /* IPV6_SUPPORTED*/ - TRC2(cmInetConvertStrToIpAddr) idx = 0; #ifdef IPV6_SUPPORTED @@ -10179,11 +10138,11 @@ CmInetNetAddr *address; /* IP Address */ compressed = FALSE; embedIPV4 = FALSE; ipv6 = ipv6Reg; /* assign pointer to IPV6 regular, uncompressed */ - cmMemset((U8 *)ipv6Reg, 0, CM_INET_IPV6ADDR_SIZE); - cmMemset((U8 *)ipv6Cmp, 0, CM_INET_IPV6ADDR_SIZE); + memset(ipv6Reg, 0, CM_INET_IPV6ADDR_SIZE); + memset(ipv6Cmp, 0, CM_INET_IPV6ADDR_SIZE); #endif /* IPV6_SUPPORTED*/ - cmMemset((U8 *)ipv4, 0, CM_INET_IPV4ADDR_SIZE); + memset(ipv4, 0, CM_INET_IPV4ADDR_SIZE); /* Check for IP Address */ while ((val[idx] != '.') && (val[idx] != ':') && @@ -10195,7 +10154,7 @@ CmInetNetAddr *address; /* IP Address */ ((val[idx] < 'A') || (val[idx] > 'F'))) { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10214,7 +10173,7 @@ CmInetNetAddr *address; /* IP Address */ if ((val[idx] != '.') && (val[idx] != ':')) { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } /* if, couldn't determine IPV4 or IPV6 */ #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10241,7 +10200,7 @@ CmInetNetAddr *address; /* IP Address */ if (compressed == TRUE) { /* can't have 2 :: */ - RETVALUE(RFAILED); + return RFAILED; } /* if, 2 :: */ #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10266,14 +10225,14 @@ CmInetNetAddr *address; /* IP Address */ { /* convert number to IPV4 */ ipv6[ipv6Idx] = 0; /* clear out whatever we did */ - cmMemset((U8 *)ipv4, 0, CM_INET_IPV4ADDR_SIZE); + memset(ipv4, 0, CM_INET_IPV4ADDR_SIZE); retVal = cmInetAsciiToIpv4(4, ipv4, len - blkBeginIdx, &(val[blkBeginIdx])); /* stop the loop, embedded IPV4 is the last part of an IPV6 address */ if (retVal != ROK) { - RETVALUE(retVal); + return (retVal); } embedIPV4 = TRUE; break; @@ -10285,7 +10244,7 @@ CmInetNetAddr *address; /* IP Address */ ((val[idx] < 'A') || (val[idx] > 'F'))) { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10332,12 +10291,12 @@ CmInetNetAddr *address; /* IP Address */ /* convert IPV6 to cmInetIpv6 */ address->type = CM_INET_IPV6ADDR_TYPE; - cmMemcpy((U8 *)address->u.ipv6NetAddr, - (CONSTANT U8 *) ipv6Reg, CM_INET_IPV6ADDR_SIZE); + memcpy(address->u.ipv6NetAddr, + ipv6Reg, CM_INET_IPV6ADDR_SIZE); } /* else, IPV6 */ #endif /* IPV6_SUPPORTED */ - RETVALUE(ROK); + return ROK; } /* cmInetConvertStrToIpAddr */ @@ -10364,7 +10323,7 @@ CmInetNetAddr *address; /* IP Address */ * */ #ifdef ANSI -PUBLIC S16 cmInetAsciiToIpv4 +S16 cmInetAsciiToIpv4 ( U8 numBytes, /* number of Byte to convert */ U8 *ipv4Addr, /* IPV4 Address */ @@ -10372,7 +10331,7 @@ U16 len, /* Length of IP address */ U8 *val /* Domain Name String */ ) #else -PUBLIC S16 cmInetAsciiToIpv4(numBytes, ipv4Addr, len, val) +S16 cmInetAsciiToIpv4(numBytes, ipv4Addr, len, val) U8 numBytes; /* number of Byte to convert */ U8 *ipv4Addr; /* IPV4 Address */ U16 len; /* Length of IP address */ @@ -10382,7 +10341,6 @@ U8 *val; /* Domain Name String */ U8 byteCount; /* Byte Count */ U8 idx; /* Index for string*/ - TRC2(cmInetAsciiToIpv4) idx = 0; for (byteCount = 0; byteCount < numBytes; byteCount++) @@ -10393,7 +10351,7 @@ U8 *val; /* Domain Name String */ if (val[idx] < '0' || val[idx] > '9') { /* Not a digit */ - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -10406,7 +10364,7 @@ U8 *val; /* Domain Name String */ idx++; } - RETVALUE(ROK); + return ROK; } /* cmInetAsciiToIpv4 */ /* cm_inet_c_001.main_34:Added wrapper function for getaddrinfo and freeaddrinfo */ @@ -10428,7 +10386,7 @@ U8 *val; /* Domain Name String */ */ #ifdef ANSI -PUBLIC S32 cmInetGetAddrInfo +S32 cmInetGetAddrInfo ( CONSTANT S8 *node, /* Network addr which has to be resolved */ CONSTANT S8 *service, /* Sets the port number in network addr */ @@ -10436,7 +10394,7 @@ CONSTANT CmInetAddrInfo *hints, /* Specifies preferred socket type or p CmInetAddrInfo **res /* Link list of addrInfo structure */ ) #else -PUBLIC S32 cmInetGetAddrInfo(node,service,hints,res) +S32 cmInetGetAddrInfo(node,service,hints,res) CONSTANT S8 *node; /* Network addr which has to be resolved */ CONSTANT S8 *service; /* Sets the port number in network addr */ CONSTANT CmInetAddrInfo *hints; /* Specifies preferred socket type or protocol */ @@ -10444,14 +10402,13 @@ CmInetAddrInfo **res; /* Link list of addrInfo structure */ #endif { S32 ret; - TRC2(cmInetGetAddrInfo); ret = ROK; #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((node == NULLP) || (hints == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -10474,7 +10431,7 @@ CmInetAddrInfo **res; /* Link list of addrInfo structure */ #endif /* ALIGN_64BIT */ #endif /* CMINETDBG */ } - RETVALUE(ret); + return (ret); } /* end of cmInetGetAddrInfo */ @@ -10493,16 +10450,15 @@ CmInetAddrInfo **res; /* Link list of addrInfo structure */ */ #ifdef ANSI -PUBLIC Void cmInetFreeAddrInfo +Void cmInetFreeAddrInfo ( CmInetAddrInfo *res /* Link list of addrInfo structure */ ) #else -PUBLIC Void cmInetFreeAddrInfo(res) +Void cmInetFreeAddrInfo(res) CmInetAddrInfo *res; /* Link list of addrInfo structure */ #endif { - TRC2(cmInetFreeAddrInfo); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ @@ -10538,14 +10494,14 @@ CmInetAddrInfo *res; /* Link list of addrInfo structure */ * */ #ifdef ANSI -PUBLIC S16 cmInetFlushRecvBuf +S16 cmInetFlushRecvBuf ( CmInetFd *sockFd, /* socket file descriptor */ MsgLen *len, /* number of octects to be flushed */ S32 flags /* additional control flags */ ) #else -PUBLIC S16 cmInetFlushRecvBuf(sockFd, len, flags) +S16 cmInetFlushRecvBuf(sockFd, len, flags) CmInetFd *sockFd; /* socket file descriptor */ MsgLen *len; /* number of octects to be flushed */ S32 flags; /* additional control flags */ @@ -10594,13 +10550,12 @@ S32 flags; /* additional control flags */ U32 errValue; /* error value */ U32 optLen; /* option length */ - TRC2(cmInetFlushRcvBuf) #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((sockFd == NULLP) || CM_INET_INV_SOCK_FD(sockFd)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* ERRCLASS & ERRCLS_INT_PAR */ @@ -10610,14 +10565,14 @@ S32 flags; /* additional control flags */ #endif /* (WIN32 | CMINETFLATBUF) */ /* clear the structure */ - cmMemset((U8*)&remSockAddr, 0, sizeof(remSockAddr)); + memset(&remSockAddr, 0, sizeof(remSockAddr)); /* get number of pending data */ ret = cmInetGetNumRead(sockFd, &pendLen); if (ret != ROK) { /* ret may be RFAILED or ROUTRES */ - RETVALUE(ret); + return (ret); } /* check if connection got closed */ @@ -10633,7 +10588,7 @@ S32 flags; /* additional control flags */ * considered as connection closed. So return ROKDNA instead of * RCLOSED */ - RETVALUE(ROKDNA); + return (ROKDNA); } else /* clear error if there is any, because if there is internal error @@ -10671,7 +10626,7 @@ S32 flags; /* additional control flags */ CMINETLOGERROR(ERRCLS_DEBUG, ECMINET054, 0, prntBuf); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } else { @@ -10691,7 +10646,7 @@ S32 flags; /* additional control flags */ #endif /* defined(SUNOS) || defined(SS_LINUX) */ #endif /* defined(SS_VW) || defined(HPOS) || defined(SS_PS) */ - RETVALUE(ROKDNA); + return (ROKDNA); } } }/* if (pendLen == 0)*/ @@ -10720,7 +10675,7 @@ S32 flags; /* additional control flags */ */ while (curLen > 0) { - cmMemset((U8*)recvTempBuf, 0, CM_INET_MAX_BYTES_READ); + memset(recvTempBuf, 0, CM_INET_MAX_BYTES_READ); /* added separate recvfrom calls different OS */ #if( defined(SS_VW) || defined(HPOS) || defined(SS_PS)) @@ -10745,7 +10700,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { *len = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } @@ -10756,7 +10711,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_CONNRESET)) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } #ifdef CMINETDBG @@ -10774,7 +10729,7 @@ S32 flags; /* additional control flags */ #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ - RETVALUE(RFAILED); + return RFAILED; } if(recvLen < curLen) @@ -10795,7 +10750,7 @@ S32 flags; /* additional control flags */ */ while (curLen > 0) { - cmMemset((U8*)recvTempBuf, 0, CM_INET_MAX_BYTES_READ); + memset(recvTempBuf, 0, CM_INET_MAX_BYTES_READ); /* update the message structure */ #ifdef SS_LINUX rxArr[0].iov_base = (Void*)recvTempBuf; @@ -10830,7 +10785,7 @@ S32 flags; /* additional control flags */ (INET_ERR_CODE == ERR_WOULDBLOCK)) { *len = 0; - RETVALUE(ROKDNA); + return (ROKDNA); } #ifdef CMINETDBG @@ -10853,9 +10808,9 @@ S32 flags; /* additional control flags */ if (INET_ERR_CODE == ERR_CONNABORTED) { *len = 0; - RETVALUE(RCLOSED); + return (RCLOSED); } - RETVALUE(RFAILED); + return RFAILED; }/* if ((recvLen == INET_ERR) || (recvLen > CM_INET_MAX_MSG_LEN))*/ if(recvLen < curLen) @@ -10871,7 +10826,7 @@ S32 flags; /* additional control flags */ #endif /* WIN32 | CMINETFLATBUF */ - RETVALUE(ROK); + return ROK; } /* end of cmInetFlushRecvBuf */ #endif /* CM_INET_FLUSH_RECV_BUF*/