Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[Epic-ID: ODUHIGH-516][Task-ID: ODUHIGH-534] Implementation of Reset request(RIC...
[o-du/l2.git]
/
src
/
cm
/
cm_inet.c
diff --git
a/src/cm/cm_inet.c
b/src/cm/cm_inet.c
index
2f9d4ee
..
69f8035
100644
(file)
--- a/
src/cm/cm_inet.c
+++ b/
src/cm/cm_inet.c
@@
-45,12
+45,7
@@
\f
/* header include files (.h) */
\f
/* header include files (.h) */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-
-#include "gen.h" /* general */
-#include "ssi.h" /* system services interface */
+#include "common_def.h"
#include "cm_inet.h" /* socket library file */
/*cm_inet_c_001.main_35 : Updated for C++ compilation */
#include "cm_inet.h" /* socket library file */
/*cm_inet_c_001.main_35 : Updated for C++ compilation */
@@
-145,14
+140,10
@@
extern "C" {
#endif /* __cplusplus */
/* header/extern include files (.x) */
#endif /* __cplusplus */
/* header/extern include files (.x) */
-#include "gen.x" /* general */
-#include "ssi.x" /* system services interface */
#include "cm_inet.x" /* socket library file */
#include "cm_inet.x" /* socket library file */
-#include "cm_lib.x" /* lib library file */
#ifdef NTL_LIB
#include "ntl_lib.h"
#endif
#ifdef NTL_LIB
#include "ntl_lib.h"
#endif
-#include "du_log.h"
\f
/* local defines */
\f
/* local defines */
@@
-2348,7
+2339,7
@@
uint32_t context /* value to be passed back, if error occurs */
{
return RFAILED;
}
{
return RFAILED;
}
- ret = SGetSBuf
(
info->region, info->pool, &sendBuf, bufLen);
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, &sendBuf, bufLen);
if (ret != ROK)
{
return (ROUTRES);
if (ret != ROK)
{
return (ROUTRES);
@@
-2356,7
+2347,7
@@
uint32_t context /* value to be passed back, if error occurs */
ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen);
if ((ret != ROK) || (msgLen != bufLen))
{
ret = SCpyMsgFix(mBuf, 0, bufLen, sendBuf, &msgLen);
if ((ret != ROK) || (msgLen != bufLen))
{
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
return RFAILED;
}
return RFAILED;
}
@@
-2367,7
+2358,7
@@
uint32_t context /* value to be passed back, if error occurs */
{
if (sockFd->protType == AF_INET)
{
{
if (sockFd->protType == AF_INET)
{
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
#ifdef CMINETDBG
#ifndef ALIGN_64BIT
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
#ifdef CMINETDBG
#ifndef ALIGN_64BIT
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
@@
-2476,7
+2467,7
@@
uint32_t context /* value to be passed back, if error occurs */
ppId, flags, strmId, ttl, context);
if (ret == INET_ERR)
{
ppId, flags, strmId, ttl, context);
if (ret == INET_ERR)
{
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
#ifdef CMINETDBG
#ifndef ALIGN_64BIT
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
#ifdef CMINETDBG
#ifndef ALIGN_64BIT
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
@@
-2507,7
+2498,7
@@
uint32_t context /* value to be passed back, if error occurs */
*len = (MsgLen)ret;
/* cleanup */
*len = (MsgLen)ret;
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
return ROK;
}
return ROK;
}
@@
-2574,7
+2565,7
@@
CmInetSctpNotification *ntfy /* notification parameters */
buflen = CM_INET_MAX_MSG_LEN;
/* allocate flat receive buffer */
buflen = CM_INET_MAX_MSG_LEN;
/* allocate flat receive buffer */
- ret = SGetSBuf
(
meminfo->region, meminfo->pool, &recvbuf, buflen);
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
meminfo->region, meminfo->pool, &recvbuf, buflen);
if (ret != ROK)
{
#ifdef CMINETDBG
if (ret != ROK)
{
#ifdef CMINETDBG
@@
-2597,7
+2588,7
@@
CmInetSctpNotification *ntfy /* notification parameters */
if (ret == INET_ERR)
{
/* cleanup */
if (ret == INET_ERR)
{
/* cleanup */
- SPutSBuf
(
meminfo->region, meminfo->pool, recvbuf, buflen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
meminfo->region, meminfo->pool, recvbuf, buflen);
#ifdef CMINETDBG
#ifndef ALIGN_64BIT
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
#ifdef CMINETDBG
#ifndef ALIGN_64BIT
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
@@
-2771,7
+2762,7
@@
CmInetSctpNotification *ntfy /* notification parameters */
/* cm_inet_c_001.main_46: Allocate memory for data before copying */
datlen = cmStrlen(sctpNtfy->sn_remote_error.sre_data) + 1;
/* cm_inet_c_001.main_46: Allocate memory for data before copying */
datlen = cmStrlen(sctpNtfy->sn_remote_error.sre_data) + 1;
- ret = SGetSBuf
(
meminfo->region, meminfo->pool, \
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
meminfo->region, meminfo->pool, \
&ntfy->u.remoteErr.data, datlen );
if( ret != ROK )
{
&ntfy->u.remoteErr.data, datlen );
if( ret != ROK )
{
@@
-2791,7
+2782,7
@@
CmInetSctpNotification *ntfy /* notification parameters */
/* cm_inet_c_001.main_46: Allocate memory for data before copying */
datlen = cmStrlen(sctpNtfy->sn_send_failed.ssf_data) + 1;
/* cm_inet_c_001.main_46: Allocate memory for data before copying */
datlen = cmStrlen(sctpNtfy->sn_send_failed.ssf_data) + 1;
- ret = SGetSBuf
(
meminfo->region, meminfo->pool, \
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
meminfo->region, meminfo->pool, \
&ntfy->u.sndFailed.data, datlen );
if( ret != ROK )
{
&ntfy->u.sndFailed.data, datlen );
if( ret != ROK )
{
@@
-2849,7
+2840,7
@@
CmInetSctpNotification *ntfy /* notification parameters */
ret = SGetMsg(meminfo->region, meminfo->pool, mBuf);
if (ret != ROK)
{
ret = SGetMsg(meminfo->region, meminfo->pool, mBuf);
if (ret != ROK)
{
- SPutSBuf
(
meminfo->region, meminfo->pool, recvbuf, buflen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
meminfo->region, meminfo->pool, recvbuf, buflen);
return RFAILED;
}
return RFAILED;
}
@@
-2857,13
+2848,13
@@
CmInetSctpNotification *ntfy /* notification parameters */
if (ret != ROK)
{
SPutMsg(*mBuf);
if (ret != ROK)
{
SPutMsg(*mBuf);
- SPutSBuf
(
meminfo->region, meminfo->pool, recvbuf, buflen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
meminfo->region, meminfo->pool, recvbuf, buflen);
return RFAILED;
}
}
/* cleanup */
return RFAILED;
}
}
/* cleanup */
- SPutSBuf
(
meminfo->region, meminfo->pool, recvbuf, buflen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
meminfo->region, meminfo->pool, recvbuf, buflen);
return ROK;
}
return ROK;
}
@@
-4124,7
+4115,7
@@
S16 flags /* additional control flags, unused */
{
return RFAILED;
}
{
return RFAILED;
}
- ret = SGetSBuf
(
info->region, info->pool, &sendBuf, bufLen);
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, &sendBuf, bufLen);
if (ret != ROK)
{
return (ROUTRES);
if (ret != ROK)
{
return (ROUTRES);
@@
-4133,7
+4124,7
@@
S16 flags /* additional control flags, unused */
if ((ret != ROK) || (msgLen != bufLen))
{
/* cleanup */
if ((ret != ROK) || (msgLen != bufLen))
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
return RFAILED;
}
return RFAILED;
}
@@
-4166,7
+4157,7
@@
S16 flags /* additional control flags, unused */
if (ret == INET_ERR)
{
/* cleanup */
if (ret == INET_ERR)
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
if(INET_ERR_CODE == ERR_AGAIN)
{
if(INET_ERR_CODE == ERR_AGAIN)
{
@@
-4223,12
+4214,12
@@
S16 flags /* additional control flags, unused */
if (ret < bufLen)
{
/* cleanup */
if (ret < bufLen)
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
return (RWOULDBLOCK);
}
/* cleanup */
return (RWOULDBLOCK);
}
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
#else /* end of Win NT/flat buffer specific part */
ret = SFndLenMsg(mBuf, &msgLen);
#else /* end of Win NT/flat buffer specific part */
ret = SFndLenMsg(mBuf, &msgLen);
@@
-4615,7
+4606,7
@@
S16 flags /* additional control flags, unused */
{
return RFAILED;
}
{
return RFAILED;
}
- ret = SGetSBuf
(
info->region, info->pool, &sendBuf, bufLen);
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, &sendBuf, bufLen);
if (ret != ROK)
{
return (ROUTRES);
if (ret != ROK)
{
return (ROUTRES);
@@
-4624,7
+4615,7
@@
S16 flags /* additional control flags, unused */
if ((ret != ROK) || (msgLen != bufLen))
{
/* cleanup */
if ((ret != ROK) || (msgLen != bufLen))
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
return RFAILED;
}
return RFAILED;
}
@@
-4657,7
+4648,7
@@
S16 flags /* additional control flags, unused */
if (ret == INET_ERR)
{
/* cleanup */
if (ret == INET_ERR)
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
if(INET_ERR_CODE == ERR_AGAIN)
{
if(INET_ERR_CODE == ERR_AGAIN)
{
@@
-4714,12
+4705,12
@@
S16 flags /* additional control flags, unused */
if (ret < bufLen)
{
/* cleanup */
if (ret < bufLen)
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
return (RWOULDBLOCK);
}
/* cleanup */
return (RWOULDBLOCK);
}
/* cleanup */
- SPutSBuf
(
info->region, info->pool, sendBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, sendBuf, bufLen);
#else /* end of Win NT/flat buffer specific part */
ret = SFndLenMsg(mBuf, &msgLen);
#else /* end of Win NT/flat buffer specific part */
ret = SFndLenMsg(mBuf, &msgLen);
@@
-5391,7
+5382,7
@@
CmInetMemInfo *info /* Memory information */
}
/* allocate mem needed to hold all HBH/Dest options */
}
/* allocate mem needed to hold all HBH/Dest options */
- ret = SGetSBuf
(
info->region, info->pool,
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool,
(Data **)&hbhOptsArr->hbhOpts,
(Size)((sizeof(CmInetIpv6HBHHdr)) * numOpts));
if (ret != ROK)
(Data **)&hbhOptsArr->hbhOpts,
(Size)((sizeof(CmInetIpv6HBHHdr)) * numOpts));
if (ret != ROK)
@@
-5460,7
+5451,7
@@
CmInetMemInfo *info /* Memory information */
{
/* take care of all other options having valid value field
* such as Router Alert, PADN >= 3 bytes and Jumbo */
{
/* take care of all other options having valid value field
* such as Router Alert, PADN >= 3 bytes and Jumbo */
- ret = SGetSBuf
(
info->region, info->pool,
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool,
(Data **)&hbhOptsArr->hbhOpts[optsIdx].value,
(Size)hbhOptsArr->hbhOpts[optsIdx].length);
if (ret != ROK)
(Data **)&hbhOptsArr->hbhOpts[optsIdx].value,
(Size)hbhOptsArr->hbhOpts[optsIdx].length);
if (ret != ROK)
@@
-5483,7
+5474,7
@@
CmInetMemInfo *info /* Memory information */
snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SPutSBuf call 1 in BuildRecvHopOptsArr\n");
CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET030, 0, prntBuf);
#endif /* CMINETDBG */
snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SPutSBuf call 1 in BuildRecvHopOptsArr\n");
CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET030, 0, prntBuf);
#endif /* CMINETDBG */
- SPutSBuf
(
info->region, info->pool,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool,
(Data *)hbhOptsArr->hbhOpts[optsIdx - 1].value,
(Size)hbhOptsArr->hbhOpts[optsIdx - 1].length);
}
(Data *)hbhOptsArr->hbhOpts[optsIdx - 1].value,
(Size)hbhOptsArr->hbhOpts[optsIdx - 1].length);
}
@@
-5497,7
+5488,7
@@
CmInetMemInfo *info /* Memory information */
snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SPutSBuf call 2 in BuildRecvHopOptsArr\n");
CMINETLOGERROR(ERRCLS_DEBUG, ECMINET031, 0, prntBuf);
#endif /* CMINETDBG */
snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "SPutSBuf call 2 in BuildRecvHopOptsArr\n");
CMINETLOGERROR(ERRCLS_DEBUG, ECMINET031, 0, prntBuf);
#endif /* CMINETDBG */
- SPutSBuf
(
info->region, info->pool,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool,
(Data *)hbhOptsArr->hbhOpts, numOpts * sizeof(CmInetIpv6HBHHdr));
hbhOptsArr->numHBHOpts = 0;
hbhOptsArr->hbhOpts = NULLP;
(Data *)hbhOptsArr->hbhOpts, numOpts * sizeof(CmInetIpv6HBHHdr));
hbhOptsArr->numHBHOpts = 0;
hbhOptsArr->hbhOpts = NULLP;
@@
-5580,7
+5571,7
@@
CmInetMemInfo *info /* Memory information */
/* subtract 8 bytes for Next Hdr, Hdr Ext Len, .... + SL bit map */
rtOptsArr->numAddrs = (rtDataLen - 8)/16;
/* subtract 8 bytes for Next Hdr, Hdr Ext Len, .... + SL bit map */
rtOptsArr->numAddrs = (rtDataLen - 8)/16;
- ret = SGetSBuf
(
info->region, info->pool,
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool,
(Data **)&rtOptsArr->ipv6Addrs,
(Size)rtOptsArr->numAddrs * 16);
if (ret != ROK)
(Data **)&rtOptsArr->ipv6Addrs,
(Size)rtOptsArr->numAddrs * 16);
if (ret != ROK)
@@
-5935,7
+5926,7
@@
S32 flags /* additional control flags */
}
/* allocate flat receive buffer */
}
/* allocate flat receive buffer */
- ret = SGetSBuf
(
info->region, info->pool, &recvBuf, bufLen);
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, &recvBuf, bufLen);
if (ret != ROK)
{
return (ROUTRES);
if (ret != ROK)
{
return (ROUTRES);
@@
-5983,7
+5974,7
@@
S32 flags /* additional control flags */
{
/* cleanup */
/* moved cleanup here */
{
/* cleanup */
/* moved cleanup here */
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
/* added check ERR_WOULDBLOCK */
if ((INET_ERR_CODE == ERR_AGAIN) ||
/* added check ERR_WOULDBLOCK */
if ((INET_ERR_CODE == ERR_AGAIN) ||
@@
-6054,7
+6045,7
@@
S32 flags /* additional control flags */
if ((sockFd->type == CM_INET_DGRAM) && (*len == 0))
#endif
{
if ((sockFd->type == CM_INET_DGRAM) && (*len == 0))
#endif
{
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
return (ROKDNA);
}
return (ROKDNA);
}
@@
-6086,7
+6077,7
@@
S32 flags /* additional control flags */
CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET068, 0, prntBuf);
#endif /*ALIGN_64BIT*/
#endif
CMINETLOGERROR(ERRCLS_INT_PAR, ECMINET068, 0, prntBuf);
#endif /*ALIGN_64BIT*/
#endif
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
return (ROKDNA);
}
return (ROKDNA);
}
@@
-6095,7
+6086,7
@@
S32 flags /* additional control flags */
if (ret != ROK)
{
/* cleanup */
if (ret != ROK)
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
return (ret);
}
return (ret);
}
@@
-6123,7
+6114,7
@@
S32 flags /* additional control flags */
if (ret != ROK)
{
if (ret != ROK)
{
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
SPutMsg(mBuf);
return (ret);
}
SPutMsg(mBuf);
return (ret);
}
@@
-6157,7
+6148,7
@@
S32 flags /* additional control flags */
}
/* cleanup */
}
/* cleanup */
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
#else /* end of Win NT/flat buffer specific part */
#else /* end of Win NT/flat buffer specific part */
@@
-6173,7
+6164,7
@@
S32 flags /* additional control flags */
/* allocate gather vector, it's a dynamic array */
numDBufs = CM_INET_MAX_DBUF;
/* allocate gather vector, it's a dynamic array */
numDBufs = CM_INET_MAX_DBUF;
- ret = SGetSBuf
(
info->region, info->pool, (Data**)&dBufs,
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, (Data**)&dBufs,
numDBufs*sizeof(Buffer*));
if (ret != ROK)
{
numDBufs*sizeof(Buffer*));
if (ret != ROK)
{
@@
-6209,11
+6200,11
@@
S32 flags /* additional control flags */
for (i = 0; i < msg.msg_iovlen; i++)
SPutDBuf(info->region, info->pool, dBufs[i]);
for (i = 0; i < msg.msg_iovlen; i++)
SPutDBuf(info->region, info->pool, dBufs[i]);
- SPutSBuf
(
info->region, info->pool, (Data*)dBufs,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, (Data*)dBufs,
numDBufs * sizeof(Buffer*));
/* allocate flat receive buffer */
numDBufs * sizeof(Buffer*));
/* allocate flat receive buffer */
- ret = SGetSBuf
(
info->region, info->pool, &recvBuf, bufLen);
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, &recvBuf, bufLen);
if (ret != ROK)
return (ROUTRES);
if (ret != ROK)
return (ROUTRES);
@@
-6233,7
+6224,7
@@
S32 flags /* additional control flags */
}
else
{
}
else
{
- SPutSBuf
(
info->region, info->pool, (Data*)dBufs,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, (Data*)dBufs,
numDBufs*sizeof(Buffer*));
return (ret);
}
numDBufs*sizeof(Buffer*));
return (ret);
}
@@
-6277,7
+6268,7
@@
S32 flags /* additional control flags */
/* Moved up the cleanup precedures here before returning */
/* Cleanup flat buffer if allocated */
if (allocFlatBuf)
/* Moved up the cleanup precedures here before returning */
/* Cleanup flat buffer if allocated */
if (allocFlatBuf)
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
else
{
/* cleanup */
else
{
/* cleanup */
@@
-6290,7
+6281,7
@@
S32 flags /* additional control flags */
SPutDBuf(info->region, info->pool, dBufs[i]);
}
SPutDBuf(info->region, info->pool, dBufs[i]);
}
- SPutSBuf
(
info->region, info->pool, (Data*)dBufs,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, (Data*)dBufs,
numDBufs*sizeof(Buffer*));
}
numDBufs*sizeof(Buffer*));
}
@@
-6518,7
+6509,7
@@
S32 flags /* additional control flags */
if (ret != ROK)
{
/* cleanup */
if (ret != ROK)
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
return (ret);
}
return (ret);
}
@@
-6528,7
+6519,7
@@
S32 flags /* additional control flags */
ret = SAddPstMsgMult(recvBuf, recvLen, tempMsg);
if (ret != ROK)
{
ret = SAddPstMsgMult(recvBuf, recvLen, tempMsg);
if (ret != ROK)
{
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
SPutMsg(tempMsg);
return (ret);
}
SPutMsg(tempMsg);
return (ret);
}
@@
-6536,7
+6527,7
@@
S32 flags /* additional control flags */
*mPtr = tempMsg;
*mPtr = tempMsg;
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
/* cm_inet_c_001.main_48 :flat buffers are allocated
* for non -TCP sockets. On these sockets we can receive
* only one message at a time
/* cm_inet_c_001.main_48 :flat buffers are allocated
* for non -TCP sockets. On these sockets we can receive
* only one message at a time
@@
-6555,7
+6546,7
@@
S32 flags /* additional control flags */
* mBuf */
if (*mPtr != NULLP)
SPutMsg(*mPtr);
* mBuf */
if (*mPtr != NULLP)
SPutMsg(*mPtr);
- SPutSBuf
(
info->region, info->pool, (Data*)dBufs,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, (Data*)dBufs,
numDBufs*sizeof(Buffer*));
return (ret);
}
numDBufs*sizeof(Buffer*));
return (ret);
}
@@
-6575,14
+6566,14
@@
S32 flags /* additional control flags */
/* cleanup */
SPutMsg(*mPtr);
SPutMsg(tempMsg);
/* cleanup */
SPutMsg(*mPtr);
SPutMsg(tempMsg);
- SPutSBuf
(
info->region, info->pool, (Data*)dBufs,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, (Data*)dBufs,
numDBufs*sizeof(Buffer*));
return RFAILED;
}
SPutMsg(tempMsg);
}
numDBufs*sizeof(Buffer*));
return RFAILED;
}
SPutMsg(tempMsg);
}
- SPutSBuf
(
info->region, info->pool, (Data*)dBufs,
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, (Data*)dBufs,
numDBufs*sizeof(Buffer*));
/*
numDBufs*sizeof(Buffer*));
/*
@@
-7012,7
+7003,7
@@
Data *data /* read data */
if ((MsgLen)pendLen >= bufLen)
{
/* allocate receive buffer (flat structure) */
if ((MsgLen)pendLen >= bufLen)
{
/* allocate receive buffer (flat structure) */
- ret = SGetSBuf
(
info->region, info->pool, &recvBuf, bufLen);
+ ret = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, &recvBuf, bufLen);
if (ret != ROK)
{
return (ROUTRES);
if (ret != ROK)
{
return (ROUTRES);
@@
-7053,7
+7044,7
@@
Data *data /* read data */
{
/* cleanup */
/* moved cleanup here */
{
/* cleanup */
/* moved cleanup here */
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
/* added check ERR_WOULDBLOCK */
if ((INET_ERR_CODE == ERR_AGAIN) ||
/* added check ERR_WOULDBLOCK */
if ((INET_ERR_CODE == ERR_AGAIN) ||
@@
-7092,7
+7083,7
@@
Data *data /* read data */
if (recvLen < (S32)bufLen) /* maybe happen */
{
/* cleanup */
if (recvLen < (S32)bufLen) /* maybe happen */
{
/* cleanup */
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
return (ROKDNA);
}
return (ROKDNA);
}
@@
-7131,7
+7122,7
@@
Data *data /* read data */
}
/* cleanup */
}
/* cleanup */
- SPutSBuf
(
info->region, info->pool, recvBuf, bufLen);
+ SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
info->region, info->pool, recvBuf, bufLen);
}
else
{
}
else
{