--- libaitrpc/src/cli.c	2012/05/17 21:14:13	1.9.2.13
+++ libaitrpc/src/cli.c	2012/11/13 09:22:10	1.12
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.9.2.13 2012/05/17 21:14:13 misho Exp $
+* $Id: cli.c,v 1.12 2012/11/13 09:22:10 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -63,7 +63,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 		return NULL;
 	}
 
-	cli = malloc(sizeof(rpc_cli_t));
+	cli = io_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
@@ -94,13 +94,13 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
-		free(cli);
+		io_free(cli);
 		return NULL;
 	}
 	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
-		free(cli);
+		io_free(cli);
 		return NULL;
 	} else
 		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
@@ -125,7 +125,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
 
 	AIT_FREE_VAL(&(*cli)->cli_buf);
 
-	free(*cli);
+	io_free(*cli);
 	*cli = NULL;
 }
 
@@ -145,7 +145,7 @@ rpc_cli_t *
 rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port)
 {
 	rpc_cli_t *cli = NULL;
-	io_sockaddr_t sa;
+	io_sockaddr_t sa = IO_SOCKADDR_INIT;
 
 	if (!io_gethostbyname(csHost, Port, &sa))
 		return NULL;
@@ -154,7 +154,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 	if (netBuf < RPC_MIN_BUFSIZ)
 		netBuf = BUFSIZ;
 	else
-		netBuf = io_align(netBuf, 1);	/* align netBuf length */
+		netBuf = io_align(netBuf, 2);	/* align netBuf length */
 
 #ifdef HAVE_SRANDOMDEV
 	srandomdev();
@@ -164,7 +164,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 	srandom((time(&tim) ^ getpid()));
 #endif
 
-	cli = malloc(sizeof(rpc_cli_t));
+	cli = io_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
@@ -172,10 +172,10 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		memset(cli, 0, sizeof(rpc_cli_t));
 
 	/* build session */
-	cli->cli_parent = malloc(sizeof(rpc_sess_t));
+	cli->cli_parent = io_malloc(sizeof(rpc_sess_t));
 	if (!cli->cli_parent) {
 		LOGERR;
-		free(cli);
+		io_free(cli);
 		return NULL;
 	} else {
 		((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
@@ -191,16 +191,16 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 	if (cli->cli_sock == -1) {
 		LOGERR;
 		AIT_FREE_VAL(&cli->cli_buf);
-		free(cli->cli_parent);
-		free(cli);
+		io_free(cli->cli_parent);
+		io_free(cli);
 		return NULL;
 	}
 	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		AIT_FREE_VAL(&cli->cli_buf);
 		close(cli->cli_sock);
-		free(cli->cli_parent);
-		free(cli);
+		io_free(cli->cli_parent);
+		io_free(cli);
 		return NULL;
 	} else
 		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
@@ -226,9 +226,9 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
 	AIT_FREE_VAL(&(*cli)->cli_buf);
 
 	if ((*cli)->cli_parent)
-		free((*cli)->cli_parent);
+		io_free((*cli)->cli_parent);
 
-	free(*cli);
+	io_free(*cli);
 	*cli = NULL;
 }
 
@@ -290,54 +290,68 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 
 	pfd.fd = cli->cli_sock;
 	pfd.events = POLLOUT;
-	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		if (ret)
 			LOGERR;
 		else
-			rpc_SetErr(ETIMEDOUT, "Timeout, no ready to send");
-
+			rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server");
 		return -1;
 	}
-	if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
-		LOGERR;
-		return -1;
-	} else if (ret != wlen) {
-		rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
-				"really sended %d bytes", wlen, ret);
-		return -1;
-	}
+	do {
+		if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
+			if (errno == EAGAIN)
+				continue;
+			LOGERR;
+			return -1;
+		} else if (ret != wlen) {
+			rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
+					"really sended %d bytes", wlen, ret);
+			return -1;
+		}
+	} while (0);
 
 	if (noreply)	/* we not want reply */
 		return 0;
 
+	wlen = 0;
 	/* reply from RPC server */
-	pfd.fd = cli->cli_sock;
 	pfd.events = POLLIN | POLLPRI;
-	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
-			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-		if (ret)
-			LOGERR;
-		else
-			rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server");
-
-		return -1;
-	}
-	memset(buf, 0, AIT_LEN(&cli->cli_buf));
-	if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) {
-		if (ret)
-			LOGERR;
-		return -1;
-	}
+	do {
+		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (ret)
+				LOGERR;
+			else {
+				if (wlen++ < 7)
+					continue;
+				else
+					rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server");
+			}
+			return -1;
+		}
+	} while (0);
+	do {
+		memset(buf, 0, AIT_LEN(&cli->cli_buf));
+		if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) {
+			if (ret) {
+				if (errno == EAGAIN)
+					continue;
+				else
+					LOGERR;
+			}
+			return -1;
+		}
+	} while (0);
 	if (ret < sizeof(struct tagRPCCall)) {
-		rpc_SetErr(ERPCMISMATCH, "Short RPC packet");
+		rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
 		return -1;
 	}
 
 	/* calculate CRC */
 	crc = ntohs(rpc->call_crc);
 	rpc->call_crc ^= rpc->call_crc;
-	if (crc != crcFletcher16((u_short*) buf, ret / 2)) {
+	if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
 		return -1;
 	}
@@ -365,8 +379,13 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 
 	/* RPC is OK! Go de-marshaling variables ... */
 	if (out_vars && ntohs(rpc->call_argc)) {
+#ifdef CLI_RES_ZCOPY
 		*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, 
+				ntohs(rpc->call_argc), 42);
+#else
+		*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, 
 				ntohs(rpc->call_argc), 0);
+#endif
 		if (!*out_vars) {
 			rpc_SetErr(io_GetErrno(), "%s", io_GetError());
 			return -1;
@@ -378,6 +397,22 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 }
 
 /*
+ * rpc_cli_freeCall() - Free resouce allocated by RPC call
+ *
+ * @out_vars = Returned array with variables from RPC call
+ * return: none
+ */
+inline void
+rpc_cli_freeCall(array_t ** __restrict out_vars)
+{
+#ifdef CLI_RES_ZCOPY
+	io_arrayDestroy(out_vars);
+#else
+	io_freeVars(out_vars);
+#endif
+}
+
+/*
  * rpc_cli_ping() - Ping RPC server
  *
  * @cli = connected client
@@ -386,8 +421,8 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 inline int
 rpc_cli_ping(rpc_cli_t *cli)
 {
-	array_t *arr;
 	int ret = 0;
+	array_t *arr = NULL;
 
 	if (!cli)
 		return -1;
@@ -395,8 +430,8 @@ rpc_cli_ping(rpc_cli_t *cli)
 	if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr))
 		return -1;
 	else
-		ret = AIT_GET_U16(io_getVars(arr, 0));
-	io_freeVars(&arr);
+		ret = AIT_GET_U16(io_array(arr, 0, ait_val_t*));
+	rpc_cli_freeCall(&arr);
 
 	return ret;
 }