--- libaitio/src/Attic/vars.c	2012/03/27 20:53:37	1.4.4.1
+++ libaitio/src/Attic/vars.c	2012/03/27 21:37:56	1.4.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: vars.c,v 1.4.4.1 2012/03/27 20:53:37 misho Exp $
+* $Id: vars.c,v 1.4.4.2 2012/03/27 21:37:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -48,6 +48,7 @@ SUCH DAMAGE.
 
 /*
  * io_vars2buffer() Marshaling data from array with variables to buffer
+ *
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vars = Variable array
@@ -85,6 +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_LEN(&v[i]) = htobe32(AIT_LEN(val));
 
 		switch (AIT_TYPE(val)) {
@@ -127,6 +129,7 @@ io_vars2buffer(u_char *buf, int buflen, array_t *vars)
 
 /*
  * io_buffer2vars() De-marshaling data from buffer to array with variables
+ *
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vnum = Number of variables into buffer
@@ -177,8 +180,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]));
 #else
 		AIT_LEN(val) = be32toh(AIT_LEN(&v[i]));
+		AIT_HASH(val) = be16toh(AIT_HASH(&v[i]));
 #endif
 
 		switch (AIT_TYPE(val)) {
@@ -241,6 +246,7 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int 
 
 /*
  * io_vars2map() Marshaling data from array with variables to memory map
+ *
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vars = Variable array
@@ -278,6 +284,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_LEN(&v[i]) = AIT_LEN(val);
 
 		switch (AIT_TYPE(val)) {
@@ -320,6 +327,7 @@ io_vars2map(u_char *buf, int buflen, array_t *vars)
 
 /*
  * io_map2vars() De-marshaling data from memory map to array with variables
+ *
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vnum = Number of variables into buffer
@@ -368,6 +376,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_LEN(val) = AIT_LEN(&v[i]);
 
 		switch (AIT_TYPE(val)) {
@@ -425,6 +434,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp
 
 /*
  * io_allocVars() Allocate ait_val_t array
+ *
  * @varnum = Number of variables
  * return: =NULL error or !=NULL allocated array
  */
@@ -455,6 +465,7 @@ io_allocVars(int varnum)
 
 /*
  * io_clrVars() Clear ait_val_t elements from array
+ *
  * @vars = Variable array
  * return: -1 error or size of array
  */
@@ -475,6 +486,7 @@ io_clrVars(array_t * __restrict vars)
 
 /*
  * io_freeVars() Free ait_val_t array
+ *
  * @vars = Variable array
  * return: none
  */
@@ -491,6 +503,7 @@ io_freeVars(array_t ** __restrict vars)
 
 /*
  * io_allocVar() Allocate memory for variable
+ *
  * return: NULL error or new variable, after use free variable with io_freeVar()
  */
 inline ait_val_t *
@@ -511,6 +524,7 @@ io_allocVar(void)
 
 /*
  * io_freeVar() Free allocated memory for variable
+ *
  * @val = Variable
  * return: none
  */