--- libaitio/inc/aitio.h	2012/09/03 12:18:27	1.25.2.2
+++ libaitio/inc/aitio.h	2012/09/17 13:44:21	1.25.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.25.2.2 2012/09/03 12:18:27 misho Exp $
+* $Id: aitio.h,v 1.25.2.5 2012/09/17 13:44:21 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -343,11 +343,7 @@ typedef struct {
 						AIT_INIT_VAL((_vl)); \
 						(_vl)->val_type = _t; \
 					} while (0)
-#define AIT_SET_LIKE(_vl, _t, _l, _v)	do { assert((_vl)); \
-						AIT_INIT_VAL2((_vl), _t); \
-						AIT_LEN((_vl)) = _l; AIT_IN((_vl)) = 1; \
-						AIT_RAW((_vl)) = (uint64_t) (_v); \
-					} while (0)
+#define AIT_SET_LIKE(_vl, _t, _l, _v)	(assert((_vl)), io_setlikeVar((_vl), _t, _l, _v))
 					/* if attribute zeroCopy is set not execute io_free() */
 #define AIT_FREE_VAL(_vl)		do { ait_val_t *__val = (_vl); assert(__val); \
 						switch (AIT_TYPE(__val)) { \
@@ -405,7 +401,7 @@ typedef union {
 #define IO_SOCKADDR_INIT	{ .ss = { 0 } }
 
 
-#define io_align(x, a)		(((x) + (a)) & ~(a))
+#define io_align(x, a)		(((x) + ((a) - 1)) & ~((a) - 1))
 
 
 // io_GetErrno() Get error code of last operation
@@ -441,6 +437,13 @@ extern void (*io_free)(void*);
 
 
 /*
+ * io_usleep() - usleep() replacement for ELWIX
+ *
+ * @usec = microseconds for sleep
+ * return: -1 interrupted by signal or 0 ok
+ */
+inline int io_usleep(unsigned int usec);
+/*
  * io_ether_ntoa() - Convert ethernet address to string
  *
  * @n = ethernet address structure, like struct ether_addr
@@ -549,6 +552,16 @@ inline void io_freeVar(ait_val_t ** __restrict val);
  */
 ait_val_t *io_makeVar(ait_type_t type, ...);
 /*
+ * io_setlikeVar() - Set variable like ...
+ *
+ * @v = variable
+ * @t = type of data
+ * @l = length of data
+ * @... = data
+ * return: -1 error or 0 ok
+ */
+inline int io_setlikeVar(ait_val_t * __restrict v, ait_type_t t, u_int l, ...);
+/*
  * io_sprintfVar() - Builtin string variable from formatted input
  *
  * @v = variable
@@ -557,6 +570,14 @@ ait_val_t *io_makeVar(ait_type_t type, ...);
  * return: -1 error or >0 copied bytes to variable
  */
 int io_sprintfVar(ait_val_t * __restrict v, const char *fmt, ...);
+/*
+ * io_cmpVar() - Compare two variables
+ *
+ * @a = 1st variable
+ * @b = 2nd variable
+ * return: 0 is equal or !=0 is different
+ */
+inline int io_cmpVar(ait_val_t * __restrict a, ait_val_t * __restrict b);
 /*
  * io_hashVar() - Generate hash key for variable from string or value
  *