--- libaitrpc/inc/aitrpc.h	2010/06/18 01:48:06	1.1.1.1
+++ libaitrpc/inc/aitrpc.h	2010/06/23 07:47:25	1.1.1.1.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.1.1.1 2010/06/18 01:48:06 misho Exp $
+* $Id: aitrpc.h,v 1.1.1.1.2.3 2010/06/23 07:47:25 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITRPC_H
@@ -27,6 +27,7 @@
 
 /* RPC builtin registed calls */
 
+#define CALL_SRVSHUTDOWN	"rpcServerShutdown"
 #define CALL_SRVCLIENTS		"rpcServerClients"
 #define CALL_SRVCALLS		"rpcServerCalls"
 #define CALL_SRVSESSIONS	"rpcServerSessions"
@@ -36,7 +37,7 @@
 
 typedef enum {
 	empty, 				// empty -> variable is not set
-	buffer, string, array, 		// buffer -> uint8_t*; string -> int8_t*; array -> char**;
+	buffer, string, blob, 		// buffer -> uint8_t*; string -> int8_t*; blob -> void*(+socket);
 	size, offset, datetime, 	// size -> size_t; offset -> off_t; datetime -> time_t;
 	real, bigreal, 			// real -> float; bigreal -> double;
 	u8, u16, u32, u64,		// unsigned integers ...
@@ -51,7 +52,7 @@ typedef struct {
 	union {
 		uint8_t		*buffer;
 		int8_t		*string;
-		int8_t		**array;
+		void		*blob;
 		size_t		size;
 		off_t		offset;
 		time_t		datetime;
@@ -70,11 +71,12 @@ typedef struct {
 
 #define RPC_TYPE_VAL(vl)		((vl)->val_type)
 #define RPC_LEN_VAL(vl)			((vl)->val_len)
+#define RPC_BLOB_CHUNKS(vl, n)		((vl)->val_len / (n) + ((vl)->val_len % (n)) ? 1 : 0)
 #define RPC_EMPTY_VAL(vl)		((vl)->val_type == empty)
 
 #define RPC_GET_BUF(vl)			(assert((vl)->val_type == buffer), (vl)->val.buffer)
 #define RPC_GET_STR(vl)			(assert((vl)->val_type == string), (vl)->val.string)
-#define RPC_GET_ARRAY(vl)		(assert((vl)->val_type == array), (vl)->val.array)
+#define RPC_GET_BLOB(vl)		(assert((vl)->val_type == blob), (vl)->val.blob)
 #define RPC_GET_SIZE(vl)		(assert((vl)->val_type == size), (vl)->val.size)
 #define RPC_GET_OFF(vl)			(assert((vl)->val_type == offset), (vl)->val.offset)
 #define RPC_GET_TIME(vl)		(assert((vl)->val_type == datetime), (vl)->val.datetime)
@@ -98,10 +100,10 @@ typedef struct {
 						if (val->val.string) { \
 							val->val_type = string; val->val_len = strlen(v) + 1; \
 						} } while (0)
-#define RPC_SET_ARRAY(vl, v, n, l)	do { rpc_val_t *val = (vl); assert(val); val->val.array = calloc(n, l); \
-						if (val->val.array) { \
-							val->val_type = array; val->val_len = n * l; \
-							memcpy(val->val.array, v, val->val_len); \
+#define RPC_SET_BLOB(vl, v, l)		do { rpc_val_t *val = (vl); assert(val); val->val.blob = realloc(val->val.blob, l); \
+						if (val->val.blob) { \
+							val->val_type = blob; val->val_len = l; \
+							memcpy(val->val.blob, v, l); \
 						} } while (0)
 #define RPC_SET_SIZE(vl, v)		do { rpc_val_t *val = (vl); assert(val); val->val_type = size; val->val.size = v; \
 						val->val_len = sizeof(size_t); } while (0)
@@ -147,12 +149,18 @@ typedef struct {
 					} while (0)
 
 
-#define RPC_CALLBACK_CHECK_ARGS(f, n)	do { \
+#define RPC_CALLBACK_CHK_NUM_ARGS(f, n)	do { \
 						if (f->func_args != n) { \
 							rpc_SetErr(22, "Error:: different number of arguments!\n"); \
 							return -1; \
 						} \
-					} while(0)
+					} while (0)
+#define RPC_CALLBACK_CHECK_INPUT(s, f)	do { \
+						if (!s || !f) { \
+							rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \
+							return -1; \
+						} \
+					} while (0)
 
 
 /* RPC session identification */