--- libaitrpc/inc/aitrpc.h	2010/06/24 15:01:19	1.1.1.1.2.11
+++ libaitrpc/inc/aitrpc.h	2010/07/08 07:16:36	1.1.1.1.2.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.1.1.1.2.11 2010/06/24 15:01:19 misho Exp $
+* $Id: aitrpc.h,v 1.1.1.1.2.18 2010/07/08 07:16:36 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITRPC_H
@@ -28,6 +28,7 @@
 #define CALL_BLOBSHUTDOWN	"rpcBLOBServerShutdown"
 #define CALL_BLOBCLIENTS	"rpcBLOBServerClients"
 #define CALL_BLOBVARS		"rpcBLOBServerVars"
+#define CALL_BLOBSTATE		"rpcBLOBServerState"
 
 #define CALL_SRVSHUTDOWN	"rpcServerShutdown"
 #define CALL_SRVCLIENTS		"rpcServerClients"
@@ -60,7 +61,7 @@ typedef struct {
 	union {
 		uint8_t		*buffer;
 		int8_t		*string;
-		void		*blob;
+		uint32_t	blob;
 		size_t		size;
 		off_t		offset;
 		time_t		datetime;
@@ -109,7 +110,9 @@ typedef struct {
 							val->val_type = string; val->val_len = strlen(v) + 1; \
 						} } while (0)
 #define RPC_SET_BLOB(vl, v, l)		do { rpc_val_t *val = (vl); assert(val); val->val_type = blob; \
-						val->val.blob = (void*) v; val->val_len = l; } while (0)
+						val->val.blob = v; val->val_len = l; } while (0)
+#define RPC_SET_BLOB2(vl, b)		do { rpc_val_t *val = (vl); assert(val); assert(b); val->val_type = blob; \
+						val->val.blob = b->blob_var; val->val_len = b->blob_len; } 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)
 #define RPC_SET_OFF(vl, v)		do { rpc_val_t *val = (vl); assert(val); val->val_type = offset; val->val.offset = v; \
@@ -150,7 +153,7 @@ typedef struct {
 					} while (0)
 
 
-#define RPC_CALLBACK_CHK_NUM_ARGS(f, n)	do { \
+#define RPC_CALLBACK_CHK_RETARGS(f, n)	do { \
 						if (f->func_args != n) { \
 							rpc_SetErr(22, "Error:: different number of arguments!\n"); \
 							return -1; \
@@ -346,7 +349,7 @@ inline rpc_blob_t *rpc_srv_getBLOB(rpc_srv_t * __restr
  * @srv = RPC Server instance
  * @csModule = Module name, if NULL self binary
  * @csFunc = Function name
- * @args = Number of function arguments
+ * @args = Number of return function arguments, use for restriction case!
  * return: -1 error or 0 register ok
  */
 int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, 
@@ -463,7 +466,7 @@ inline int rpc_srv_blobFree(rpc_srv_t * __restrict srv
  * rpc_srv_registerBLOB() Register new BLOB to server
  * @srv = RPC Server instance
  * @len = BLOB length
- * return: -1 error or 0 register ok
+ * return: NULL error or new registered BLOB
  */
 rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len);
 /*
@@ -489,7 +492,24 @@ int rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_b
  */
 int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob);
 
+/*
+ * rpc_cli_sendBLOB() Send BLOB to server
+ * @cli = Client instance
+ * @var = BLOB variable
+ * @data = BLOB data
+ * return: -1 error, 0 ok, 1 remote error
+ */
+int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void * __restrict data);
+/*
+ * rpc_cli_recvBLOB() Receive BLOB from server
+ * @cli = Client instance
+ * @var = BLOB variable
+ * @data = BLOB data, must be free after use!
+ * return: -1 error, 0 ok, 1 remote error
+ */
+int rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data);
 
+
 /* RPC Client side functions */
 
 /*
@@ -529,6 +549,21 @@ int rpc_cli_execCall(rpc_cli_t *cli, const char *csMod
  * return: none
  */
 inline void rpc_cli_freeVals(int args, rpc_val_t *vals);
+
+
+/*
+ * rpc_cli_openBLOBClient() Connect to BLOB Server
+ * @rpccli = RPC Client session
+ * @Port = Port for bind server, if Port == 0 default port is selected
+ * return: NULL == error or !=NULL connection to BLOB server established
+ */
+rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port);
+/*
+ * rpc_cli_closeBLOBClient() Close connection to BLOB server and free resources
+ * @cli = BLOB Client session
+ * return: none
+ */
+void rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli);
 
 
 #endif