--- libaitio/inc/aitio.h	2012/07/22 12:23:04	1.20.2.3
+++ libaitio/inc/aitio.h	2012/07/30 11:20:07	1.22.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.20.2.3 2012/07/22 12:23:04 misho Exp $
+* $Id: aitio.h,v 1.22.2.5 2012/07/30 11:20:07 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -75,6 +75,15 @@ SUCH DAMAGE.
 #ifndef be64toh
 #define be64toh		betoh64
 #endif
+#ifndef le16toh
+#define le16toh		letoh16
+#endif
+#ifndef le32toh
+#define le32toh		letoh32
+#endif
+#ifndef le64toh
+#define le64toh		letoh64
+#endif
 
 #define IO_SYSM		0
 #define IO_MPOOL	1
@@ -219,11 +228,22 @@ typedef struct {
 							strlcat((char*) __val->val.string, (_v), \
 									AIT_LEN(__val)); \
 						} } while (0)
+#define AIT_SET_STRCPY(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
+						assert(AIT_TYPE(__val) == string); \
+						void *__p = io_realloc(__val->val.string, \
+								strlen((_v)) + 1); \
+						if (__p) { \
+							__val->val.string = __p; \
+							AIT_LEN(__val) = strlen((_v)) + 1; \
+							strlcpy((char*) __val->val.string, (_v), \
+									AIT_LEN(__val)); \
+						} } while (0)
 #define AIT_SET_BLOB(_vl, _n, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = blob; __val->val.blob = _n; \
 						AIT_LEN(__val) = _len; } while (0)
 #define AIT_SET_BLOB2(_vl, _bv)		do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
-						__val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \
+						__val->val_type = blob; AIT_LEN(__val) = \
+							(_bv)->blob_len; \
 						__val->val.blob = (_bv)->blob_var; } while (0)
 #define AIT_NEW_BLOB(_vl, _len)		AIT_SET_BLOB((_vl), 0, _len)
 
@@ -261,10 +281,13 @@ typedef struct {
 #define AIT_COPY_VAL(_vl, _v)		do { memcpy((_vl), (_v), sizeof(ait_val_t)); \
 						switch (AIT_TYPE((_vl))) { \
 							case buffer: \
-								AIT_SET_BUF((_vl), AIT_GET_BUF((_v)), AIT_LEN((_v))); \
+								AIT_SET_BUF((_vl), \
+										AIT_GET_BUF((_v)), \
+										AIT_LEN((_v))); \
 								break; \
 							case string: \
-								AIT_SET_STR((_vl), AIT_GET_STR((_v))); \
+								AIT_SET_STR((_vl), \
+										AIT_GET_STR((_v))); \
 								break; \
 							default: \
 								break; \
@@ -272,10 +295,15 @@ typedef struct {
 					} while (0)
 #define AIT_COPY_VAL2(_vl, _v)		do { AIT_COPY_VAL((_vl), (_v)); \
 						if (AIT_TYPE((_vl)) == data) \
-							AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), AIT_LEN((_v))); \
+							AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), \
+									AIT_LEN((_v))); \
 					} while (0)
 
 #define AIT_INIT_VAL(_vl)		(memset((_vl), 0, sizeof(ait_val_t)))
+#define AIT_INIT_VAL2(_vl, _t)		do { \
+						AIT_INIT_VAL((_vl)); \
+						(_vl)->val_type = _t; \
+					} while (0)
 					/* 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)) { \
@@ -299,6 +327,23 @@ typedef struct {
 						AIT_LEN(__val) = 0; \
 						AIT_KEY(__val) = 0; \
 					} while (0)
+#define AIT_ZERO_VAL(_vl)		do { ait_val_t *__val = (_vl); assert(__val); \
+						switch (AIT_TYPE(__val)) { \
+							case buffer: \
+							case string: \
+								memset(__val->val.buffer, 0, \
+										AIT_LEN(__val)); \
+								break; \
+							case data: \
+								memset(__val->val_data, 0, \
+										AIT_LEN(__val)); \
+								break; \
+							default: \
+								__val->val.net = 0LL; \
+								break; \
+						} \
+						AIT_KEY(__val) = 0; \
+					} while (0)
 
 struct io_ether_addr {
 	u_int8_t ether_addr_octet[6];
@@ -313,6 +358,7 @@ typedef union {
 	struct sockaddr_in6	sin6;
 	struct sockaddr_dl	sdl;
 } io_sockaddr_t;
+#define IO_SOCKADDR_INIT	{ .ss = { 0 } }
 
 
 #define io_align(x, a)		(((x) + (a)) & ~(a))
@@ -788,6 +834,17 @@ int io_arrayMake(char * __restrict psArgs, int nargs, 
 */
 int io_MakeAV(const char * __restrict csArgs, const char *csDelim, 
 		char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);
+/*
+ * io_MakeAV2() Parse and make attribute/value pair over input string
+ *
+ * @csArgs = Input argument line, will be modified!
+ * @csDelim = Delimiter for separate
+ * @psAttr = Output Attribute
+ * @psValue = Output Value, if ==NULL this element not present value or not wanted for return
+ * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
+*/
+int io_MakeAV2(char * __restrict psArgs, const char *csDelim, 
+		char ** __restrict psAttr, char ** __restrict psValue);
 
 /*
  * io_sarrInit() - Create and initialize dynamic split-order array