--- libaitrpc/inc/aitrpc.h	2013/07/15 13:53:09	1.15.2.1
+++ libaitrpc/inc/aitrpc.h	2013/09/05 00:43:04	1.20
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.15.2.1 2013/07/15 13:53:09 misho Exp $
+* $Id: aitrpc.h,v 1.20 2013/09/05 00:43:04 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -62,7 +62,7 @@ SUCH DAMAGE.
 #include <aitsched.h>
 
 
-#define RPC_VERSION		6
+#define RPC_VERSION		7
 #define RPC_DEFPORT		2611
 
 /* RPC call request flags */
@@ -85,6 +85,8 @@ SUCH DAMAGE.
 #define CALL_BLOBCLIENTS	65528
 #define CALL_BLOBVARS		65527
 
+/* RPC signals */
+#define SIGFBLOB		54
 
 /* RPC types */
 
@@ -125,8 +127,7 @@ typedef struct {
 struct tagRPCCall {
 	rpc_sess_t	call_session;
 
-	uint16_t	call_seq;
-	uint16_t	call_len;
+	uint32_t	call_len;
 	uint16_t	call_crc;
 
 	union {
@@ -143,7 +144,8 @@ struct tagRPCCall {
 	uint16_t	call_argc;
 	ait_val_t	call_argv[0];
 } __packed;			/* size == 20 bytes */
-#define RPC_CHK_NOREPLY(x)	((x)->call_req.flags & RPC_NOREPLY)
+#define RPC_CHK_NOREPLY(x)	(ntohl((u_long) (x)->call_req.flags) & RPC_NOREPLY)
+#define RPC_SET_ERRNO(x, _v)	((x)->call_rep.eno = htonl((_v)))
 
 /* Network BLOB packet - Header */
 
@@ -254,9 +256,39 @@ typedef int (*rpc_callback_t)(rpc_cli_t *, struct tagR
 int rpc_GetErrno();
 // rpc_GetError() Get error text of last operation
 const char *rpc_GetError();
+// rpc_SetErr() Set error to variables for internal use!!!
+void rpc_SetErr(int eno, char *estr, ...);
 
 
+
 /*
+ * rpc_Read() - RPC read operation
+ *
+ * @sock = socket
+ * @type = type of socket
+ * @flags = receive flags
+ * @sa = check client address, if you use udp protocol
+ * @buf = buffer
+ * @blen = buffer length
+ * return: -1 error or >-1 readed bytes into buffer
+ */
+ssize_t rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa, 
+		unsigned char * __restrict buf, size_t blen);
+/*
+ * rpc_Write() - RPC write operation
+ *
+ * @sock = socket
+ * @type = type of socket
+ * @flags = send flags
+ * @sa = send to client address, if you use udp protocol
+ * @buf = buffer
+ * @blen = buffer length
+ * return: -1 error or >-1 written bytes into buffer
+ */
+ssize_t rpc_Write(int sock, int type, int flags, sockaddr_t * __restrict sa, 
+		unsigned char * __restrict buf, size_t blen);
+
+/*
  * rpc_chkPktSession() - Check RPC session
  *
  * @p = packet session
@@ -409,9 +441,10 @@ int rpc_srv_execCall(rpc_cli_t * __restrict cli, struc
  *
  * @srv = RPC Server instance
  * @len = BLOB length object
+ * @tout = BLOB live timeout in seconds
  * return: NULL error or !=NULL allocated BLOB object
  */
-rpc_blob_t *rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len);
+rpc_blob_t *rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len, int tout);
 /*
  * rpc_srv_blobMap() - Map blob to memory region 
  *
@@ -441,9 +474,10 @@ int rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_b
  *
  * @srv = RPC Server instance
  * @len = BLOB length
+ * @tout = BLOB live timeout in seconds
  * return: NULL error or new registered BLOB
  */
-rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len);
+rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len, int tout);
 /*
  * rpc_srv_unregisterBLOB() - Unregister BLOB from server
  *
@@ -486,11 +520,11 @@ int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_b
  * @cli = Client instance
  * @var = BLOB variable
  * @data = BLOB data
- * @tout = BLOB live on server timeout in seconds, if =NULL default timeout
+ * @tout = BLOB live on server timeout in seconds, if =0 default timeout
  * return: -1 error, 0 ok, 1 remote error
  */
 int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, 
-		void * __restrict data, int * __restrict tout);
+		void * __restrict data, int tout);
 /*
  * rpc_cli_recvBLOB() - Receive BLOB from server
  *