--- libelwix/src/pack.c	2014/02/13 14:58:55	1.6.2.2
+++ libelwix/src/pack.c	2014/02/13 15:06:44	1.6.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: pack.c,v 1.6.2.2 2014/02/13 14:58:55 misho Exp $
+* $Id: pack.c,v 1.6.2.3 2014/02/13 15:06:44 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -509,11 +509,35 @@ rpack_ruint64(rpack_t * __restrict rp, uint64_t * __re
  * rpack_next() - Get and set current position
  *
  * @rp = raw packet
- * @after_len = !=0 move current position after length
+ * @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)
+{
+	uint8_t *cur = NULL, *next = NULL;
+
+	if (!RPACK_SANITY(rp))
+		return NULL;
+	/* No space left */
+	if (!(next = rpack_align_and_reserve(rp, after_len)))
+		return NULL;
+
+	cur = rp->r_next;
+
+	rp->r_next = next + after_len;
+	return cur;
+}
+
+/*
+ * 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)
 {
 	uint8_t *next = NULL;