--- libelwix/inc/elwix/apack.h	2013/06/28 11:06:31	1.1.2.2
+++ libelwix/inc/elwix/apack.h	2013/06/28 15:30:46	1.1.2.3
@@ -15,8 +15,64 @@ 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_LEN(x)		(assert((x)), (x)->r_len)
+#define RPACK_REWIND(x)		(assert((x)), (x)->r_next = (x)->r_buf)
 
+#define EXTRACT_LE_8(x)		(assert((x)), *(x))
+#define EXTRACT_LE_16(x)	(assert((x)), (u_int16_t) ( \
+					(uint16_t) *((const uint8_t *) (x) + 1) << 8 | \
+					(uint16_t) *((const uint8_t *) (x) + 0) \
+				))
+#define EXTRACT_LE_24(x)	(assert((x)), (u_int32_t) ( \
+					(uint32_t) *((const uint8_t *) (x) + 2) << 16 | \
+					(uint32_t) *((const uint8_t *) (x) + 1) << 8 | \
+					(uint32_t) *((const uint8_t *) (x) + 0) \
+				))
+#define EXTRACT_LE_32(x)	(assert((x)), (u_int32_t) ( \
+					(uint32_t) *((const uint8_t *) (x) + 3) << 24 | \
+					(uint32_t) *((const uint8_t *) (x) + 2) << 16 | \
+					(uint32_t) *((const uint8_t *) (x) + 1) << 8 | \
+					(uint32_t) *((const uint8_t *) (x) + 0) \
+				))
+#define EXTRACT_LE_64(x)	(assert((x)), (u_int64_t) ( \
+					(uint64_t) *((const uint8_t *) (x) + 7) << 56 | \
+					(uint64_t) *((const uint8_t *) (x) + 6) << 48 | \
+					(uint64_t) *((const uint8_t *) (x) + 5) << 40 | \
+					(uint64_t) *((const uint8_t *) (x) + 4) << 32 | \
+					(uint64_t) *((const uint8_t *) (x) + 3) << 24 | \
+					(uint64_t) *((const uint8_t *) (x) + 2) << 16 | \
+					(uint64_t) *((const uint8_t *) (x) + 1) << 8 | \
+					(uint64_t) *((const uint8_t *) (x) + 0) \
+				))
 
+#define EXTRACT_BE_8(x)		(assert((x)), *(x))
+#define EXTRACT_BE_16(x)	(assert((x)), (u_int16_t) ( \
+					(uint16_t) *((const uint8_t *) (x) + 0) << 8 | \
+					(uint16_t) *((const uint8_t *) (x) + 1) \
+				))
+#define EXTRACT_BE_24(x)	(assert((x)), (u_int32_t) ( \
+					(uint32_t) *((const uint8_t *) (x) + 0) << 16 | \
+					(uint32_t) *((const uint8_t *) (x) + 1) << 8 | \
+					(uint32_t) *((const uint8_t *) (x) + 2) \
+				))
+#define EXTRACT_BE_32(x)	(assert((x)), (u_int32_t) ( \
+					(uint32_t) *((const uint8_t *) (x) + 0) << 24 | \
+					(uint32_t) *((const uint8_t *) (x) + 1) << 16 | \
+					(uint32_t) *((const uint8_t *) (x) + 2) << 8 | \
+					(uint32_t) *((const uint8_t *) (x) + 3) \
+				))
+#define EXTRACT_BE_64(x)	(assert((x)), (u_int64_t) ( \
+					(uint64_t) *((const uint8_t *) (x) + 0) << 56 | \
+					(uint64_t) *((const uint8_t *) (x) + 1) << 48 | \
+					(uint64_t) *((const uint8_t *) (x) + 2) << 40 | \
+					(uint64_t) *((const uint8_t *) (x) + 3) << 32 | \
+					(uint64_t) *((const uint8_t *) (x) + 4) << 24 | \
+					(uint64_t) *((const uint8_t *) (x) + 5) << 16 | \
+					(uint64_t) *((const uint8_t *) (x) + 6) << 8 | \
+					(uint64_t) *((const uint8_t *) (x) + 7) \
+				))
+
+
 /*
  * rpack_align_and_reserve() - Align & reserve space
  *
@@ -50,6 +106,14 @@ void rpack_destroy(rpack_t ** __restrict rp);
  * return: -1 error or get value
  */
 uint8_t rpack_uint8(rpack_t * __restrict rp, uint8_t * __restrict n);
+/*
+ * rpack_uint16() - Pack/Unpack 16bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * return: -1 error or get value
+ */
+uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n);
 
 
 #endif