--- libelwix/inc/elwix/apack.h 2014/02/11 01:06:19 1.8 +++ libelwix/inc/elwix/apack.h 2014/02/13 14:58:55 1.8.2.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: apack.h,v 1.8 2014/02/11 01:06:19 misho Exp $ +* $Id: apack.h,v 1.8.2.5 2014/02/13 14:58:55 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -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); \ @@ -153,6 +157,14 @@ typedef struct tagRawPacket { * return: NULL error or not enough space, !=NULL next position */ uint8_t *rpack_align_and_reserve(rpack_t * __restrict rp, size_t siz); +/* + * rpack_next() - Get and set current position + * + * @rp = raw packet + * @after_len = !=0 move current position after length + * return: NULL error or current position + */ +uint8_t *rpack_next(rpack_t * __restrict rp, size_t after_len); /* * rpack_create() - Allocate & init raw packet structure @@ -169,6 +181,32 @@ rpack_t *rpack_create(void * __restrict buf, size_t bu * return: none */ 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