--- libelwix/inc/elwix/apack.h 2014/02/13 15:06:44 1.8.2.6 +++ libelwix/inc/elwix/apack.h 2014/02/21 13:28:38 1.8.2.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: apack.h,v 1.8.2.6 2014/02/13 15:06:44 misho Exp $ +* $Id: apack.h,v 1.8.2.9 2014/02/21 13:28:38 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -67,6 +67,7 @@ typedef struct tagRawPacket { #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_ISEND(x) (assert((x)), (size_t) ((x)->r_next - (x)->r_buf) >= (x)->r_len) #define RPACK_SET_16(x, n) do { assert((x)); \ *((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \ @@ -229,7 +230,7 @@ uint8_t rpack_uint8(rpack_t * __restrict rp, uint8_t * * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be); @@ -238,7 +239,7 @@ uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_ * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint16_t rpack_ruint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be); @@ -247,7 +248,7 @@ uint16_t rpack_ruint16(rpack_t * __restrict rp, uint16 * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be); @@ -256,7 +257,7 @@ uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_ * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint32_t rpack_ruint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be); @@ -265,7 +266,7 @@ uint32_t rpack_ruint24(rpack_t * __restrict rp, uint32 * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be); @@ -274,7 +275,7 @@ uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_ * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint32_t rpack_ruint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be); @@ -283,7 +284,7 @@ uint32_t rpack_ruint32(rpack_t * __restrict rp, uint32 * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be); @@ -292,7 +293,7 @@ uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_ * * @rp = raw buffer * @n = set value if !=NULL - * @be = extract in big-endian + * @be = byte order [-1 little endian, 1 big endian and 0 host order] * return: -1 error or get value */ uint64_t rpack_ruint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be);