--- libelwix/src/pack.c	2013/06/28 15:30:46	1.1.2.3
+++ libelwix/src/pack.c	2014/01/29 14:16:54	1.3
@@ -1,3 +1,48 @@
+/*************************************************************************
+* (C) 2013 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
+*  by Michael Pounov <misho@elwix.org>
+*
+* $Author: misho $
+* $Id: pack.c,v 1.3 2014/01/29 14:16:54 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.
+*/
 #include "global.h"
 
 
@@ -125,8 +170,89 @@ rpack_uint16(rpack_t * __restrict rp, uint16_t * __res
 
 	u = EXTRACT_LE_16(next);
 	if (n)
-		EXTRACT_SET_16(next, *n);
+		RPACK_SET_16(next, n);
 
 	rp->r_next = next + sizeof(uint16_t);
+	return u;
+}
+
+/*
+ * rpack_uint24() - Pack/Unpack 24bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * return: -1 error or get value
+ */
+uint32_t
+rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n)
+{
+	uint32_t u;
+	uint8_t *next;
+
+	if (!RPACK_SANITY(rp))
+		return (uint32_t) -1;
+	/* No space left */
+	if (!(next = rpack_align_and_reserve(rp, sizeof(uint32_t))))
+		return (uint32_t) -1;
+
+	u = EXTRACT_LE_24(next);
+	if (n)
+		RPACK_SET_24(next, n);
+
+	rp->r_next = next + sizeof(uint32_t);
+	return u;
+}
+
+/*
+ * rpack_uint32() - Pack/Unpack 32bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * return: -1 error or get value
+ */
+uint32_t
+rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n)
+{
+	uint32_t u;
+	uint8_t *next;
+
+	if (!RPACK_SANITY(rp))
+		return (uint32_t) -1;
+	/* No space left */
+	if (!(next = rpack_align_and_reserve(rp, sizeof(uint32_t))))
+		return (uint32_t) -1;
+
+	u = EXTRACT_LE_32(next);
+	if (n)
+		RPACK_SET_32(next, n);
+
+	rp->r_next = next + sizeof(uint32_t);
+	return u;
+}
+
+/*
+ * rpack_uint64() - Pack/Unpack 64bit value
+ *
+ * @rp = raw buffer
+ * @n = set value if !=NULL
+ * return: -1 error or get value
+ */
+uint64_t
+rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n)
+{
+	uint64_t u;
+	uint8_t *next;
+
+	if (!RPACK_SANITY(rp))
+		return (uint64_t) -1;
+	/* No space left */
+	if (!(next = rpack_align_and_reserve(rp, sizeof(uint64_t))))
+		return (uint64_t) -1;
+
+	u = EXTRACT_LE_64(next);
+	if (n)
+		RPACK_SET_64(next, n);
+
+	rp->r_next = next + sizeof(uint64_t);
 	return u;
 }