--- libelwix/inc/elwix/apack.h	2014/02/11 00:41:12	1.6.2.2
+++ libelwix/inc/elwix/apack.h	2014/02/21 13:30:19	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: apack.h,v 1.6.2.2 2014/02/11 00:41:12 misho Exp $
+* $Id: apack.h,v 1.9 2014/02/21 13:30:19 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -61,8 +61,13 @@ 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_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); \
@@ -153,6 +158,22 @@ 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 = move aligned current position after length
+ * return: NULL error or current position
+ */
+uint8_t *rpack_next(rpack_t * __restrict rp, size_t after_len);
+/*
+ * rpack_rnext() - Get and set raw current position
+ *
+ * @rp = raw packet
+ * @after_len = !=0 move current position after length
+ * return: NULL error or raw current position
+ */
+uint8_t *rpack_rnext(rpack_t * __restrict rp, size_t after_len);
 
 /*
  * rpack_create() - Allocate & init raw packet structure
@@ -171,6 +192,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,38 +230,74 @@ 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);
 /*
+ * rpack_ruint16() - Pack/Unpack raw 16bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @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);
+/*
  * rpack_uint24() - Pack/Unpack 24bit value
  *
  * @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);
 /*
+ * rpack_ruint24() - Pack/Unpack raw 24bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @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);
+/*
  * rpack_uint32() - Pack/Unpack 32bit value
  *
  * @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);
 /*
+ * rpack_ruint32() - Pack/Unpack raw 32bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @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);
+/*
  * rpack_uint64() - Pack/Unpack 64bit value
  *
  * @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);
 /*
+ * rpack_ruint64() - Pack/Unpack raw 64bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @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);
+/*
  * rpack_data() - Pack/Unpack align data
  *
  * @rp = raw buffer
@@ -224,14 +307,14 @@ uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_
  */
 void *rpack_data(rpack_t * __restrict rp, void * __restrict dat, size_t datlen);
 /*
- * rpack_raw() - Pack/Unpack raw data
+ * 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_raw(rpack_t * __restrict rp, void * __restrict dat, size_t datlen);
+void *rpack_rdata(rpack_t * __restrict rp, void * __restrict dat, size_t datlen);
 
 
 #endif