--- libelwix/src/pack.c	2014/01/29 14:16:54	1.3
+++ libelwix/src/pack.c	2014/02/11 01:01:29	1.5.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: pack.c,v 1.3 2014/01/29 14:16:54 misho Exp $
+* $Id: pack.c,v 1.5.2.1 2014/02/11 01:01:29 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -154,10 +154,11 @@ rpack_uint8(rpack_t * __restrict rp, uint8_t * __restr
  *
  * @rp = raw buffer
  * @n = set value if !=NULL
+ * @be = extract in big-endian
  * return: -1 error or get value
  */
 uint16_t
-rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n)
+rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be)
 {
 	uint16_t u;
 	uint8_t *next;
@@ -168,7 +169,7 @@ rpack_uint16(rpack_t * __restrict rp, uint16_t * __res
 	if (!(next = rpack_align_and_reserve(rp, sizeof(uint16_t))))
 		return (uint16_t) -1;
 
-	u = EXTRACT_LE_16(next);
+	u = be ? EXTRACT_BE_16(next) : EXTRACT_LE_16(next);
 	if (n)
 		RPACK_SET_16(next, n);
 
@@ -181,10 +182,11 @@ rpack_uint16(rpack_t * __restrict rp, uint16_t * __res
  *
  * @rp = raw buffer
  * @n = set value if !=NULL
+ * @be = extract in big-endian
  * return: -1 error or get value
  */
 uint32_t
-rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n)
+rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be)
 {
 	uint32_t u;
 	uint8_t *next;
@@ -195,7 +197,7 @@ rpack_uint24(rpack_t * __restrict rp, uint32_t * __res
 	if (!(next = rpack_align_and_reserve(rp, sizeof(uint32_t))))
 		return (uint32_t) -1;
 
-	u = EXTRACT_LE_24(next);
+	u = be ? EXTRACT_BE_24(next) : EXTRACT_LE_24(next);
 	if (n)
 		RPACK_SET_24(next, n);
 
@@ -208,10 +210,11 @@ rpack_uint24(rpack_t * __restrict rp, uint32_t * __res
  *
  * @rp = raw buffer
  * @n = set value if !=NULL
+ * @be = extract in big-endian
  * return: -1 error or get value
  */
 uint32_t
-rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n)
+rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be)
 {
 	uint32_t u;
 	uint8_t *next;
@@ -222,7 +225,7 @@ rpack_uint32(rpack_t * __restrict rp, uint32_t * __res
 	if (!(next = rpack_align_and_reserve(rp, sizeof(uint32_t))))
 		return (uint32_t) -1;
 
-	u = EXTRACT_LE_32(next);
+	u = be ? EXTRACT_BE_32(next) : EXTRACT_LE_32(next);
 	if (n)
 		RPACK_SET_32(next, n);
 
@@ -235,10 +238,11 @@ rpack_uint32(rpack_t * __restrict rp, uint32_t * __res
  *
  * @rp = raw buffer
  * @n = set value if !=NULL
+ * @be = extract in big-endian
  * return: -1 error or get value
  */
 uint64_t
-rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n)
+rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be)
 {
 	uint64_t u;
 	uint8_t *next;
@@ -249,10 +253,183 @@ rpack_uint64(rpack_t * __restrict rp, uint64_t * __res
 	if (!(next = rpack_align_and_reserve(rp, sizeof(uint64_t))))
 		return (uint64_t) -1;
 
-	u = EXTRACT_LE_64(next);
+	u = be ? EXTRACT_BE_64(next) : EXTRACT_LE_64(next);
 	if (n)
 		RPACK_SET_64(next, n);
 
 	rp->r_next = next + sizeof(uint64_t);
+	return u;
+}
+
+/*
+ * rpack_data() - Pack/Unpack align data
+ *
+ * @rp = raw buffer
+ * @dat = data
+ * @datlen = data length
+ * return: NULL error or != NULL get data, must be e_free() after use!
+ */
+void *
+rpack_data(rpack_t * __restrict rp, void * __restrict dat, size_t datlen)
+{
+	void *buf = NULL;
+	uint8_t *next;
+
+	if (!datlen || !RPACK_SANITY(rp))
+		return NULL;
+	buf = e_malloc(datlen);
+	if (!buf)
+		return NULL;
+	/* No space left */
+	if (!(next = rpack_align_and_reserve(rp, datlen))) {
+		e_free(buf);
+		return NULL;
+	}
+
+	memcpy(buf, next, datlen);
+	if (dat)
+		memcpy(next, dat, datlen);
+
+	rp->r_next = next + datlen;
+	return buf;
+}
+
+/*
+ * 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_rdata(rpack_t * __restrict rp, void * __restrict dat, size_t datlen)
+{
+	void *buf = NULL;
+
+	if (!datlen || !RPACK_SANITY(rp))
+		return NULL;
+	buf = e_malloc(datlen);
+	if (!buf)
+		return NULL;
+	/* No space left */
+	if (datlen + rp->r_next - rp->r_buf > rp->r_len) {
+		e_free(buf);
+		return NULL;
+	}
+
+	memcpy(buf, rp->r_next, datlen);
+	if (dat)
+		memcpy(rp->r_next, dat, datlen);
+
+	rp->r_next += datlen;
+	return buf;
+}
+
+/*
+ * rpack_ruint16() - Pack/Unpack raw 16bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @be = extract in big-endian
+ * return: -1 error or get value
+ */
+uint16_t
+rpack_ruint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be)
+{
+	uint16_t u;
+
+	if (!RPACK_SANITY(rp))
+		return (uint16_t) -1;
+	/* No space left */
+	if (sizeof(uint16_t) + rp->r_next - rp->r_buf > rp->r_len)
+		return (uint16_t) -1;
+
+	u = be ? EXTRACT_BE_16(rp->r_next) : EXTRACT_LE_16(rp->r_next);
+	if (n)
+		RPACK_SET_16(rp->r_next, n);
+
+	rp->r_next += sizeof(uint16_t);
+	return u;
+}
+
+/*
+ * rpack_ruint24() - Pack/Unpack raw 24bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @be = extract in big-endian
+ * return: -1 error or get value
+ */
+uint32_t
+rpack_ruint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be)
+{
+	uint32_t u;
+
+	if (!RPACK_SANITY(rp))
+		return (uint32_t) -1;
+	/* No space left */
+	if (sizeof(uint32_t) + rp->r_next - rp->r_buf > rp->r_len)
+		return (uint32_t) -1;
+
+	u = be ? EXTRACT_BE_24(rp->r_next) : EXTRACT_LE_24(rp->r_next);
+	if (n)
+		RPACK_SET_24(rp->r_next, n);
+
+	rp->r_next += sizeof(uint32_t);
+	return u;
+}
+
+/*
+ * rpack_ruint32() - Pack/Unpack raw 32bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @be = extract in big-endian
+ * return: -1 error or get value
+ */
+uint32_t
+rpack_ruint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be)
+{
+	uint32_t u;
+
+	if (!RPACK_SANITY(rp))
+		return (uint32_t) -1;
+	/* No space left */
+	if (sizeof(uint32_t) + rp->r_next - rp->r_buf > rp->r_len)
+		return (uint32_t) -1;
+
+	u = be ? EXTRACT_BE_32(rp->r_next) : EXTRACT_LE_32(rp->r_next);
+	if (n)
+		RPACK_SET_32(rp->r_next, n);
+
+	rp->r_next += sizeof(uint32_t);
+	return u;
+}
+
+/*
+ * rpack_ruint64() - Pack/Unpack raw 64bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * @be = extract in big-endian
+ * return: -1 error or get value
+ */
+uint64_t
+rpack_ruint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be)
+{
+	uint64_t u;
+
+	if (!RPACK_SANITY(rp))
+		return (uint64_t) -1;
+	/* No space left */
+	if (sizeof(uint64_t) + rp->r_next - rp->r_buf > rp->r_len)
+		return (uint64_t) -1;
+
+	u = be ? EXTRACT_BE_64(rp->r_next) : EXTRACT_LE_64(rp->r_next);
+	if (n)
+		RPACK_SET_64(rp->r_next, n);
+
+	rp->r_next += sizeof(uint64_t);
 	return u;
 }