--- libaitrpc/inc/aitrpc.h	2015/01/18 01:03:49	1.25.2.4
+++ libaitrpc/inc/aitrpc.h	2015/06/29 22:29:25	1.27.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.25.2.4 2015/01/18 01:03:49 misho Exp $
+* $Id: aitrpc.h,v 1.27.2.1 2015/06/29 22:29:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -62,7 +62,7 @@ SUCH DAMAGE.
 #include <aitsched.h>
 
 
-#define RPC_VERSION		7
+#define RPC_VERSION		9
 #define RPC_DEFPORT		2611
 
 /* Additional ELWIX RPC supporting protocols */
@@ -83,6 +83,11 @@ SUCH DAMAGE.
 #define RPC_REPLY		0x0
 #define RPC_NOREPLY		0x1
 
+/* RPC call I/O direction */
+
+#define RPC_REQ			0x0
+#define RPC_ACK			0x1
+
 /* RPC builtin registed calls */
 
 #define CALL_TAG_MAX		65535
@@ -141,6 +146,7 @@ struct tagRPCCall {
 	rpc_sess_t	call_session;
 
 	uint32_t	call_len;
+	uint32_t	call_seq;
 	uint16_t	call_crc;
 
 	union {
@@ -153,8 +159,9 @@ struct tagRPCCall {
 		}	call_rep;
 	};
 
+	uint8_t		call_io;
 	uint16_t	call_tag;
-	uint16_t	call_argc;
+	uint8_t		call_argc;
 	ait_val_t	call_argv[0];
 } __packed;			/* size == 20 bytes */
 #define RPC_CHK_NOREPLY(x)	(ntohl((u_long) (x)->call_req.flags) & RPC_NOREPLY)
@@ -285,12 +292,11 @@ void rpc_SetErr(int eno, char *estr, ...);
  * @type = type of socket
  * @flags = receive flags
  * @sa = check client address, if you use udp protocol
- * @buf = buffer
- * @blen = buffer length
+ * @pkt = RPC packet
  * return: -1 error, 0 EOF or or >0 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);
+		ait_val_t * __restrict pkt);
 /*
  * rpc_Write() - RPC write operation
  *
@@ -298,14 +304,21 @@ ssize_t rpc_Read(int sock, int type, int flags, sockad
  * @type = type of socket
  * @flags = send flags
  * @sa = send to client address, if you use udp protocol
- * @buf = buffer
- * @blen = buffer length
+ * @pkt = RPC packet
+ * @blen = write length
  * return: -1 error, 0 EOF or >0 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);
+		ait_val_t * __restrict pkt, size_t blen);
 
 /*
+ * rpc_pktFreeSpace() - Get free space for payload into RPC packet
+ *
+ * @c = RPC client 
+ * return: remains free bytes from packet
+ */
+size_t rpc_pktFreeSpace(rpc_cli_t * __restrict c);
+/*
  * rpc_chkPktSession() - Check RPC session
  *
  * @p = packet session
@@ -643,10 +656,11 @@ int rpc_pkt_Send(int sock, int type, sockaddr_t * __re
  * @type = Type of socket
  * @sa = Server address
  * @pkt = RPC packet
+ * @seq = Signed packet with seq.no
  * return: -1 error, 0 EOF or >0 received bytes
  */
 int rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, 
-		ait_val_t * __restrict pkt);
+		ait_val_t * __restrict pkt, int seq);
 /*
  * rpc_pkt_Request() - Build RPC Request packet
  *
@@ -656,16 +670,17 @@ int rpc_pkt_Receive(int sock, int type, sockaddr_t * _
  * @vars = Function argument array of values, may be NULL
  * @noreply = We not want RPC reply
  * @nocrc = Without CRC calculation
+ * @seq = Sign packet with seq.no
  * return: -1 error or != -1 prepared bytes into packet
  */
 int rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, 
-		unsigned short tag, array_t * __restrict vars, int noreply, int nocrc);
+		unsigned short tag, array_t * __restrict vars, int noreply, int nocrc, int seq);
 /*
  * rpc_pkt_Replay() - Decode RPC Replay packet
  *
  * @pkt = Packet buffer
  * @sess = RPC session info, if =NULL don't check session
- * @tag = Function tag
+ * @tag = Function tag, if =CALL_TAG_MAX don't check tag
  * @vars = Function argument array of values, may be NULL
  * @nocrc = Without CRC calculation
  * return: -1 error or != -1 return value from function