--- libelwix/src/pack.c 2014/02/11 00:43:41 1.5 +++ libelwix/src/pack.c 2014/02/11 13:25:09 1.6.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: pack.c,v 1.5 2014/02/11 00:43:41 misho Exp $ +* $Id: pack.c,v 1.6.2.1 2014/02/11 13:25:09 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -100,6 +100,77 @@ 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) +{ + if (!rp) + return -1; + + rp->r_buf = e_malloc(len); + if (!rp->r_buf) { + RPACK_FREE(rp); + return -1; + } else + rp->r_len = len; + rp->r_next = rp->r_buf; + + return 0; +} + +/* + * 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) +{ + void *buf = NULL; + + if (!rp) + return -1; + + buf = e_realloc(rp->r_buf, newlen); + if (!buf) + return -1; + else { + rp->r_buf = buf; + rp->r_len = newlen; + } + + if (rp->r_next > (rp->r_buf + rp->r_len)) + rp->r_next = rp->r_buf; + + return 0; +} + +/* + * rpack_detach() - Detach and free dynamic allocated buffer from packet + * + * @rp = raw packet + * return: none + */ +void +rpack_detach(rpack_t * __restrict rp) +{ + if (!rp) + return; + + e_free(rp->r_buf); + RPACK_FREE(rp); +} + +/* * rpack_align_and_reserve() - Align & reserve space * * @rp = raw buffer @@ -295,7 +366,7 @@ rpack_data(rpack_t * __restrict rp, void * __restrict } /* - * rpack_raw() - Pack/Unpack raw data + * rpack_rdata() - Pack/Unpack raw data * * @rp = raw buffer * @dat = data @@ -303,7 +374,7 @@ rpack_data(rpack_t * __restrict rp, void * __restrict * 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) +rpack_rdata(rpack_t * __restrict rp, void * __restrict dat, size_t datlen) { void *buf = NULL; @@ -324,4 +395,112 @@ rpack_raw(rpack_t * __restrict rp, void * __restrict d rp->r_next += datlen; return buf; +} + +/* + * 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) +{ + uint16_t u; + + if (!RPACK_SANITY(rp)) + return (uint16_t) -1; + /* No space left */ + if (sizeof(uint16_t) + rp->r_next - rp->r_buf > rp->r_len) + return (uint16_t) -1; + + u = be ? EXTRACT_BE_16(rp->r_next) : EXTRACT_LE_16(rp->r_next); + if (n) + RPACK_SET_16(rp->r_next, n); + + rp->r_next += sizeof(uint16_t); + return u; +} + +/* + * 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) +{ + uint32_t u; + + if (!RPACK_SANITY(rp)) + return (uint32_t) -1; + /* No space left */ + if (sizeof(uint32_t) + rp->r_next - rp->r_buf > rp->r_len) + return (uint32_t) -1; + + u = be ? EXTRACT_BE_24(rp->r_next) : EXTRACT_LE_24(rp->r_next); + if (n) + RPACK_SET_24(rp->r_next, n); + + rp->r_next += sizeof(uint32_t); + return u; +} + +/* + * 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) +{ + uint32_t u; + + if (!RPACK_SANITY(rp)) + return (uint32_t) -1; + /* No space left */ + if (sizeof(uint32_t) + rp->r_next - rp->r_buf > rp->r_len) + return (uint32_t) -1; + + u = be ? EXTRACT_BE_32(rp->r_next) : EXTRACT_LE_32(rp->r_next); + if (n) + RPACK_SET_32(rp->r_next, n); + + rp->r_next += sizeof(uint32_t); + return u; +} + +/* + * 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) +{ + uint64_t u; + + if (!RPACK_SANITY(rp)) + return (uint64_t) -1; + /* No space left */ + if (sizeof(uint64_t) + rp->r_next - rp->r_buf > rp->r_len) + return (uint64_t) -1; + + u = be ? EXTRACT_BE_64(rp->r_next) : EXTRACT_LE_64(rp->r_next); + if (n) + RPACK_SET_64(rp->r_next, n); + + rp->r_next += sizeof(uint64_t); + return u; }