--- libaitio/inc/aitio.h	2012/08/29 13:51:29	1.25
+++ libaitio/inc/aitio.h	2012/12/19 11:03:04	1.28
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.25 2012/08/29 13:51:29 misho Exp $
+* $Id: aitio.h,v 1.28 2012/12/19 11:03:04 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -245,6 +245,8 @@ typedef struct {
 						void *__p = io_realloc(__val->val.string, AIT_LEN(__val) + __l); \
 						if (__p) { \
 							AIT_LEN(__val) += __l; \
+							if (!__val->val.string) \
+								memset(__p, 0, AIT_LEN(__val)); \
 							__val->val.string = __p; \
 							strlcat((char*) __val->val.string, __s, \
 									AIT_LEN(__val)); \
@@ -341,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)) { \
@@ -403,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
@@ -439,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
@@ -461,7 +466,7 @@ inline struct io_ether_addr *io_ether_aton(const char 
  * @addr = Address
  * return: 0 not supported family type or port number
  */
-inline u_short io_n2port(io_sockaddr_t * __restrict addr);
+inline unsigned short io_n2port(io_sockaddr_t * __restrict addr);
 /*
  * io_n2addr() - Extract address from network structure
  *
@@ -480,6 +485,15 @@ const char *io_n2addr(io_sockaddr_t * __restrict addr,
  */
 io_sockaddr_t *io_gethostbyname(const char *psHost, unsigned short port, 
 		io_sockaddr_t * __restrict addr);
+/*
+ * io_addrcmp() - Compare network addresses
+ *
+ * @a = 1st address
+ * @b = 2nd address
+ * @p = compare and ports, if family is AF_INET or AF_INET6
+ * return: 0 is equal or !=0 is different
+ */
+int io_addrcmp(io_sockaddr_t * __restrict a, io_sockaddr_t * __restrict b, int p);
 
 /*
  * io_vars2buffer() - Marshaling data from array with variables to buffer
@@ -547,6 +561,33 @@ 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, unsigned int l, ...);
+/*
+ * io_sprintfVar() - Builtin string variable from formatted input
+ *
+ * @v = variable
+ * @fmt = format string
+ * @... = argument(s)
+ * 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
  *
  * @v = variable
@@ -608,7 +649,7 @@ inline void io_sortVarsByVal(array_t * __restrict vars
  * @key = Search key
  * return: NULL error or not found, !=NULL valid element
  */
-ait_val_t *io_findKeyVars(array_t * __restrict vars, u_short key);
+ait_val_t *io_findKeyVars(array_t * __restrict vars, unsigned short key);
 /*
  * io_findKeyHash() - Find variable by hash string from array
  *
@@ -919,6 +960,30 @@ int io_MakeAV(const char * __restrict csArgs, const ch
 */
 int io_MakeAV2(char * __restrict psArgs, const char *csDelim, 
 		char ** __restrict psAttr, char ** __restrict psValue);
+/*
+ * io_AV2Path() - Attribute/Value pair store to file
+ *
+ * @csPath = Directory
+ * @csAttr = Attribute
+ * @csVal = Value
+ * @update = Update if a/v exists
+ * @perm = File permissions, if =0 set default perm=0600
+ * return: -1 error or >-1 written bytes
+ */
+int io_AV2Path(const char *csPath, const char *csAttr, const char *csVal, 
+		int update, int perm);
+/*
+ * io_Path2AV() - Get stored Attribute/Value
+ *
+ * @csPath = Directory
+ * @csAttr = Attribute
+ * @psVal = Value
+ * @valLen = Value length
+ * @del = Delete a/v pair after read
+ * return: -1 error or >-1 readed bytes
+ */
+int io_Path2AV(const char *csPath, const char *csAttr, char *psVal, int valLen, 
+		int del);
 
 /*
  * io_sarrInit() - Create and initialize dynamic split-order array