--- libaitrpc/inc/aitrpc.h	2012/03/13 17:10:13	1.5.2.4
+++ libaitrpc/inc/aitrpc.h	2012/05/11 08:46:41	1.7.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.5.2.4 2012/03/13 17:10:13 misho Exp $
+* $Id: aitrpc.h,v 1.7.2.1 2012/05/11 08:46:41 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -86,7 +86,7 @@ SUCH DAMAGE.
 
 typedef enum {
 	disable, enable, running, kill, 	/* for blob.state */
-	ok, error, 				/* for blob reply */
+	ok, error, no, 				/* for blob reply */
 	get, set, unset				/* for blob request */
 } cmd_type_t;
 
@@ -140,6 +140,8 @@ typedef struct tagRPCFunc {
 struct tagRPCCall {
 	rpc_sess_t	call_session;
 
+	uint16_t	call_len;
+
 	uint16_t	call_tag;
 	uint32_t	call_hash;
 	uint16_t	call_argc;
@@ -165,6 +167,8 @@ struct tagBLOBHdr {
 	uint32_t	hdr_var;
 	uint32_t	hdr_len;
 	uint32_t	hdr_ret;
+	uint16_t	hdr_crc;
+	uint8_t		hdr_pad;
 } __packed;
 
 /* Network RPC client & server elements */
@@ -199,12 +203,11 @@ typedef struct {
 
 	rpc_func_t		*srv_funcs;	// registered functions list
 
-	pthread_mutex_t		srv_mtx;
 	cmd_type_t		srv_kill;
 
 	struct {
 		cmd_type_t	state;		// BLOB server state: ==0 disable | !=0 enable
-		char		*dir;
+		ait_val_t	dir;
 
 		rpc_cli_t	server;		// BLOB server socket
 		rpc_cli_t	*clients;	// connected blob client sockets
@@ -496,10 +499,21 @@ int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va
  * @data = BLOB data, must be free after use!
  * return: -1 error, 0 ok, >0 remote error
  */
-inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data);
+inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, 
+		void ** __restrict data);
 
 
+/*
+ * rpc_calcHashes() - Calculate hashes for RPC call
+ *
+ * @func = function
+ * @csModule = Module name, if NULL self binary
+ * @csFunc = Function name
+ * return: -1 error or 0 ok
+ */
+int rpc_calcHashes(rpc_func_t * __restrict func, const char *csModule, const char *csFunc);
 
+
 /* RPC Client side functions */
 
 /*
@@ -508,13 +522,15 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli,
  * @ProgID = ProgramID for RPC session request
  * @ProcID = ProcessID for RPC session request
  * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
+ * @Timeout = RPC timeout in seconds, if =0 set default RPC timeout
  * @family = Family socket type, AF_INET or AF_INET6
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to RPC server established
  */
-rpc_cli_t *rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, 
-		u_short family, const char *csHost, u_short Port);
+rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned int ProcID, int netBuf, 
+		unsigned char Timeout, unsigned short family, 
+		const char *csHost, unsigned short Port);
 /*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *
@@ -526,13 +542,14 @@ void rpc_cli_closeClient(rpc_cli_t * __restrict cli);
  * rpc_cli_execCall() - Execute RPC call
  *
  * @cli = RPC Client session
+ * @noreply = We not want RPC reply
  * @csModule = Module name, if NULL self binary
  * @csFunc = Function name for execute
  * @in_vars = IN RPC call array of rpc values
  * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals()
  * return: -1 error or != -1 ok result
  */
-int rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, 
+int rpc_cli_execCall(rpc_cli_t *cli, int noreply, const char *csModule, const char *csFunc, 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars);