--- libaitio/src/Attic/vars.c	2012/03/29 01:31:34	1.5
+++ libaitio/src/Attic/vars.c	2012/03/29 12:23:00	1.5.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: vars.c,v 1.5 2012/03/29 01:31:34 misho Exp $
+* $Id: vars.c,v 1.5.2.2 2012/03/29 12:23:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -86,7 +86,7 @@ io_vars2buffer(u_char *buf, int buflen, array_t *vars)
 		val = io_array(vars, i, ait_val_t*);
 
 		v[i].val_type = val->val_type;
-		AIT_HASH(&v[i]) = htobe16(AIT_HASH(val));
+		AIT_KEY(&v[i]) = htobe16(AIT_KEY(val));
 		AIT_LEN(&v[i]) = htobe32(AIT_LEN(val));
 
 		switch (AIT_TYPE(val)) {
@@ -193,10 +193,10 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int 
 		val->val_type = v[i].val_type;
 #if defined(__OpenBSD__)
 		AIT_LEN(val) = betoh32(AIT_LEN(&v[i]));
-		AIT_HASH(val) = betoh16(AIT_HASH(&v[i]));
+		AIT_KEY(val) = betoh16(AIT_KEY(&v[i]));
 #else
 		AIT_LEN(val) = be32toh(AIT_LEN(&v[i]));
-		AIT_HASH(val) = be16toh(AIT_HASH(&v[i]));
+		AIT_KEY(val) = be16toh(AIT_KEY(&v[i]));
 #endif
 
 		switch (AIT_TYPE(val)) {
@@ -300,7 +300,7 @@ io_vars2map(u_char *buf, int buflen, array_t *vars)
 		val = io_array(vars, i, ait_val_t*);
 
 		v[i].val_type = val->val_type;
-		AIT_HASH(&v[i]) = AIT_HASH(val);
+		AIT_KEY(&v[i]) = AIT_KEY(val);
 		AIT_LEN(&v[i]) = AIT_LEN(val);
 
 		switch (AIT_TYPE(val)) {
@@ -405,7 +405,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp
 		io_arraySet(vars, i, val);
 
 		val->val_type = v[i].val_type;
-		AIT_HASH(val) = AIT_HASH(&v[i]);
+		AIT_KEY(val) = AIT_KEY(&v[i]);
 		AIT_LEN(val) = AIT_LEN(&v[i]);
 
 		switch (AIT_TYPE(val)) {
@@ -569,4 +569,78 @@ io_freeVar(ait_val_t * __restrict val)
 		free(val);
 		val = NULL;
 	}
+}
+
+static int
+_cmp_arr_key_asc(const void *a, const void *b)
+{
+	return AIT_KEY(*(ait_val_t**) a) - AIT_KEY(*(ait_val_t**) b);
+}
+
+static int
+_cmp_arr_key_desc(const void *a, const void *b)
+{
+	return AIT_KEY(*(ait_val_t**) b) - AIT_KEY(*(ait_val_t**) a);
+}
+
+/*
+ * io_sortVars() Sorting array with variables
+ *
+ * @vars = Variable array
+ * @order = Sort order. If =0 ascend or !=0 descend
+ * @cmp = Compare function for sorting. If =NULL compare by key
+ * return: none
+ */
+inline void
+io_sortVars(array_t * __restrict vars, int order,  int (*cmp)(const void*, const void*))
+{
+	if (!vars)
+		return;
+
+	if (cmp)
+		qsort(vars->arr_data, vars->arr_num, sizeof(void*), cmp);
+	else if (order)
+		qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_key_desc);
+	else
+		qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_key_asc);
+}
+
+/*
+ * io_findKeyVars() Find variable by key from array
+ *
+ * @vars = Variables
+ * @key = Search key
+ * return: NULL error or not found, !=NULL valid element
+ */
+ait_val_t *
+io_findKeyVars(array_t * __restrict vars, u_short key)
+{
+	array_t *tmp;
+	ait_val_t **v = NULL;
+	register int i;
+	const u_char *p;
+
+	if (!vars)
+		return NULL;
+
+	if (io_arrayCopy(&tmp, vars) == -1)
+		return NULL;
+	else
+		qsort(tmp->arr_data, tmp->arr_num, sizeof(void*), _cmp_arr_key_asc);
+
+	/* binary search */
+	for (p = (const u_char*) tmp->arr_data, i = io_arraySize(tmp); i; i >>= 1) {
+		v = (ait_val_t**) (p + (i >> 1) * sizeof(void*));
+		if (!(key - AIT_KEY(*v))) {	/* found! */
+			io_arrayDestroy(&tmp);
+			return *v;
+		}
+		if ((key - AIT_KEY(*v)) > 0) {	/* move right key > current */
+			p = (const u_char*) v + sizeof(void*);
+			i--;
+		}				/* else move left */
+	}
+
+	io_arrayDestroy(&tmp);
+	return NULL;
 }