X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_tpt.h;h=314296318f503c945f5973857e581e5be382f308;hb=e698840bb6fcecc68be5b1d1fd17436bd1d5e83f;hp=9d9089350ce3feb358b52b3505af111f5735643a;hpb=d349ae65e1495488772f87e5cfa1ae71d9eab075;p=o-du%2Fl2.git

diff --git a/src/cm/cm_tpt.h b/src/cm/cm_tpt.h
index 9d9089350..314296318 100755
--- a/src/cm/cm_tpt.h
+++ b/src/cm/cm_tpt.h
@@ -283,10 +283,10 @@
 #endif /* __CMINETH__ */
 
 /*  packing/unpacking functions */
-#define cmPkCmIpv4NetAddr(x, mBuf)    SPkU32(x, mBuf)
+#define cmPkCmIpv4NetAddr(x, mBuf)    oduUnpackUInt32(x, mBuf)
 /* Moved all packing functions to cm_tpt from 
  * cm_inet.c files. Hence no #defines are required */
-#define cmUnpkCmIpv4NetAddr(x, mBuf)  SUnpkU32(x, mBuf)
+#define cmUnpkCmIpv4NetAddr(x, mBuf)  oduPackUInt32(x, mBuf)
 
 /* added macro to free memory allocated for IPv6
  *                      IPv6 extn hdrs*/
@@ -294,7 +294,7 @@
 #define CM_TPT_FREE_IPV6_HDRPARM(_region, _pool, _hdrParm) \
 { \
    CmIpv6HdrParm *_hdrParmIpv6; \
-   U8 numOpts; \
+   uint8_t numOpts; \
    if (_hdrParm->type == CM_HDRPARM_IPV6) \
    { \
       _hdrParmIpv6 = &_hdrParm->u.hdrParmIpv6; \
@@ -303,10 +303,10 @@
          for(numOpts = _hdrParmIpv6->ipv6ExtHdr.hbhOptsArr.numHBHOpts;  \
             numOpts > 0; numOpts--) \
          { \
-            SPutSBuf(_region, _pool, (Data *)_hdrParmIpv6->ipv6ExtHdr. \
+            SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,_region, _pool, (Data *)_hdrParmIpv6->ipv6ExtHdr. \
                  hbhOptsArr.hbhOpts[numOpts - 1].value, (Size)(_hdrParmIpv6-> \
                  ipv6ExtHdr.hbhOptsArr.hbhOpts[numOpts - 1].length)); \
-            SPutSBuf(_region, _pool, (Data *)&_hdrParmIpv6->ipv6ExtHdr. \
+            SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,_region, _pool, (Data *)&_hdrParmIpv6->ipv6ExtHdr. \
                  hbhOptsArr.hbhOpts[numOpts - 1], \
                  (Size)sizeof(CmInetIpv6HBHHdr)); \
          }  \
@@ -316,17 +316,17 @@
          for(numOpts = _hdrParmIpv6->ipv6ExtHdr.destOptsArr.numDestOpts; \
             numOpts > 0; numOpts--) \
          { \
-            SPutSBuf(_region, _pool, (Data *)_hdrParmIpv6->ipv6ExtHdr. \
+            SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,_region, _pool, (Data *)_hdrParmIpv6->ipv6ExtHdr. \
                destOptsArr.destOpts[numOpts - 1].value, (Size)(_hdrParmIpv6-> \
                ipv6ExtHdr.destOptsArr.destOpts[numOpts - 1].length)); \
-            SPutSBuf(_region, _pool, (Data *)&_hdrParmIpv6->ipv6ExtHdr. \
+            SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,_region, _pool, (Data *)&_hdrParmIpv6->ipv6ExtHdr. \
                destOptsArr.destOpts[numOpts - 1], \
                (Size)sizeof(CmInetIpv6DestOptsHdr)); \
          } \
       } \
       if( _hdrParmIpv6->ipv6ExtHdr.rtOptsPrsnt) \
       { \
-         SPutSBuf(_region, _pool, \
+         SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,_region, _pool, \
                (Data *)_hdrParmIpv6->ipv6ExtHdr.rtOpts.ipv6Addrs, \
                (Size)(_hdrParmIpv6->ipv6ExtHdr.rtOpts.numAddrs * 16)); \
       } \