--- libaitrpc/src/cli.c	2013/04/02 15:32:03	1.14.2.2
+++ libaitrpc/src/cli.c	2013/08/21 15:28:15	1.16.6.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.14.2.2 2013/04/02 15:32:03 misho Exp $
+* $Id: cli.c,v 1.16.6.1 2013/08/21 15:28:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -71,6 +71,13 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 	} else
 		memcpy(cli, rpccli, sizeof(rpc_cli_t));
 
+	cli->cli_buf = ait_allocVars(1);
+	if (!cli->cli_buf) {
+		rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		e_free(cli);
+		return NULL;
+	}
+
 	memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(sockaddr_t));
 	switch (cli->cli_sa.sa.sa_family) {
 		case AF_INET:
@@ -89,8 +96,8 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 			return NULL;
 	}
 
-	AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf);
-	n = AIT_LEN(&cli->cli_buf);
+	AIT_COPY_VAL(array(cli->cli_buf, 0, ait_val_t*), array(rpccli->cli_buf, 0, ait_val_t*));
+	n = AIT_LEN(array(cli->cli_buf, 0, ait_val_t*));
 
 	/* connect to BLOB server */
 	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
@@ -137,7 +144,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
 	shutdown((*cli)->cli_sock, SHUT_RDWR);
 	close((*cli)->cli_sock);
 
-	AIT_FREE_VAL(&(*cli)->cli_buf);
+	ait_freeVars(&(*cli)->cli_buf);
 
 	e_free(*cli);
 	*cli = NULL;
@@ -198,9 +205,17 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 		((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID;
 	}
 
+	cli->cli_buf = ait_allocVars(2);
+	if (!cli->cli_buf) {
+		rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		e_free(cli->cli_parent);
+		e_free(cli);
+		return NULL;
+	} else
+		AIT_SET_BUFSIZ(array(cli->cli_buf, 0, ait_val_t*), 0, netBuf);
+
 	cli->cli_id = proto;
 	memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa);
-	AIT_SET_BUFSIZ(&cli->cli_buf, 0, netBuf);
 
 	/* connect to RPC server */
 	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0);
@@ -227,7 +242,7 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
 	return cli;
 err:
-	AIT_FREE_VAL(&cli->cli_buf);
+	ait_freeVars(&cli->cli_buf);
 	if (cli->cli_sock > 2)
 		close(cli->cli_sock);
 	e_free(cli->cli_parent);
@@ -251,7 +266,7 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
 		shutdown((*cli)->cli_sock, SHUT_RDWR);
 	close((*cli)->cli_sock);
 
-	AIT_FREE_VAL(&(*cli)->cli_buf);
+	ait_freeVars(&(*cli)->cli_buf);
 
 	if ((*cli)->cli_parent)
 		e_free((*cli)->cli_parent);
@@ -423,7 +438,6 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
 	rpc = (struct tagRPCCall*) buf;
 	rpc_addPktSession(&rpc->call_session, sess);
 	rpc->call_tag = htons(tag);
-	rpc->call_seq = htons(random() % USHRT_MAX);
 	if (!vars)
 		rpc->call_argc = 0;
 	else
@@ -548,32 +562,29 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars)
 {
 	int type = 0, wlen;
-	u_char *buf;
 
 	if (!cli) {
 		rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
 		return -1;
-	} else {
-		if (cli->cli_id == SOCK_STREAM)
-			type = cli->cli_id;
-		buf = AIT_GET_BUF(&cli->cli_buf);
 	}
+	if (cli->cli_id == SOCK_STREAM)
+		type = cli->cli_id;
 	if (out_vars)
 		*out_vars = NULL;
 
-	if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type)) == -1)
+	if ((wlen = rpc_pkt_Request(rpc_getBufVar(cli), cli->cli_parent, tag, in_vars, noreply, type)) == -1)
 		return -1;
 
-	if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen) == -1)
+	if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli), wlen) == -1)
 		return -1;
 
 	if (noreply)	/* we not want reply */
 		return 0;
 
-	if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf) == -1)
+	if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli)) == -1)
 		return -1;
 
-	if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1)
+	if ((wlen = rpc_pkt_Replay(rpc_getBufVar(cli), cli->cli_parent, tag, out_vars, type)) == -1)
 		return -1;
 
 	return 0;
@@ -585,7 +596,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
  * @out_vars = Returned array with variables from RPC call
  * return: none
  */
-inline void
+void
 rpc_cli_freeCall(array_t ** __restrict out_vars)
 {
 #ifdef CLI_RES_ZCOPY
@@ -601,7 +612,7 @@ rpc_cli_freeCall(array_t ** __restrict out_vars)
  * @cli = connected client
  * return: -1 error or !=-1 ping seq id
  */
-inline int
+int
 rpc_cli_ping(rpc_cli_t *cli)
 {
 	int ret = 0;