--- libaitio/inc/aitio.h	2011/12/13 10:40:05	1.13.2.3
+++ libaitio/inc/aitio.h	2012/01/05 08:55:38	1.13.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.13.2.3 2011/12/13 10:40:05 misho Exp $
+* $Id: aitio.h,v 1.13.2.8 2012/01/05 08:55:38 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -115,8 +115,8 @@ struct tagReqXML {
 /* AIT RPC variables and managment */
 
 typedef enum {
-	empty, 				/* empty -> variable is not set */
-	buffer, string, blob, 		/* buffer -> uint8_t*; string -> int8_t*; blob -> void*(+socket); */
+	empty, ptr, 			/* empty -> variable is not set; ptr -> void* */
+	buffer, string, blob, 		/* buffer -> uint8_t*; string -> int8_t*; blob -> uint32_t blobID(+socket); */
 	f32, f64, 			/* float -> f32; double -> f64 */
 	u8, u16, u32, u64,		/* unsigned integers ... */
 	i8, i16, i32, i64,		/* integers ... */
@@ -129,6 +129,7 @@ typedef struct {
 	union {
 		uint64_t	net;
 
+		void		*ptr;
 		uint8_t		*buffer;
 		int8_t		*string;
 		uint32_t	blob;
@@ -150,6 +151,7 @@ typedef struct {
 #define AIT_BLOB_CHUNKS(_vl, _n)	(assert((_vl)), AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0)
 #define AIT_ISEMPTY(_vl)		(assert((_vl)), AIT_TYPE((_vl)) == empty)
 
+#define AIT_GET_PTR(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == ptr), (_vl)->val.ptr)
 #define AIT_GET_BUF(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer)
 #define AIT_GET_STR(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == string), (_vl)->val.string)
 #define AIT_GET_BLOB(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob)
@@ -164,18 +166,29 @@ typedef struct {
 #define AIT_GET_F32(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)
 #define AIT_GET_F64(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)
 
-#define AIT_SET_BUF(_vl, _v, _len)	do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
+#define AIT_SET_PTR(_vl, _p, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+						__val->val_type = ptr; AIT_LEN(__val) = _len; \
+						__val->val.ptr = _p; } while (0)
+#define AIT_SET_BUF(_vl, _v, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val.buffer = malloc(_len); \
 						if (__val->val.buffer) { \
 							__val->val_type = buffer; AIT_LEN(__val) = _len; \
 							memcpy(__val->val.buffer, (_v), _len); \
 						} } while (0)
-#define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
+#define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val.string = (int8_t*) strdup((_v)); \
 						if (__val->val.string) { \
 							__val->val_type = string; \
 							AIT_LEN(__val) = strlen((_v)) + 1; \
 						} } while (0)
+#define AIT_SET_STRCAT(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
+						assert(AIT_TYPE(__val) == string); \
+						void *__p = realloc(AIT_LEN(__val) + strlen((_v))); \
+						if (__p) { \
+							__val->val.string = __p; \
+							AIT_LEN(__val) += strlen((_v)); \
+							strlcat(__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; AIT_LEN(__val) = _len; \
 						__val->val.blob = _n; } while (0)
@@ -216,7 +229,7 @@ typedef struct {
 						AIT_LEN(__val) = sizeof(double); } while (0)
 
 					/* if attribute zeroCopy is set not execute free() */
-#define AIT_FREE_VAL(_vl)		do { ait_val_t *__val = (_vl); assert(__val); \
+#define AIT_FREE_VAL(_vl)		do { ait_val_t *__val = (ait_val_t*) (_vl); assert(__val); \
 						switch (__val->val_type) { \
 							case buffer: \
 								if (__val->val.buffer) { \
@@ -343,7 +356,7 @@ inline ait_val_t *io_allocVar(void);
  * @val = Variable
  * return: none
  */
-inline void io_freeVar(ait_val_t ** __restrict val);
+inline void io_freeVar(ait_val_t * __restrict val);
 /*
  * io_allocVars() Allocate ait_val_t array
  * @varnum = Number of variables
@@ -790,11 +803,13 @@ inline int io_rwrite(int fd, void * __restrict buf, si
 /* Debug helper macros */
 extern int io_Debug;
 
+#define io_enableDEBUG		int io_Debug
 #define io_initDebug(x)		(io_Debug = (x))
 #define io_incDebug		(io_Debug++)
 #define io_decDebug		(io_Debug--)
 
 /* Debug macros */
+#define ioVERBOSE(x)		if ((x) <= io_Debug)
 #define ioTRACE(x)		if ((x) <= io_Debug) \
 					   syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__)
 #define ioDEBUG(x, fmt, ...)	do { \