--- libaitrpc/inc/aitrpc.h	2013/08/21 22:31:45	1.17.4.1
+++ libaitrpc/inc/aitrpc.h	2014/03/27 23:11:05	1.23.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.17.4.1 2013/08/21 22:31:45 misho Exp $
+* $Id: aitrpc.h,v 1.23.4.2 2014/03/27 23:11:05 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -144,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 */
 
@@ -246,7 +247,11 @@ typedef struct {
  */
 typedef int (*rpc_callback_t)(rpc_cli_t *, struct tagRPCCall *, array_t *);
 
+#define RPC_CALL_DEFINE(x)	int (x)(rpc_cli_t*, struct tagRPCCall*, array_t*)
+#define RPC_CALL_ARGS(arg1, arg2, arg3)	rpc_cli_t* arg1, struct tagRPCCall* arg2, array_t* arg3
+#define RPC_CALL_STDARGS	RPC_CALL_ARGS(cli, rpc, iv)
 
+
 /* ----------------------------------------------------------------------- */
 
 /* Error support functions */
@@ -261,6 +266,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, 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);
+/*
+ * 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, 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);
+
+/*
  * rpc_chkPktSession() - Check RPC session
  *
  * @p = packet session
@@ -337,6 +369,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
@@ -541,6 +574,13 @@ int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_va
 rpc_cli_t *rpc_cli_openClient(unsigned char InstID, int netBuf, 
 		const char *csHost, unsigned short Port, int proto);
 /*
+ * rpc_cli_reconnectClient() - Reconnecting client to RPC server
+ *
+ * @cli = RPC Client session
+ * return: -1 error or 0 ok
+ */
+int rpc_cli_reconnectClient(rpc_cli_t * __restrict cli);
+/*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *
  * @cli = RPC Client session
@@ -555,7 +595,7 @@ void rpc_cli_closeClient(rpc_cli_t ** __restrict cli);
  * @sa = Server address
  * @pkt = RPC packet
  * @len = Length of packet
- * return: -1 error or !=-1 sended bytes
+ * return: -1 error, 0  EOF or >0 sended bytes
  */
 int rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, 
 		ait_val_t * __restrict pkt, int len);
@@ -566,7 +606,7 @@ int rpc_pkt_Send(int sock, int type, sockaddr_t * __re
  * @type = Type of socket
  * @sa = Server address
  * @pkt = RPC packet
- * return: -1 error or !=-1 sended bytes
+ * 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);
@@ -603,7 +643,7 @@ int rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_ses
  * @tag = Function tag for execution
  * @in_vars = IN function argument array of values, may be NULL
  * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars()
- * return: -1 error or != -1 ok result
+ * return: -1 error, 0 ok result or 1 closed rpc connection
  */
 int rpc_cli_execCall(rpc_cli_t *cli, int noreply, unsigned short tag, 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars);