U8, U16, U32 data type changes

[o-du/l2.git] / src / cm / cm_tpt.c

diff --git a/src/cm/cm_tpt.c b/src/cm/cm_tpt.c
index 4a127b2..c3a9fe0 100755 (executable)
--- a/src/cm/cm_tpt.c
+++ b/src/cm/cm_tpt.c
@@ -115,18 +115,17 @@ extern "C" {
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpv4TptAddr
+S16 cmPkCmIpv4TptAddr
 (
 CmIpv4TptAddr            *pkParam,  /* IPv4 Address structure */
 Buffer                   *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpv4TptAddr (pkParam, mBuf)
+S16 cmPkCmIpv4TptAddr (pkParam, mBuf)
 CmIpv4TptAddr            *pkParam;  /* IPv4 Address structure */
 Buffer                   *mBuf;     /* message buffer */
 #endif
 {
-   TRC2(cmPkCmIpv4TptAddr)
 
    CMCHKPK(cmPkCmIpv4NetAddr, pkParam->address, mBuf);
    CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf);
@@ -159,10 +158,9 @@ CmIpv6NetAddr            *pkParam;
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   U8 num;
-   U8 *ptr = (U8*)pkParam;
+   uint8_t num;
+   uint8_t *ptr = (uint8_t*)pkParam;
 
-   TRC3(cmPkCmIpv6NetAddr)
 
    for(num = 0; num < CM_IPV6ADDR_SIZE; num++)
    {
@@ -198,7 +196,6 @@ CmIpv6TptAddr            *pkParam;     /* IPv6 transport address */
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmPkCmIpv6TptAddr)
 
    CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6NetAddr, mBuf);
    CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf);
@@ -221,21 +218,20 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmNetAddrTbl
+S16 cmPkCmNetAddrTbl
 (
 CmNetAddrTbl            *pkParam,      /* Network Address Table */
 Buffer                  *mBuf          /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmNetAddrTbl (pkParam, mBuf)
+S16 cmPkCmNetAddrTbl (pkParam, mBuf)
 CmNetAddrTbl            *pkParam;      /* Network Address Table */
 Buffer                  *mBuf;         /* message buffer */
 #endif
 {
-   U16                  idx;           /* Loop Index */
+   uint16_t                  idx;           /* Loop Index */
    CmNetAddr            *netAddr;      /* Network Address */
 
-   TRC2(cmPkCmNetAddrTbl)
 
    if (pkParam->count > CM_MAX_NET_ADDR)
       return RFAILED;
@@ -270,18 +266,17 @@ Buffer                  *mBuf;         /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmNetAddr
+S16 cmPkCmNetAddr
 (
 CmNetAddr                *pkParam,     
 Buffer                   *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmNetAddr (pkParam, mBuf)
+S16 cmPkCmNetAddr (pkParam, mBuf)
 CmNetAddr                *pkParam;     
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmPkCmNetAddr)
 
    switch (pkParam->type)
    {
@@ -319,18 +314,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmTptAddr
+S16 cmPkCmTptAddr
 (
 CmTptAddr                *pkParam,     
 Buffer                   *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmTptAddr (pkParam, mBuf)
+S16 cmPkCmTptAddr (pkParam, mBuf)
 CmTptAddr                *pkParam;     
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmPkCmTptAddr)
 
    switch (pkParam->type)
    {
@@ -370,18 +364,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmTptLocalInf
+S16 cmPkCmTptLocalInf
 (
 CmTptLocalInf           *pkParam,   /* local interface info */
 Buffer                  *mBuf       /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmTptLocalInf (pkParam, mBuf)
+S16 cmPkCmTptLocalInf (pkParam, mBuf)
 CmTptLocalInf           *pkParam;   /* local interface info */
 Buffer                  *mBuf;      /* message buffer */
 #endif
 {
-   TRC3(cmPkCmTptLocalInf)
 
    if (pkParam->intfPrsnt == TRUE)
    {  
@@ -412,18 +405,17 @@ Buffer                  *mBuf;      /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmNetMCastInf6
+S16 cmPkCmNetMCastInf6
 (
 CmNetMCastInf6            *pkParam,     /* IPv6 multicast information */
 Buffer                    *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmNetMCastInf6(pkParam, mBuf)
+S16 cmPkCmNetMCastInf6(pkParam, mBuf)
 CmNetMCastInf6            *pkParam;     /* IPv6 multicast information */
 Buffer                    *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmPkCmNetMCastInf6)
 
    CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->mCastAddr, mBuf);
    CMCHKPK(oduUnpackUInt32, pkParam->localInf, mBuf);
@@ -458,7 +450,6 @@ CmSockOpts               *pkParam;
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmPkCmSockOpts)
 
    switch (pkParam->option)
    {
@@ -524,9 +515,8 @@ CmSockParam              *pkParam;
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   U32 num;
+   uint32_t num;
 
-   TRC3(cmPkCmSockParam)
 
    if( pkParam->numOpts > CM_MAX_SOCK_OPTS)
    {
@@ -569,9 +559,8 @@ TlsTptParam              *pkParam;     /**/
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   U32 num;
+   uint32_t num;
 
-   TRC3(cmPkTlsTptParam)
 
    if( pkParam->numOpts > CM_MAX_SOCK_OPTS)
    {
@@ -605,18 +594,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmTptParam
+S16 cmPkCmTptParam
 (
 CmTptParam               *pkParam,     
 Buffer                   *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmTptParam (pkParam, mBuf)
+S16 cmPkCmTptParam (pkParam, mBuf)
 CmTptParam               *pkParam;     
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmPkCmTptParam)
 
    switch (pkParam->type)
    {
@@ -669,18 +657,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIpv4TptAddr 
+S16 cmUnpkCmIpv4TptAddr 
 (
 CmIpv4TptAddr            *unpkParam,     /* IPv4 Address */
 Buffer                   *mBuf           /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmIpv4TptAddr (unpkParam, mBuf)
+S16 cmUnpkCmIpv4TptAddr (unpkParam, mBuf)
 CmIpv4TptAddr            *unpkParam;     /* IPv4 Address */
 Buffer                   *mBuf;          /* message buffer */
 #endif
 {
-   TRC2(cmUnpkCmIpv4TptAddr)
 
    CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
    CMCHKUNPK(cmUnpkCmIpv4NetAddr, &unpkParam->address, mBuf);
@@ -714,10 +701,9 @@ CmIpv6NetAddr            *unpkParam;   /* IPv6 address */
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   U32 num;
-   U8 *ptr = (U8*)unpkParam;
+   uint32_t num;
+   uint8_t *ptr = (uint8_t*)unpkParam;
 
-   TRC3(cmUnpkCmIpv6NetAddr)
 
    ptr += (CM_INET_IPV6ADDR_SIZE - 1);
 
@@ -755,7 +741,6 @@ CmIpv6TptAddr            *unpkParam;   /* IPv6 transport address */
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmUnpkCmIpv6TptAddr)
 
    CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
    CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->ipv6NetAddr, mBuf);
@@ -778,21 +763,20 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmNetAddrTbl
+S16 cmUnpkCmNetAddrTbl
 (
 CmNetAddrTbl            *unpkParam,    /* Network Address Table */
 Buffer                  *mBuf          /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmNetAddrTbl (unpkParam, mBuf )
+S16 cmUnpkCmNetAddrTbl (unpkParam, mBuf )
 CmNetAddrTbl            *unpkParam;    /* Network Address Table */
 Buffer                  *mBuf;         /* message buffer */
 #endif
 {
-   U16                  idx;           /* Loop Index */
+   uint16_t                  idx;           /* Loop Index */
    CmNetAddr            *netAddr;      /* Network Address */
    
-   TRC2(cmUnpkCmNetAddrTbl)
 
    /* Unpack the count */
    CMCHKUNPK(oduPackUInt16, &(unpkParam->count), mBuf);
@@ -825,18 +809,17 @@ Buffer                  *mBuf;         /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmNetAddr
+S16 cmUnpkCmNetAddr
 (
 CmNetAddr                *unpkParam,   
 Buffer                   *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmNetAddr (unpkParam, mBuf )
+S16 cmUnpkCmNetAddr (unpkParam, mBuf )
 CmNetAddr                *unpkParam;   
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmUnpkCmNetAddr)
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
 
@@ -875,18 +858,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmTptAddr
+S16 cmUnpkCmTptAddr
 (
 CmTptAddr                *unpkParam,   
 Buffer                   *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmTptAddr (unpkParam, mBuf)
+S16 cmUnpkCmTptAddr (unpkParam, mBuf)
 CmTptAddr                *unpkParam;   
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmUnpkCmTptAddr)
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
 
@@ -927,18 +909,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmNetMCastInf6
+S16 cmUnpkCmNetMCastInf6
 (
 CmNetMCastInf6            *unpkParam,   /* IPv6 multicast information */
 Buffer                    *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmNetMCastInf6(unpkParam, mBuf)
+S16 cmUnpkCmNetMCastInf6(unpkParam, mBuf)
 CmNetMCastInf6            *unpkParam;   /* IPv6 multicast information */
 Buffer                    *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmUnpkCmNetMCastInf6)
 
     CMCHKUNPK(oduPackUInt32, &unpkParam->localInf, mBuf);
     CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->mCastAddr, mBuf);
@@ -973,7 +954,6 @@ CmSockOpts               *unpkParam;   /* socket options */
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmUnpkCmSockOpts)
 
    CMCHKUNPK(oduPackUInt32, &unpkParam->level, mBuf);
    CMCHKUNPK(oduPackUInt32, &unpkParam->option, mBuf);
@@ -1041,9 +1021,8 @@ CmSockParam              *unpkParam;   /* socket parameters */
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   U32 num;
+   uint32_t num;
 
-   TRC3(cmUnpkCmSockParam)
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf);
    CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf);
@@ -1088,9 +1067,8 @@ TlsTptParam              *unpkParam;   /* TLS parameters */
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   U32 num;
+   uint32_t num;
 
-   TRC3(cmUnpkTlsTptParam)
 
    CMCHKUNPK(SUnpkS16, &unpkParam->ctxId, mBuf);
    CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf);
@@ -1126,18 +1104,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmTptParam
+S16 cmUnpkCmTptParam
 (
 CmTptParam               *unpkParam,   /* transport parameters */
 Buffer                   *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmTptParam (unpkParam, mBuf)
+S16 cmUnpkCmTptParam (unpkParam, mBuf)
 CmTptParam               *unpkParam;   /* transport parameters */
 Buffer                   *mBuf;        /* message buffer */
 #endif
 {
-   TRC3(cmUnpkCmTptParam)
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
 
@@ -1187,18 +1164,17 @@ Buffer                   *mBuf;        /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpHdrParm
+S16 cmPkCmIpHdrParm
 (
 CmIpHdrParm             *pkParam,   /* IP hdr parameters */ 
 Buffer                  *mBuf       /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpHdrParm (pkParam, mBuf)
+S16 cmPkCmIpHdrParm (pkParam, mBuf)
 CmIpHdrParm             *pkParam;   /* IP hdr parameters */
 Buffer                  *mBuf;      /* message buffer */
 #endif
 {
-   TRC3(cmPkCmIpHdrParm)
 
    switch (pkParam->type)
    {
@@ -1214,10 +1190,10 @@ Buffer                  *mBuf;      /* message buffer */
          CMCHKPK(cmPkTknStr64, &pkParam->u.hdrParmIpv4.ipv4HdrOpt, mBuf);
 #endif /* IPV4_OPTS_SUPPORTED */
          
-         CMCHKPK(cmPkTknU8, &pkParam->u.hdrParmIpv4.ttl, mBuf);
-         CMCHKPK(cmPkTknU8, &pkParam->u.hdrParmIpv4.tos, mBuf);
-         CMCHKPK(cmPkTknU8, &pkParam->u.hdrParmIpv4.dfBit, mBuf); 
-         CMCHKPK(cmPkTknU8, &pkParam->u.hdrParmIpv4.proto, mBuf);
+         CMCHKPK(cmPkTknUInt8, &pkParam->u.hdrParmIpv4.ttl, mBuf);
+         CMCHKPK(cmPkTknUInt8, &pkParam->u.hdrParmIpv4.tos, mBuf);
+         CMCHKPK(cmPkTknUInt8, &pkParam->u.hdrParmIpv4.dfBit, mBuf); 
+         CMCHKPK(cmPkTknUInt8, &pkParam->u.hdrParmIpv4.proto, mBuf);
          break;
 
       case CM_HDRPARM_IPV6:
@@ -1228,7 +1204,7 @@ Buffer                  *mBuf;      /* message buffer */
          CMCHKPK(cmPkCmIpv6ExtHdr, &pkParam->u.hdrParmIpv6.ipv6ExtHdr, mBuf);
 #endif /* IPV6_OPTS_SUPPORTED */
          CMCHKPK(cmPkCmNetAddr, &pkParam->u.hdrParmIpv6.srcAddr6, mBuf); 
-         CMCHKPK(cmPkTknU8, &pkParam->u.hdrParmIpv6.ttl, mBuf);          
+         CMCHKPK(cmPkTknUInt8, &pkParam->u.hdrParmIpv6.ttl, mBuf);          
 #endif /* IPV6_SUPPORTED */ 
          break;
    
@@ -1258,18 +1234,17 @@ Buffer                  *mBuf;      /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmTptLocalInf
+S16 cmUnpkCmTptLocalInf
 (
 CmTptLocalInf           *unpkParam, /* local interface info */
 Buffer                  *mBuf       /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmTptLocalInf (unpkParam, mBuf)
+S16 cmUnpkCmTptLocalInf (unpkParam, mBuf)
 CmTptLocalInf           *unpkParam; /* local interface info */
 Buffer                  *mBuf;      /* message buffer */
 #endif
 {
-   TRC3(cmUnpkCmTptLocalInf)
 
    /* first unpack the bool intfPrsnt value which is always packed */
    CMCHKUNPK(oduUnpackBool, &unpkParam->intfPrsnt, mBuf);
@@ -1301,18 +1276,17 @@ Buffer                  *mBuf;      /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpv6ExtHdr
+S16 cmPkCmIpv6ExtHdr
 (
 CmIpv6ExtHdr             *pkParam,   /* IPV6 extension hdrs */
 Buffer                   *mBuf       /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpv6ExtHdr (pkParam, mBuf)
+S16 cmPkCmIpv6ExtHdr (pkParam, mBuf)
 CmIpv6ExtHdr             *pkParam;   /*IPV6 extension hdrs */
 Buffer                   *mBuf;      /* message buffer */
 #endif
 {
-   TRC3(cmPkCmIpv6ExtHdr)
 
    /* pack first Route hdr */   
    if (pkParam->rtOptsPrsnt)
@@ -1347,20 +1321,19 @@ Buffer                   *mBuf;      /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpv6RtHdr
+S16 cmPkCmIpv6RtHdr
 (
 CmIpv6RtHdr             *pkParam,   /* IPV6 Route hdr */
 Buffer                   *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpv6RtHdr (pkParam, mBuf)
+S16 cmPkCmIpv6RtHdr (pkParam, mBuf)
 CmIpv6RtHdr             *pkParam;   /* IPV6 Route hdr */
 Buffer                   *mBuf;     /* message buffer */
 #endif
 {
-   U8 idx;
+   uint8_t idx;
    
-   TRC3(cmPkCmIpv6RtHdr);
 
    /* pack all IPV6 addrs in the route hdr */
    for(idx = 0; idx < pkParam->numAddrs; idx++)
@@ -1390,23 +1363,22 @@ Buffer                   *mBuf;     /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIpv6RtHdr
+S16 cmUnpkCmIpv6RtHdr
 (
 CmIpv6RtHdr             *unpkParam,  /* IPV6 Route hdr */
 Buffer                  *mBuf,       /* message buffer */
 Mem                     *memInfo     /* meminfo to allocate for Route hdr */
 )
 #else
-PUBLIC S16 cmUnpkCmIpv6RtHdr (unpkParam, mBuf, memInfo)
+S16 cmUnpkCmIpv6RtHdr (unpkParam, mBuf, memInfo)
 CmIpv6RtHdr             *unpkParam;  /* IPV6 Route hdr */
 Buffer                  *mBuf;       /* message buffer */
 Mem                     *memInfo;    /* meminfo to allocate for Route hdr */
 #endif
 {
-   U8 idx;  /* array index */
+   uint8_t idx;  /* array index */
    S32 retVal; /* temporary return value */
    
-   TRC3(cmUnpkCmIpv6RtHdr);
    
    CMCHKUNPK(oduPackUInt8, &unpkParam->numAddrs, mBuf);
    
@@ -1447,20 +1419,19 @@ Mem                     *memInfo;    /* meminfo to allocate for Route hdr */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIpv6ExtHdr
+S16 cmUnpkCmIpv6ExtHdr
 (
 CmIpv6ExtHdr             *unpkParam,  /* IPV6 extension hdrs */
 Buffer                   *mBuf,       /* message buffer */
 Mem                      *memInfo     /* meminfo to allocate for IPV6 ext hdr */
 )
 #else
-PUBLIC S16 cmUnpkCmIpv6ExtHdr (unpkParam, mBuf, memInfo)
+S16 cmUnpkCmIpv6ExtHdr (unpkParam, mBuf, memInfo)
 CmIpv6ExtHdr             *unpkParam; /* IPV6 extension hdrs */
 Buffer                   *mBuf;      /* message buffer */
 Mem                      *memInfo;   /* meminfo to allocate for IPV6 ext hdr */
 #endif
 {
-   TRC3(cmUnpkCmIpv6ExtHdr)
       
    /* unpack HBH hdr first */
    CMCHKUNPK(oduUnpackBool, &unpkParam->hbhHdrPrsnt, mBuf); 
@@ -1495,21 +1466,20 @@ Mem                      *memInfo;   /* meminfo to allocate for IPV6 ext hdr */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpv6DestOptsArr
+S16 cmPkCmIpv6DestOptsArr
 (
 CmIpv6DestOptsArr       *pkParam,  /* IPV6 Dest hdr array */
 Buffer                  *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpv6DestOptsArr (pkParam, mBuf)
+S16 cmPkCmIpv6DestOptsArr (pkParam, mBuf)
 CmIpv6DestOptsArr       *pkParam;  /* IPV6 Dest hdr array */
 Buffer                  *mBuf;     /* message buffer */
 #endif
 {
 
-   U8 numOptions;
+   uint8_t numOptions;
 
-   TRC3(cmPkCmIpv6DestOptsArr);
    
    /* pack all HBH options */
    for(numOptions = 0; numOptions<pkParam->numDestOpts; numOptions++)  
@@ -1534,20 +1504,19 @@ Buffer                  *mBuf;     /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpv6DestOptsHdr
+S16 cmPkCmIpv6DestOptsHdr
 (
 CmIpv6DestOptsHdr       *pkParam,  /* IPV6 Dest opt */
 Buffer                  *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpv6DestOptsHdr (pkParam, mBuf)
+S16 cmPkCmIpv6DestOptsHdr (pkParam, mBuf)
 CmIpv6DestOptsHdr       *pkParam;  /* IPV6 Dest opt */
 Buffer                  *mBuf;     /* message buffer */
 #endif
 {
-   U8 optLen;
+   uint8_t optLen;
    
-   TRC3(cmPkCmIpv6DestOptsHdr);
 
    for(optLen = 0; optLen < pkParam->length; optLen++)
    {
@@ -1574,23 +1543,22 @@ Buffer                  *mBuf;     /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIpv6DestOptsHdr
+S16 cmUnpkCmIpv6DestOptsHdr
 (
 CmIpv6DestOptsHdr       *unpkParam,/* IPV6 Dest Option */
 Buffer                  *mBuf,     /* message buffer */
 Mem                     *memInfo   /* meminfo to allocate mem for dest opt */
 )
 #else
-PUBLIC S16 cmUnpkCmIpv6DestOptsHdr (unpkParam, mBuf, memInfo)
+S16 cmUnpkCmIpv6DestOptsHdr (unpkParam, mBuf, memInfo)
 CmIpv6DestOptsHdr       *unpkParam;/* IPV6 Dest Option */
 Buffer                  *mBuf;     /* message buffer */
 Mem                     *memInfo;  /* meminfo to allocate mem for dest opt */
 #endif
 {
    S32 retVal;                        /* temporary return value */
-   U8 optLen;                      /* length of value field */
+   uint8_t optLen;                      /* length of value field */
 
-   TRC3(cmUnpkCmIpv6DestOptsHdr);
   
    /* unpack type, length */
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);  
@@ -1629,23 +1597,22 @@ Mem                     *memInfo;  /* meminfo to allocate mem for dest opt */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIpv6DestOptsArr
+S16 cmUnpkCmIpv6DestOptsArr
 (
 CmIpv6DestOptsArr       *unpkParam, /* all IPV6 Destination Options */
 Buffer                  *mBuf,      /* message buffer */
 Mem                     *memInfo    /* meminfo to allocate mem for dest opts */
 )
 #else
-PUBLIC S16 cmUnpkCmIpv6DestOptsArr (unpkParam, mBuf, memInfo)
+S16 cmUnpkCmIpv6DestOptsArr (unpkParam, mBuf, memInfo)
 CmIpv6DestOptsArr       *unpkParam; /* all IPV6 Destination Options */
 Buffer                  *mBuf;      /* message buffer */
 Mem                     *memInfo;   /* meminfo to allocate mem for dest opts */
 #endif
 {
-   U8 numOptions;
+   uint8_t numOptions;
    S16 retVal;
    
-   TRC3(cmUnpkCmIpv6DestOptsArr);
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->numDestOpts, mBuf); 
    if (unpkParam->numDestOpts)
@@ -1686,20 +1653,19 @@ Mem                     *memInfo;   /* meminfo to allocate mem for dest opts */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpv6HBHHdrArr
+S16 cmPkCmIpv6HBHHdrArr
 (
 CmIpv6HBHHdrArr         *pkParam,  /* all IPV6 HopByHop options */
 Buffer                  *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpv6HBHHdrArr (pkParam, mBuf)
+S16 cmPkCmIpv6HBHHdrArr (pkParam, mBuf)
 CmIpv6HBHHdrArr         *pkParam;  /* IPV6 HopByHop options */
 Buffer                  *mBuf;     /* message buffer */
 #endif
 {
-   U8 numOptions;
+   uint8_t numOptions;
    
-   TRC3(cmPkCmIpv6HBHHdrArr);
 
    for(numOptions = 0; numOptions<pkParam->numHBHOpts; numOptions++)
       CMCHKPK(cmPkCmIpv6HBHHdr, &pkParam->hbhOpts[numOptions], mBuf);
@@ -1724,20 +1690,19 @@ Buffer                  *mBuf;     /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIpv6HBHHdr
+S16 cmPkCmIpv6HBHHdr
 (
 CmIpv6HBHHdr            *pkParam,  /* individual IPV6 HBH options */
 Buffer                  *mBuf      /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIpv6HBHHdr (pkParam, mBuf)
+S16 cmPkCmIpv6HBHHdr (pkParam, mBuf)
 CmIpv6HBHHdr            *pkParam;  /* individual IPV6 HBH options */
 Buffer                  *mBuf;     /* message buffer */
 #endif
 {
-   U8 optLen;
+   uint8_t optLen;
 
-   TRC3(cmPkCmIpv6HBHHdr);
 
    /* pack value field */
    for(optLen = 0; optLen<pkParam->length; optLen++)
@@ -1767,23 +1732,22 @@ Buffer                  *mBuf;     /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIpv6HBHHdr
+S16 cmUnpkCmIpv6HBHHdr
 (
 CmIpv6HBHHdr            *unpkParam,/* individual IPV6 HBH Option */
 Buffer                  *mBuf,     /* message buffer */
 Mem                     *memInfo   /* meminfo to allocate mem for HBH opt */
 )
 #else
-PUBLIC S16 cmUnpkCmIpv6HBHHdr (unpkParam, mBuf, memInfo)
+S16 cmUnpkCmIpv6HBHHdr (unpkParam, mBuf, memInfo)
 CmIpv6HBHHdr            *unpkParam;/* individual IPV6 HBH Option */
 Buffer                  *mBuf;     /* message buffer */
 Mem                     *memInfo;  /* meminfo to allocate mem for HBH opt */
 #endif
 {
    S32 retVal;                     /* temporary return value */
-   U8 optLen;                      /* length of value field */
+   uint8_t optLen;                      /* length of value field */
   
-   TRC3(cmUnpkCmIpv6HBHHdr)
    
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);   
    CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf);
@@ -1821,23 +1785,22 @@ Mem                     *memInfo;  /* meminfo to allocate mem for HBH opt */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIpv6HBHHdrArr
+S16 cmUnpkCmIpv6HBHHdrArr
 (
 CmIpv6HBHHdrArr       *unpkParam,  /* all HBH options */
 Buffer                *mBuf,       /* message buffer */
 Mem                   *memInfo     /* meminfo to allocate space for HBH opt */
 )
 #else
-PUBLIC S16 cmUnpkCmIpv6HBHHdrArr (unpkParam, mBuf, memInfo)
+S16 cmUnpkCmIpv6HBHHdrArr (unpkParam, mBuf, memInfo)
 CmIpv6HBHHdrArr       *unpkParam;  /*  all HBH options */
 Buffer                *mBuf;       /* message buffer */
 Mem                   *memInfo;    /* meminfo to allocate space for HBH opt */
 #endif
 {
-   U8 numOptions; 
+   uint8_t numOptions; 
    S16 retVal;
 
-   TRC3(cmUnpkCmIpv6HBHHdrArr);
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->numHBHOpts, mBuf);   
    if (unpkParam->numHBHOpts)
@@ -1877,14 +1840,14 @@ Mem                   *memInfo;    /* meminfo to allocate space for HBH opt */
 #ifdef ANSI
 /* added */
 #ifdef IPV6_OPTS_SUPPORTED
-PUBLIC S16 cmUnpkCmIpHdrParm
+S16 cmUnpkCmIpHdrParm
 (
 CmIpHdrParm              *unpkParam,/* ip hdr parameters */
 Buffer                   *mBuf,     /* message buffer */
 Mem                      *memInfo   /* meminfo to allocate mem for ipHdrParam */
 )
 #else
-PUBLIC S16 cmUnpkCmIpHdrParm
+S16 cmUnpkCmIpHdrParm
 (
 CmIpHdrParm              *unpkParam,/* ip hdr parameters */
 Buffer                   *mBuf     /* message buffer */
@@ -1893,18 +1856,17 @@ Buffer                   *mBuf     /* message buffer */
 #else
 /* added */
 #ifdef IPV6_OPTS_SUPPORTED
-PUBLIC S16 cmUnpkCmIpHdrParm (unpkParam, mBuf, memInfo)
+S16 cmUnpkCmIpHdrParm (unpkParam, mBuf, memInfo)
 CmIpHdrParm              *unpkParam;/* ip hdr parameters */
 Buffer                   *mBuf;     /* message buffer */
 Mem                      *memInfo;  /* meminfo to allocate mem for ipHdrParam */
 #else
-PUBLIC S16 cmUnpkCmIpHdrParm (unpkParam, mBuf)
+S16 cmUnpkCmIpHdrParm (unpkParam, mBuf)
 CmIpHdrParm              *unpkParam;/* ip hdr parameters */
 Buffer                   *mBuf;     /* message buffer */
 #endif /* IPV6_OPTS_SUPPORTED */
 #endif
 {
-   TRC3(cmUnpkCmIpHdrParm)
 
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
 
@@ -1915,10 +1877,10 @@ Buffer                   *mBuf;     /* message buffer */
          break;
 
       case CM_HDRPARM_IPV4:
-         CMCHKUNPK(cmUnpkTknU8, &unpkParam->u.hdrParmIpv4.proto, mBuf);
-         CMCHKUNPK(cmUnpkTknU8, &unpkParam->u.hdrParmIpv4.dfBit, mBuf);
-         CMCHKUNPK(cmUnpkTknU8, &unpkParam->u.hdrParmIpv4.tos, mBuf);
-         CMCHKUNPK(cmUnpkTknU8, &unpkParam->u.hdrParmIpv4.ttl, mBuf);
+         CMCHKUNPK(cmUnpkTknUInt8, &unpkParam->u.hdrParmIpv4.proto, mBuf);
+         CMCHKUNPK(cmUnpkTknUInt8, &unpkParam->u.hdrParmIpv4.dfBit, mBuf);
+         CMCHKUNPK(cmUnpkTknUInt8, &unpkParam->u.hdrParmIpv4.tos, mBuf);
+         CMCHKUNPK(cmUnpkTknUInt8, &unpkParam->u.hdrParmIpv4.ttl, mBuf);
 #ifdef IPV4_OPTS_SUPPORTED
          CMCHKUNPK(cmUnpkTknStr64, &unpkParam->u.hdrParmIpv4.ipv4HdrOpt, mBuf);
 #endif /* IPV4_OPTS_SUPPORTED */
@@ -1926,7 +1888,7 @@ Buffer                   *mBuf;     /* message buffer */
 
       case CM_HDRPARM_IPV6:
 #ifdef IPV6_SUPPORTED         
-         CMCHKUNPK(cmUnpkTknU8, &unpkParam->u.hdrParmIpv6.ttl, mBuf);
+         CMCHKUNPK(cmUnpkTknUInt8, &unpkParam->u.hdrParmIpv6.ttl, mBuf);
    
          CMCHKUNPK(cmUnpkCmNetAddr, 
                    &unpkParam->u.hdrParmIpv6.srcAddr6, mBuf);
@@ -1962,13 +1924,13 @@ Buffer                   *mBuf;     /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmPkCmIcmpFilter
+S16 cmPkCmIcmpFilter
 (
 CmIcmpFilter             *pkParam,   
 Buffer                   *mBuf       /* message buffer */
 )
 #else
-PUBLIC S16 cmPkCmIcmpFilter (pkParam, mBuf)
+S16 cmPkCmIcmpFilter (pkParam, mBuf)
 CmIcmpFilter             *pkParam;   
 Buffer                   *mBuf;      /* message buffer */
 #endif
@@ -1976,7 +1938,6 @@ Buffer                   *mBuf;      /* message buffer */
    /* Variable declaration */
    S16   idx;
   
-   TRC3(cmPkCmIcmpFilter)
 
    switch (pkParam->type)
    {
@@ -2037,13 +1998,13 @@ Buffer                   *mBuf;      /* message buffer */
 *
 */
 #ifdef ANSI
-PUBLIC S16 cmUnpkCmIcmpFilter
+S16 cmUnpkCmIcmpFilter
 (
 CmIcmpFilter             *unpkParam,   
 Buffer                   *mBuf         /* message buffer */
 )
 #else
-PUBLIC S16 cmUnpkCmIcmpFilter (unpkParam, mBuf)
+S16 cmUnpkCmIcmpFilter (unpkParam, mBuf)
 CmIcmpFilter             *unpkParam;   
 Buffer                   *mBuf;        /* message buffer */
 #endif
@@ -2051,8 +2012,6 @@ Buffer                   *mBuf;        /* message buffer */
    /* Variable declaration */ 
    S16     idx;
 
-   TRC3(cmUnpkCmIcmpFilter)
-
    CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
 
    switch (unpkParam->type)