--- libaitio/inc/aitio.h	2012/08/02 00:47:46	1.24
+++ libaitio/inc/aitio.h	2012/11/19 15:23:31	1.26.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.24 2012/08/02 00:47:46 misho Exp $
+* $Id: aitio.h,v 1.26.4.3 2012/11/19 15:23:31 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -170,6 +170,8 @@ typedef struct {
 #define AIT_GET_DATA(_vl)		(assert(AIT_TYPE((_vl)) == data), (_vl)->val_data)
 #define AIT_GET_BUF(_vl)		(assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer)
 #define AIT_GET_STR(_vl)		(assert(AIT_TYPE((_vl)) == string), (char*) (_vl)->val.string)
+#define AIT_GET_STRZ(_vl)		(assert(AIT_TYPE((_vl)) == string), (_vl)->val.string ? \
+									(char*) (_vl)->val.string : "")
 #define AIT_GET_BLOB(_vl)		(assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob)
 #define AIT_GET_U8(_vl)			(assert(AIT_TYPE((_vl)) == u8), (_vl)->val.u8)
 #define AIT_GET_U16(_vl)		(assert(AIT_TYPE((_vl)) == u16), (_vl)->val.u16)
@@ -216,7 +218,7 @@ typedef struct {
 						} } while (0)
 #define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); const char *__s = (_v); assert(__val); \
 						__val->val_type = string; \
-						if (__s && *__s) { \
+						if (__s) { \
 							__val->val.string = (int8_t*) io_strdup(__s); \
 							AIT_LEN(__val) = strlen((const char*) \
 									__val->val.string) + 1; \
@@ -243,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)); \
@@ -339,6 +343,7 @@ typedef struct {
 						AIT_INIT_VAL((_vl)); \
 						(_vl)->val_type = _t; \
 					} 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)) { \
@@ -396,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
@@ -432,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
@@ -454,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
  *
@@ -473,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
@@ -540,6 +561,41 @@ 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
+ * @key = key string for hash, if =NULL hash will built from variable
+ * return: hash key
+ */
+unsigned short io_hashVar(ait_val_t * __restrict v, const char * __restrict key);
+/*
  * io_allocVars() - Allocate ait_val_t array
  *
  * @varnum = Number of variables
@@ -593,7 +649,22 @@ 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
+ *
+ * @vars = Variables
+ * @key = Search string
+ * return: NULL error or not found, !=NULL valid element
+ */
+inline ait_val_t *io_findKeyHash(array_t * __restrict vars, const char * __restrict key);
+/*
+ * io_hashKeyVars() - Generate hash keys for variables
+ *
+ * @vars = Variables
+ * return -1 error or 0 ok
+ */
+inline int io_hashKeyVars(array_t * __restrict vars);
 
 
 /*