--- libelwix/inc/elwix/apack.h 2013/12/05 14:41:31 1.3.12.1 +++ libelwix/inc/elwix/apack.h 2014/02/13 14:38:52 1.8.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: apack.h,v 1.3.12.1 2013/12/05 14:41:31 misho Exp $ +* $Id: apack.h,v 1.8.2.4 2014/02/13 14:38:52 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 @@ -61,8 +61,12 @@ typedef struct tagRawPacket { (x)->r_next = (x)->r_buf; \ } while (0) #define RPACK_SANITY(x) ((x) && (x)->r_buf && (x)->r_next && (x)->r_next >= (x)->r_buf) +#define RPACK_BUF(x) (assert((x)), (x)->r_buf) +#define RPACK_NEXT(x) (assert((x)), (x)->r_next) #define RPACK_LEN(x) (assert((x)), (x)->r_len) #define RPACK_REWIND(x) (assert((x)), (x)->r_next = (x)->r_buf) +#define RPACK_OFF(x) (assert((x)), (x)->r_next - (x)->r_buf) +#define RPACK_REMAIN(x) (assert((x)), (x)->r_len - ((x)->r_next - (x)->r_buf)) #define RPACK_SET_16(x, n) do { assert((x)); \ *((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \ @@ -171,6 +175,32 @@ rpack_t *rpack_create(void * __restrict buf, size_t bu void rpack_destroy(rpack_t ** __restrict rp); /* + * rpack_attach() - Attach dynamic allocating buffer at packet + * + * @rp = raw packet; + * @len = allocate bytes + * return: -1 error or 0 ok, should be detached with rpack_detach() + * before call rpack_destroy() after use! + */ +int rpack_attach(rpack_t * __restrict rp, size_t len); +/* + * rpack_resize() - Resize dynamic allocated buffer at packet + * + * @rp = raw packet + * @newlen = resize buffer to bytes + * return: -1 error or 0 ok, should be detached with rpack_detach() + * before call rpack_destroy() after use! + */ +int rpack_resize(rpack_t * __restrict rp, size_t newlen); +/* + * rpack_detach() - Detach and free dynamic allocated buffer from packet + * + * @rp = raw packet + * return: none + */ +void rpack_detach(rpack_t * __restrict rp); + +/* * rpack_uint8() - Pack/Unpack 8bit value * * @rp = raw buffer @@ -183,33 +213,91 @@ 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_ruint16() - Pack/Unpack raw 16bit value + * + * @rp = raw buffer + * @n = set value if !=NULL + * @be = extract in big-endian + * return: -1 error or get value + */ +uint16_t rpack_ruint16(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_ruint24() - Pack/Unpack raw 24bit value + * + * @rp = raw buffer + * @n = set value if !=NULL + * @be = extract in big-endian + * return: -1 error or get value + */ +uint32_t rpack_ruint24(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_ruint32() - Pack/Unpack raw 32bit value + * + * @rp = raw buffer + * @n = set value if !=NULL + * @be = extract in big-endian + * return: -1 error or get value + */ +uint32_t rpack_ruint32(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_ruint64() - Pack/Unpack raw 64bit value + * + * @rp = raw buffer + * @n = set value if !=NULL + * @be = extract in big-endian + * return: -1 error or get value + */ +uint64_t rpack_ruint64(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_rdata() - 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_rdata(rpack_t * __restrict rp, void * __restrict dat, size_t datlen); #endif