--- libaitio/inc/aitio.h	2012/07/30 13:49:04	1.22.2.6
+++ libaitio/inc/aitio.h	2012/07/31 15:19:11	1.22.2.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.6 2012/07/30 13:49:04 misho Exp $
+* $Id: aitio.h,v 1.22.2.13 2012/07/31 15:19:11 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -186,8 +186,8 @@ typedef struct {
 							__val->val_type = data; AIT_LEN(__val) = _len; \
 							if ((_p)) \
 								memcpy(__val->val_data, (_p), _len); \
+							(_vl) = __val; \
 						} \
-						(_vl) = __val; \
 					} while (0);
 #define AIT_SET_PTR(_vl, _p, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = ptr; __val->val.ptr = _p; \
@@ -213,21 +213,40 @@ typedef struct {
 								memset(__val->val.buffer, 0, _len); \
 						} } while (0)
 #define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
-						__val->val.string = (int8_t*) io_strdup((_v)); \
+						__val->val_type = string; \
+						if ((_v)) { \
+							__val->val.string = (int8_t*) io_strdup((_v)); \
+							AIT_LEN(__val) = strlen((const char*) \
+									__val->val.string) + 1; \
+						} else { \
+							__val->val.string = NULL; \
+							AIT_LEN(__val) = 0; \
+						} \
+					} while (0)
+#define AIT_SET_STRSIZ(_vl, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+						__val->val.string = (int8_t*) io_malloc(_len); \
 						if (__val->val.string) { \
-							__val->val_type = string; \
-							AIT_LEN(__val) = strlen((_v)) + 1; \
-						} } while (0)
+							__val->val_type = string; AIT_LEN(__val) = _len; \
+							memset(__val->val.string, 0, _len); \
+						} \
+					} while (0)
 #define AIT_SET_STRCAT(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						assert(AIT_TYPE(__val) == string); \
+						if (!__val->val.string) \
+							AIT_LEN(__val) = 1; \
 						void *__p = io_realloc(__val->val.string, \
 								AIT_LEN(__val) + strlen((_v))); \
 						if (__p) { \
-							__val->val.string = __p; \
 							AIT_LEN(__val) += strlen((_v)); \
+							if (!__val->val.string) \
+								memset(__p, 0, AIT_LEN(__val)); \
+							__val->val.string = __p; \
 							strlcat((char*) __val->val.string, (_v), \
 									AIT_LEN(__val)); \
-						} } while (0)
+						} else \
+							if (!__val->val.string) \
+								AIT_LEN(__val) = 0; \
+					} 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, \
@@ -238,6 +257,14 @@ typedef struct {
 							strlcpy((char*) __val->val.string, (_v), \
 									AIT_LEN(__val)); \
 						} } while (0)
+#define AIT_SET_STRLCPY(_vl, _v, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+						assert(AIT_TYPE(__val) == string); \
+						void *__p = io_realloc(__val->val.string, _len); \
+						if (__p) { \
+							__val->val.string = __p; AIT_LEN(__val) = _len; \
+							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)
@@ -335,16 +362,16 @@ typedef struct {
 									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)
+#define AIT_ZERO_VAL2(_vl)		do { assert((_vl)); \
+						if (AIT_TYPE((_vl)) == data) \
+							memset((_vl)->val_data, 0, AIT_LEN((_vl))); \
+					} while (0)
 
 struct io_ether_addr {
 	u_int8_t ether_addr_octet[6];
@@ -496,6 +523,15 @@ inline ait_val_t *io_allocVar(void);
  * return: none
  */
 inline void io_freeVar(ait_val_t ** __restrict val);
+/*
+ * io_makeVar() - Allocate memory and fill variable
+ *
+ * @type = type of variable
+ * @... = arg1 is value of variable
+ * @... = arg2 is length of variabla. Not required for numbers and strings!
+ * return: NULL error or new variable, after use free variable with io_freeVar()
+ */
+ait_val_t *io_makeVar(ait_type_t type, ...);
 /*
  * io_allocVars() - Allocate ait_val_t array
  *