--- libaitio/src/Attic/vars.c	2011/08/29 14:58:50	1.1.2.1
+++ libaitio/src/Attic/vars.c	2011/08/31 12:29:32	1.1.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: vars.c,v 1.1.2.1 2011/08/29 14:58:50 misho Exp $
+* $Id: vars.c,v 1.1.2.2 2011/08/31 12:29:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,3 +46,178 @@ SUCH DAMAGE.
 #include "global.h"
 
 
+/*
+ * io_vals2buffer() Marshaling data from array with variables to buffer
+ * @buf = Buffer
+ * @buflen = Size of buffer
+ * @vars = Variable array
+ * return: -1 error, 0 nothing done or >0 size of marshaled data
+ */
+int
+io_vals2buffer(u_char **buf, int buflen, array_t *vars)
+{
+	int Limit = 0;
+	register int i;
+	ait_val_t *v, *val;
+	u_char *data;
+
+	assert(buf);
+	assert(vars);
+	if (!buf || !vars || !*buf)
+		return -1;
+	if (!buflen || !io_arraySize(vars))
+		return 0;
+
+	Limit = sizeof(ait_val_t) * io_arraySize(vars);
+	if (Limit > buflen) {
+		io_SetErr(EMSGSIZE, "Error:: too short buffer buflen=%d needed min %d ...\n", 
+				buflen, Limit);
+		return -1;
+	} else {
+		memset(*buf, 0, buflen);
+
+		v = (ait_val_t*) *buf;
+		data = *buf + Limit;
+	}
+
+	/* marshaling */
+	for (i = 0; i < io_arraySize(vars); i++) {
+		val = io_array(vars, i, ait_val_t*);
+
+		v[i].val_type = val->val_type;
+		AIT_LEN(&v[i]) = htobe32(AIT_LEN(val));
+
+		switch (AIT_TYPE(val)) {
+			case blob:
+			case f32:
+			case f64:
+			case i8:
+			case i16:
+			case i32:
+			case i64:
+			case u8:
+			case u16:
+			case u32:
+			case u64:
+				v[i].val.net = htobe64(val->val.net);
+				break;
+			case buffer:
+			case string:
+				if (AIT_LEN(val) > buflen - Limit) {
+					io_SetErr(EMSGSIZE, "Error:: too short buffer buflen=%d "
+							"needed min %d ...\n", buflen, Limit + AIT_LEN(val));
+					return -1;
+				} else
+					Limit += AIT_LEN(val);
+
+				memcpy(data, val->val.buffer, AIT_LEN(val));
+				/* Debug:: data offset in packet, not matter for anything! */
+				v[i].val.net = data - *buf;
+				data += AIT_LEN(val);
+				break;
+			default:
+				io_SetErr(EINVAL, "Error:: unsupported variable type=%d at element #%d ...\n", 
+						AIT_TYPE(val), i);
+				return -1;
+		}
+	}
+
+	return Limit;
+}
+
+/*
+ * io_buffer2vals() De-marshaling data from buffer to array with variables
+ * @buf = Buffer
+ * @buflen = Size of buffer
+ * @vnum = Number of variables into buffer
+ * @zcpy = Zero-copy for variables, if !=0 don't use io_arrayFree() for free variables and 
+ 		*DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()
+ * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()
+ */
+array_t *
+io_buffer2vals(u_char *buf, int buflen, int vnum, int zcpy)
+{
+	array_t *vars;
+	int Limit = 0;
+	register int i;
+	ait_val_t *v, *val;
+	u_char *data;
+
+	assert(buf);
+	if (!buf || !buflen || !vnum)
+		return NULL;
+
+	Limit = sizeof(ait_val_t) * vnum;
+	if (Limit > buflen) {
+		io_SetErr(EMSGSIZE, "Error:: too short buffer buflen=%d needed min %d ...\n", 
+				buflen, Limit);
+		return NULL;
+	} else {
+		if (!(vars = io_arrayInit(vnum)))
+			return NULL;
+
+		v = (ait_val_t*) buf;
+		data = buf + Limit;
+	}
+
+	/* de-marshaling */
+	for (i = 0; i < io_arraySize(vars); i++) {
+		if (!zcpy) {
+			val = malloc(sizeof(ait_val_t));
+			if (!val) {
+				LOGERR;
+				io_arrayFree(vars);
+				io_arrayDestroy(&vars);
+				return NULL;
+			}
+		} else
+			val = v + i;
+		io_arraySet(vars, i, val);
+
+		val->val_type = v[i].val_type;
+		AIT_LEN(val) = betoh32(AIT_LEN(&v[i]));
+
+		switch (AIT_TYPE(val)) {
+			case blob:
+			case f32:
+			case f64:
+			case i8:
+			case i16:
+			case i32:
+			case i64:
+			case u8:
+			case u16:
+			case u32:
+			case u64:
+				val->val.net = betoh64(v[i].val.net);
+				break;
+			case buffer:
+			case string:
+				if (AIT_LEN(val) > buflen - Limit) {
+					io_SetErr(EMSGSIZE, "Error:: too short buffer buflen=%d "
+							"needed min %d ...\n", buflen, Limit + AIT_LEN(val));
+					if (!zcpy)
+						io_arrayFree(vars);
+					io_arrayDestroy(&vars);
+					return NULL;
+				} else
+					Limit += AIT_LEN(val);
+
+				if (!zcpy)
+					memcpy(val->val.buffer, data, AIT_LEN(val));
+				else
+					val->val.buffer = data;
+				data += AIT_LEN(val);
+				break;
+			default:
+				io_SetErr(EINVAL, "Error:: unsupported variable type=%d at element #%d ...\n", 
+						AIT_TYPE(val), i);
+				if (!zcpy)
+					io_arrayFree(vars);
+				io_arrayDestroy(&vars);
+				return NULL;
+		}
+	}
+
+	return vars;
+}