--- libelwix/inc/elwix/apack.h	2014/02/12 09:20:43	1.8.2.2
+++ libelwix/inc/elwix/apack.h	2025/08/21 15:43:00	1.12
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: apack.h,v 1.8.2.2 2014/02/12 09:20:43 misho Exp $
+* $Id: apack.h,v 1.12 2025/08/21 15:43:00 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 <info@elwix.org>
 
-Copyright 2004 - 2014
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -62,8 +62,13 @@ typedef struct tagRawPacket {
 				} 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_WHEREAMI(x, nx)	(assert((x)), (size_t) (((uint8_t*)(nx)) - (x)->r_buf))
 
 #define RPACK_SET_16(x, n)	do { assert((x)); \
 					*((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \
@@ -146,6 +151,10 @@ typedef struct tagRawPacket {
 				))
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * rpack_align_and_reserve() - Align & reserve space
  *
@@ -154,6 +163,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
@@ -210,7 +235,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);
@@ -219,7 +244,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);
@@ -228,7 +253,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);
@@ -237,7 +262,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);
@@ -246,7 +271,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);
@@ -255,7 +280,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);
@@ -264,7 +289,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);
@@ -273,7 +298,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);
@@ -296,5 +321,8 @@ void *rpack_data(rpack_t * __restrict rp, void * __res
  */
 void *rpack_rdata(rpack_t * __restrict rp, void * __restrict dat, size_t datlen);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif