--- libelwix/inc/elwix/apack.h	2013/06/30 22:10:27	1.2
+++ libelwix/inc/elwix/apack.h	2014/02/11 00:43:41	1.7
@@ -1,3 +1,48 @@
+/*************************************************************************
+* (C) 2013 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
+*  by Michael Pounov <misho@elwix.org>
+*
+* $Author: misho $
+* $Id: apack.h,v 1.7 2014/02/11 00:43:41 misho Exp $
+*
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+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
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #ifndef __APACK_H
 #define __APACK_H
 
@@ -8,6 +53,7 @@ typedef struct tagRawPacket {
 	uint8_t	*r_next;
 } rpack_t;
 
+#define RPACK_INITIALIZER	{ .r_len = 0, .r_buf = NULL, .r_next = NULL }
 #define RPACK_FREE(x)		(assert((x)), memset((x), 0, sizeof(rpack_t)))
 #define RPACK_INIT(x, b, l)	do { assert((x)); RPACK_FREE(x); \
 					(x)->r_buf = (b); \
@@ -137,33 +183,55 @@ uint8_t rpack_uint8(rpack_t * __restrict rp, uint8_t *
  *
  * @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);
+uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be);
 /*
  * rpack_uint24() - Pack/Unpack 24bit value
  *
  * @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);
+uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be);
 /*
  * rpack_uint32() - Pack/Unpack 32bit value
  *
  * @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);
+uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be);
 /*
  * rpack_uint64() - Pack/Unpack 64bit value
  *
  * @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);
+uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be);
+/*
+ * 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);
+/*
+ * rpack_raw() - 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_raw(rpack_t * __restrict rp, void * __restrict dat, size_t datlen);
 
 
 #endif