--- libaitrpc/inc/aitrpc.h	2013/08/06 21:45:01	1.16.2.1
+++ libaitrpc/inc/aitrpc.h	2013/11/22 13:41:33	1.21
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.16.2.1 2013/08/06 21:45:01 misho Exp $
+* $Id: aitrpc.h,v 1.21 2013/11/22 13:41:33 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 */
@@ -127,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 {
@@ -145,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 */
 
@@ -262,6 +262,33 @@ 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
@@ -338,6 +365,7 @@ int rpc_srv_loopServer(rpc_srv_t * __restrict srv);
 							else \
 								pthread_detach((_srv)->srv_tid); \
 						} } while (0)
+#define rpc_srv_killServer(_srv)	(assert((_srv)), (_srv)->srv_blob.kill = 1, (_srv)->srv_kill = 1)
 
 /*
  * rpc_srv_initBLOBServer() - Init & create BLOB Server