TRC2(cmPkCmIpv4TptAddr)
CMCHKPK(cmPkCmIpv4NetAddr, pkParam->address, mBuf);
- CMCHKPK(SPkU16, pkParam->port, mBuf);
+ CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmIpv4TptAddr */
/*
for(num = 0; num < CM_IPV6ADDR_SIZE; num++)
{
- CMCHKPK(SPkU8, *(ptr+num), mBuf);
+ CMCHKPK(oduUnpackUInt8, *(ptr+num), mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmIpv6NetAddr */
\f
TRC3(cmPkCmIpv6TptAddr)
CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6NetAddr, mBuf);
- CMCHKPK(SPkU16, pkParam->port, mBuf);
+ CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmIpv6TptAddr */
\f
TRC2(cmPkCmNetAddrTbl)
if (pkParam->count > CM_MAX_NET_ADDR)
- RETVALUE(RFAILED);
+ return RFAILED;
/* Pack All the addresses */
for (idx = pkParam->count; idx; idx--)
netAddr = &(pkParam->netAddr[idx - 1]);
if ((cmPkCmNetAddr(netAddr, mBuf)) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Pack the total number of addresses present in the table */
- CMCHKPK(SPkU16, pkParam->count, mBuf);
+ CMCHKPK(oduUnpackUInt16, pkParam->count, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmNetAddrTbl() */
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, pkParam->type, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmNetAddr */
\f
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, pkParam->type, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmTptAddr */
/* added new packing functions */
/* pack the actual interface address */
CMCHKPK(cmPkCmNetAddr, &pkParam->localIfAddr, mBuf);
/* pack the interface index value */
- CMCHKPK(SPkU32, pkParam->localIf, mBuf);
+ CMCHKPK(oduUnpackUInt32, pkParam->localIf, mBuf);
}
/* pack the boll which indicates if valid local intf is present or not */
- CMCHKPK(SPkU8, pkParam->intfPrsnt, mBuf);
- RETVALUE(ROK);
+ CMCHKPK(oduUnpackUInt8, pkParam->intfPrsnt, mBuf);
+ return ROK;
} /* cmPkCmTptLocalInf */
#endif /* LOCAL_INTF */
TRC3(cmPkCmNetMCastInf6)
CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->mCastAddr, mBuf);
- CMCHKPK(SPkU32, pkParam->localInf, mBuf);
+ CMCHKPK(oduUnpackUInt32, pkParam->localInf, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmNetMCastInf6 */
#endif /* IPV6_SUPPORTED */
break;
case CM_SOCKOPT_OPT_MCAST6_IF:
- CMCHKPK(SPkU32, pkParam->optVal.infId, mBuf);
+ CMCHKPK(oduUnpackUInt32, pkParam->optVal.infId, mBuf);
break;
#endif /* IPV6_SUPPORTED */
default:
- CMCHKPK(SPkU32, pkParam->optVal.value, mBuf);
+ CMCHKPK(oduUnpackUInt32, pkParam->optVal.value, mBuf);
break;
}
- CMCHKPK(SPkU32, pkParam->option, mBuf);
- CMCHKPK(SPkU32, pkParam->level, mBuf);
+ CMCHKPK(oduUnpackUInt32, pkParam->option, mBuf);
+ CMCHKPK(oduUnpackUInt32, pkParam->level, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmSockOpts */
\f
if( pkParam->numOpts > CM_MAX_SOCK_OPTS)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(num = 0; num < pkParam->numOpts; num++)
{
CMCHKPK(cmPkCmSockOpts, &pkParam->sockOpts[num], mBuf);
}
- CMCHKPK(SPkU8, pkParam->numOpts, mBuf);
- CMCHKPK(SPkU8, pkParam->listenQSize, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->numOpts, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->listenQSize, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmSockParam */
\f
if( pkParam->numOpts > CM_MAX_SOCK_OPTS)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(num = 0; num < pkParam->numOpts; num++)
{
CMCHKPK(cmPkCmSockOpts, &pkParam->sockOpts[num], mBuf);
}
- CMCHKPK(SPkU8, pkParam->numOpts, mBuf);
- CMCHKPK(SPkU8, pkParam->listenQSize, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->numOpts, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->listenQSize, mBuf);
CMCHKPK(SPkS16, pkParam->ctxId, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkTlsTptParam */
#endif /* CM_TLS */
#endif
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, pkParam->type, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmPkCmTptParam */
\f
{
TRC2(cmUnpkCmIpv4TptAddr)
- CMCHKUNPK(SUnpkU16, &unpkParam->port, mBuf);
+ CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
CMCHKUNPK(cmUnpkCmIpv4NetAddr, &unpkParam->address, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmIpv4TptAddr */
\f
for(num = 0; num < CM_IPV6ADDR_SIZE; num++)
{
- CMCHKUNPK(SUnpkU8, (ptr-num), mBuf);
+ CMCHKUNPK(oduPackUInt8, (ptr-num), mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmIpv6NetAddr */
\f
{
TRC3(cmUnpkCmIpv6TptAddr)
- CMCHKUNPK(SUnpkU16, &unpkParam->port, mBuf);
+ CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->ipv6NetAddr, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmIpv6TptAddr */
\f
TRC2(cmUnpkCmNetAddrTbl)
/* Unpack the count */
- CMCHKUNPK(SUnpkU16, &(unpkParam->count), mBuf);
+ CMCHKUNPK(oduPackUInt16, &(unpkParam->count), mBuf);
/* Unpack the addresses */
for (idx = 0; idx < unpkParam->count; idx++)
netAddr = &(unpkParam->netAddr[idx]);
if ((cmUnpkCmNetAddr(netAddr, mBuf)) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmNetAddrTbl() */
{
TRC3(cmUnpkCmNetAddr)
- CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
switch (unpkParam->type)
{
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmNetAddr */
\f
{
TRC3(cmUnpkCmTptAddr)
- CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
switch (unpkParam->type)
{
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmTptAddr */
/* Moving IPv6 multicast information unpacking functions from cm_inet.c */
{
TRC3(cmUnpkCmNetMCastInf6)
- CMCHKUNPK(SUnpkU32, &unpkParam->localInf, mBuf);
+ CMCHKUNPK(oduPackUInt32, &unpkParam->localInf, mBuf);
CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->mCastAddr, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmNetMCastInf6 */
#endif /* IPV6_SUPPORTED */
{
TRC3(cmUnpkCmSockOpts)
- CMCHKUNPK(SUnpkU32, &unpkParam->level, mBuf);
- CMCHKUNPK(SUnpkU32, &unpkParam->option, mBuf);
+ CMCHKUNPK(oduPackUInt32, &unpkParam->level, mBuf);
+ CMCHKUNPK(oduPackUInt32, &unpkParam->option, mBuf);
switch (unpkParam->option)
{
break;
case CM_SOCKOPT_OPT_MCAST6_IF:
- CMCHKUNPK(SUnpkU32, &unpkParam->optVal.infId, mBuf);
+ CMCHKUNPK(oduPackUInt32, &unpkParam->optVal.infId, mBuf);
break;
#endif /* IPV6_SUPPORTED */
default:
- CMCHKUNPK(SUnpkU32, &unpkParam->optVal.value, mBuf);
+ CMCHKUNPK(oduPackUInt32, &unpkParam->optVal.value, mBuf);
break;
}
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmSockOpts */
\f
TRC3(cmUnpkCmSockParam)
- CMCHKUNPK(SUnpkU8, &unpkParam->listenQSize, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->numOpts, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf);
if( unpkParam->numOpts > CM_MAX_SOCK_OPTS)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(num = 0; num < unpkParam->numOpts; num++)
CMCHKUNPK(cmUnpkCmSockOpts, &unpkParam->sockOpts[num], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmSockParam */
\f
TRC3(cmUnpkTlsTptParam)
CMCHKUNPK(SUnpkS16, &unpkParam->ctxId, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->listenQSize, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->numOpts, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf);
if( unpkParam->numOpts > CM_MAX_SOCK_OPTS)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
for(num = 0; num < unpkParam->numOpts; num++)
CMCHKUNPK(cmUnpkCmSockOpts, &unpkParam->sockOpts[num], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkTlsTptParam */
#endif /* CM_TLS */
{
TRC3(cmUnpkCmTptParam)
- CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
switch (unpkParam->type)
{
#endif
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmTptParam */
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, pkParam->type, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* End of cmPkCmIpHdrParm */
\f
TRC3(cmUnpkCmTptLocalInf)
/* first unpack the bool intfPrsnt value which is always packed */
- CMCHKUNPK(cmUnpkBool, &unpkParam->intfPrsnt, mBuf);
+ CMCHKUNPK(oduUnpackBool, &unpkParam->intfPrsnt, mBuf);
/* if the above unpacked bool is TRUE then we have to unpack further
* to get the local intf index and intf address */
if (unpkParam->intfPrsnt == TRUE)
{
- CMCHKUNPK(SUnpkU32, &unpkParam->localIf, mBuf);
+ CMCHKUNPK(oduPackUInt32, &unpkParam->localIf, mBuf);
CMCHKUNPK(cmUnpkCmNetAddr, &unpkParam->localIfAddr, mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* cmUnpkCmTptLocalInf */
#endif /* LOCAL_INTF */
/* pack first Route hdr */
if (pkParam->rtOptsPrsnt)
CMCHKPK(cmPkCmIpv6RtHdr, &pkParam->rtOpts, mBuf);
- CMCHKPK(cmPkBool, pkParam->rtOptsPrsnt, mBuf);
+ CMCHKPK(oduPackBool, pkParam->rtOptsPrsnt, mBuf);
/* pack Dest Opt hdr */
if (pkParam->destOptsPrsnt)
CMCHKPK(cmPkCmIpv6DestOptsArr, &pkParam->destOptsArr, mBuf);
- CMCHKPK(cmPkBool, pkParam->destOptsPrsnt, mBuf);
+ CMCHKPK(oduPackBool, pkParam->destOptsPrsnt, mBuf);
/* pack HBH hdr */
if (pkParam->hbhHdrPrsnt)
CMCHKPK(cmPkCmIpv6HBHHdrArr, &pkParam->hbhOptsArr, mBuf);
- CMCHKPK(cmPkBool, pkParam->hbhHdrPrsnt, mBuf);
+ CMCHKPK(oduPackBool, pkParam->hbhHdrPrsnt, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmIpv6ExtHdr */
\f
CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6Addrs[idx], mBuf);
}
/* pack reserve byte & strict/loose bit map */
- CMCHKPK(SPkU32, pkParam->slMap, mBuf);
- CMCHKPK(SPkU8, pkParam->numAddrs, mBuf);
+ CMCHKPK(oduUnpackUInt32, pkParam->slMap, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->numAddrs, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmIpv6RtHdr */
\f
TRC3(cmUnpkCmIpv6RtHdr);
- CMCHKUNPK(SUnpkU8, &unpkParam->numAddrs, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->numAddrs, mBuf);
/* unpack reserve byte & strict/loose bit map */
- CMCHKUNPK(SUnpkU32, &unpkParam->slMap, mBuf);
+ CMCHKUNPK(oduPackUInt32, &unpkParam->slMap, mBuf);
retVal = SGetSBuf(memInfo->region,
memInfo->pool,
if (retVal != ROK)
{
- RETVALUE(ROUTRES);
+ return (ROUTRES);
}
/* unpack all IPV6 addrs in the route hdr */
CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->ipv6Addrs[idx], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmIpv6RtHdr */
\f
TRC3(cmUnpkCmIpv6ExtHdr)
/* unpack HBH hdr first */
- CMCHKUNPK(cmUnpkBool, &unpkParam->hbhHdrPrsnt, mBuf);
+ CMCHKUNPK(oduUnpackBool, &unpkParam->hbhHdrPrsnt, mBuf);
if (unpkParam->hbhHdrPrsnt)
cmUnpkCmIpv6HBHHdrArr(&unpkParam->hbhOptsArr, mBuf, memInfo);
/* unpack DEST opt hdr */
- CMCHKUNPK(cmUnpkBool, &unpkParam->destOptsPrsnt, mBuf);
+ CMCHKUNPK(oduUnpackBool, &unpkParam->destOptsPrsnt, mBuf);
if (unpkParam->destOptsPrsnt)
cmUnpkCmIpv6DestOptsArr(&unpkParam->destOptsArr, mBuf, memInfo);
/* unpack Route hdr last */
- CMCHKUNPK(cmUnpkBool, &unpkParam->rtOptsPrsnt, mBuf);
+ CMCHKUNPK(oduUnpackBool, &unpkParam->rtOptsPrsnt, mBuf);
if (unpkParam->rtOptsPrsnt)
cmUnpkCmIpv6RtHdr(&unpkParam->rtOpts, mBuf, memInfo);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmIpv6ExtHdr */
\f
/* pack all HBH options */
for(numOptions = 0; numOptions<pkParam->numDestOpts; numOptions++)
CMCHKPK(cmPkCmIpv6DestOptsHdr, &pkParam->destOpts[numOptions], mBuf);
- CMCHKPK(SPkU8, pkParam->numDestOpts, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->numDestOpts, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmIpv6DestOptsArr */
\f
for(optLen = 0; optLen < pkParam->length; optLen++)
{
- CMCHKPK(SPkU8, pkParam->value[optLen], mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->value[optLen], mBuf);
}
- CMCHKPK(SPkU8, pkParam->length, mBuf);
- CMCHKPK(SPkU8, pkParam->type, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->length, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmIpv6DestOptsHdr */
\f
TRC3(cmUnpkCmIpv6DestOptsHdr);
/* unpack type, length */
- CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->length, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf);
/* allocate static memory to hold the unpacked values */
retVal = SGetSBuf(memInfo->region,
(Data **)&unpkParam->value, (Size)unpkParam->length);
if (retVal != ROK)
{
- RETVALUE(ROUTRES);
+ return (ROUTRES);
}
/* unpack value fieldof this option */
for(optLen = 0; optLen<unpkParam->length; optLen++)
{
- CMCHKUNPK(SUnpkU8, &unpkParam->value[optLen], mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->value[optLen], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmIpv6DestOptsHdr */
\f
TRC3(cmUnpkCmIpv6DestOptsArr);
- CMCHKUNPK(SUnpkU8, &unpkParam->numDestOpts, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->numDestOpts, mBuf);
if (unpkParam->numDestOpts)
{
/* allocate mem to hold all dest options */
if (retVal != ROK)
{
- RETVALUE(ROUTRES);
+ return (ROUTRES);
}
/* unpack all dest options */
for(numOptions = 0; numOptions<unpkParam->numDestOpts; numOptions++)
if ((retVal = cmUnpkCmIpv6DestOptsHdr(&unpkParam->destOpts[numOptions],
mBuf, memInfo)) != ROK)
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmIpv6DestOptsArr */
\f
for(numOptions = 0; numOptions<pkParam->numHBHOpts; numOptions++)
CMCHKPK(cmPkCmIpv6HBHHdr, &pkParam->hbhOpts[numOptions], mBuf);
- CMCHKPK(SPkU8, pkParam->numHBHOpts, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->numHBHOpts, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmIpv6HBHHdrArr */
\f
/* pack value field */
for(optLen = 0; optLen<pkParam->length; optLen++)
{
- CMCHKPK(SPkU8, pkParam->value[optLen], mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->value[optLen], mBuf);
}
/* pack type, length fields */
- CMCHKPK(SPkU8, pkParam->length, mBuf);
- CMCHKPK(SPkU8, pkParam->type, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->length, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
- RETVALUE(ROK);
+ return ROK;
} /* end of cmPkCmIpv6HBHHdr */
\f
TRC3(cmUnpkCmIpv6HBHHdr)
- CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->length, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf);
/* allocate static memory to hold the unpacked values */
if (unpkParam->length)
(Data **)&unpkParam->value, (Size)unpkParam->length);
if (retVal != ROK)
{
- RETVALUE(ROUTRES);
+ return (ROUTRES);
}
for(optLen = 0; optLen<unpkParam->length; optLen++)
- CMCHKUNPK(SUnpkU8, &unpkParam->value[optLen], mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->value[optLen], mBuf);
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmIpv6HBHHdr */
\f
TRC3(cmUnpkCmIpv6HBHHdrArr);
- CMCHKUNPK(SUnpkU8, &unpkParam->numHBHOpts, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->numHBHOpts, mBuf);
if (unpkParam->numHBHOpts)
{
/* allocate space for all HBH options */
if (retVal != ROK)
{
- RETVALUE(ROUTRES);
+ return (ROUTRES);
}
for(numOptions = 0; numOptions<unpkParam->numHBHOpts; numOptions++)
cmUnpkCmIpv6HBHHdr(&unpkParam->hbhOpts[numOptions], mBuf, memInfo);
}
- RETVALUE(ROK);
+ return ROK;
} /* end of cmUnpkCmIpv6HBHHdrArr */
#endif /* IPV6_OPTS_SUPPORTED */
{
TRC3(cmUnpkCmIpHdrParm)
- CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
switch (unpkParam->type)
{
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* End of cmUnpkCmIpHdrParm */
\f
case CM_ICMPVER4_FILTER:
for(idx = (pkParam->u.icmpv4Filter.num-1); idx >= 0; idx--)
{
- CMCHKPK(SPkU32, pkParam->u.icmpv4Filter.icmpError[idx].errCodeMask,
+ CMCHKPK(oduUnpackUInt32, pkParam->u.icmpv4Filter.icmpError[idx].errCodeMask,
mBuf);
- CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.icmpError[idx].errType,
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpError[idx].errType,
mBuf);
}
- CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.num, mBuf);
- CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.protocol, mBuf);
- CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.allMsg, mBuf);
- CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.num, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.protocol, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
break;
case CM_ICMPVER6_FILTER:
#ifdef IPV6_SUPPORTED
for(idx = (pkParam->u.icmpv6Filter.num - 1); idx >= 0; idx--)
{
- CMCHKPK(SPkU32, pkParam->u.icmpv6Filter.icmpError[idx].errCodeMask,
+ CMCHKPK(oduUnpackUInt32, pkParam->u.icmpv6Filter.icmpError[idx].errCodeMask,
mBuf);
- CMCHKPK(SPkU8, pkParam->u.icmpv6Filter.icmpError[idx].errType,
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv6Filter.icmpError[idx].errType,
mBuf);
}
- CMCHKPK(SPkU8, pkParam->u.icmpv6Filter.num, mBuf);
- CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.allMsg, mBuf);
- CMCHKPK(SPkU8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv6Filter.num, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
#endif /* IPV6_SUPPORTED */
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- CMCHKPK(SPkU8, pkParam->type, mBuf);
+ CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
- RETVALUE(ROK);
+ return ROK;
}
\f
TRC3(cmUnpkCmIcmpFilter)
- CMCHKUNPK(SUnpkU8, &unpkParam->type, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
switch (unpkParam->type)
{
break;
case CM_ICMPVER4_FILTER:
- CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.allMsg, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.protocol, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv4Filter.num, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.allMsg, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.protocol, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.num, mBuf);
for(idx = 0; idx < (unpkParam->u.icmpv4Filter.num); idx++)
{
- CMCHKUNPK(SUnpkU8,
+ CMCHKUNPK(oduPackUInt8,
&unpkParam->u.icmpv4Filter.icmpError[idx].errType, mBuf);
- CMCHKUNPK(SUnpkU32,
+ CMCHKUNPK(oduPackUInt32,
&unpkParam->u.icmpv4Filter.icmpError[idx].errCodeMask,
mBuf);
}
case CM_ICMPVER6_FILTER:
#ifdef IPV6_SUPPORTED
- CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv6Filter.icmpMsgFlag, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv6Filter.allMsg, mBuf);
- CMCHKUNPK(SUnpkU8, &unpkParam->u.icmpv6Filter.num, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.icmpMsgFlag, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.allMsg, mBuf);
+ CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.num, mBuf);
for(idx = 0; idx < (unpkParam->u.icmpv6Filter.num); idx++)
{
- CMCHKUNPK(SUnpkU8,
+ CMCHKUNPK(oduPackUInt8,
&unpkParam->u.icmpv6Filter.icmpError[idx].errType, mBuf);
- CMCHKUNPK(SUnpkU32,
+ CMCHKUNPK(oduPackUInt32,
&unpkParam->u.icmpv6Filter.icmpError[idx].errCodeMask,
mBuf);
}
break;
default:
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* End of cmUnpkCmIcmpFilter */
#endif /* CM_INET2 */