--- libelwix/inc/elwix/apack.h 2013/12/15 22:54:41 1.4 +++ libelwix/inc/elwix/apack.h 2014/02/11 00:43:41 1.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: apack.h,v 1.4 2013/12/15 22:54:41 misho Exp $ +* $Id: apack.h,v 1.7 2014/02/11 00:43:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -183,33 +183,55 @@ uint8_t rpack_uint8(rpack_t * __restrict rp, uint8_t * * * @rp = raw buffer * @n = set value if !=NULL + * @be = extract in big-endian * return: -1 error or get value */ -uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n); +uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be); /* * rpack_uint24() - Pack/Unpack 24bit value * * @rp = raw buffer * @n = set value if !=NULL + * @be = extract in big-endian * return: -1 error or get value */ -uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n); +uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be); /* * rpack_uint32() - Pack/Unpack 32bit value * * @rp = raw buffer * @n = set value if !=NULL + * @be = extract in big-endian * return: -1 error or get value */ -uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n); +uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be); /* * rpack_uint64() - Pack/Unpack 64bit value * * @rp = raw buffer * @n = set value if !=NULL + * @be = extract in big-endian * return: -1 error or get value */ -uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n); +uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be); +/* + * rpack_data() - Pack/Unpack align data + * + * @rp = raw buffer + * @dat = data + * @datlen = data length + * return: NULL error or != NULL get data, must be e_free() after use! + */ +void *rpack_data(rpack_t * __restrict rp, void * __restrict dat, size_t datlen); +/* + * rpack_raw() - Pack/Unpack raw data + * + * @rp = raw buffer + * @dat = data + * @datlen = data length + * return: NULL error or != NULL get data, must be e_free() after use! + */ +void *rpack_raw(rpack_t * __restrict rp, void * __restrict dat, size_t datlen); #endif