--- libelwix/inc/elwix/apack.h	2014/02/12 09:20:43	1.8.2.2
+++ libelwix/inc/elwix/apack.h	2014/02/13 14:38:52	1.8.2.4
@@ -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.8.2.4 2014/02/13 14:38:52 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -62,8 +62,11 @@ 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_SET_16(x, n)	do { assert((x)); \
 					*((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \