--- libaitrpc/inc/aitrpc.h	2010/06/23 15:07:15	1.1.1.1.2.6
+++ libaitrpc/inc/aitrpc.h	2010/06/24 11:01:46	1.1.1.1.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.1.1.1.2.6 2010/06/23 15:07:15 misho Exp $
+* $Id: aitrpc.h,v 1.1.1.1.2.10 2010/06/24 11:01:46 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITRPC_H
@@ -19,8 +19,6 @@
 #include <sys/socket.h>
 
 
-#define STRSIZ			256
-
 #define RPC_VERSION		1
 #define RPC_DEFPORT		2611
 
@@ -49,8 +47,9 @@ typedef enum {
 } rpc_type_t;
 
 typedef enum {
-	disable, enable,
-	get, set, unset
+	disable, enable, 		// for blob.state
+	ok, error, 			// for blob reply
+	get, set, unset			// for blob request
 } cmd_type_t;
 
 /* RPC value */
@@ -109,11 +108,8 @@ typedef struct {
 						if (val->val.string) { \
 							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.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_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)
 #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,10 +146,6 @@ typedef struct {
 							free(val->val.string); \
 							val->val.string = NULL; \
 						} \
-						if (val->val_type == blob && val->val.blob) { \
-							free(val->val.blob); \
-							val->val.blob = NULL; \
-						} \
 						val->val_type = val->val_len = 0; \
 					} while (0)
 
@@ -240,8 +232,6 @@ typedef struct {
 
 // BLOB registration element!
 typedef struct tagBLOB {
-	rpc_cli_t	*blob_cli;	// from RPC client
-
 	uint32_t	blob_var;
 
 	size_t		blob_len;	// size of allocated BLOB data
@@ -422,6 +412,65 @@ inline int rpc_srv_delValsCall(rpc_func_t * __restrict
  * return: -1 error, !=-1 Number of returned variables
  */
 inline int rpc_srv_getValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict vals);
+
+
+/*
+ * rpc_srv_blobCreate() Create map blob to memory region and return object
+ * @srv = RPC Server instance
+ * @len = BLOB length object
+ * return: NULL error or !=NULL allocated BLOB object
+ */
+inline rpc_blob_t *rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len);
+/*
+ * rpc_srv_blobMap() Map blob to memory region 
+ * @srv = RPC Server instance
+ * @blob = Map to this BLOB element
+ * return: -1 error or 0 ok
+ */
+inline int rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob);
+/*
+ * rpc_srv_blobUnmap() Unmap blob memory region 
+ * @blob = Mapped BLOB element
+ * return: none
+ */
+inline void rpc_srv_blobUnmap(rpc_blob_t * __restrict blob);
+/*
+ * rpc_srv_blobFree() Free blob from disk & memory
+ * @srv = RPC Server instance
+ * @blob = Mapped BLOB element
+ * return: -1 error or 0 ok
+ */
+inline int rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob);
+
+/*
+ * rpc_srv_registerBLOB() Register new BLOB to server
+ * @srv = RPC Server instance
+ * @len = BLOB length
+ * return: -1 error or 0 register ok
+ */
+rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len);
+/*
+ * rpc_srv_unregisterBLOB() Unregister BLOB from server
+ * @srv = RPC Server instance
+ * @var = BLOB Variable for unregister
+ * return: -1 error, 0 not found call, 1 unregister ok
+ */
+int rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uint32_t var);
+
+/*
+ * rpc_srv_sendBLOB() Send mapped BLOB to client
+ * @cli = Client instance
+ * @blob = Mapped BLOB element
+ * return: -1 error, 0 ok
+ */
+int rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob);
+/*
+ * rpc_srv_recvBLOB() Receive BLOB from client
+ * @cli = Client instance
+ * @blob = Mapped BLOB element
+ * return: -1 error, 0 ok, >0 unreceived data from client, may be error?
+ */
+int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob);
 
 
 /* RPC Client side functions */