--- libaitrpc/src/cli.c	2012/05/17 15:14:16	1.9.2.10
+++ libaitrpc/src/cli.c	2012/05/18 15:37:58	1.9.2.17
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.9.2.10 2012/05/17 15:14:16 misho Exp $
+* $Id: cli.c,v 1.9.2.17 2012/05/18 15:37:58 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -136,7 +136,7 @@ rpc_cli_closeBLOBClient(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)
+ * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
  * @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
@@ -151,8 +151,10 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		return NULL;
 	if (!Port)
 		Port = RPC_DEFPORT;
-	if (!netBuf)
+	if (netBuf < RPC_MIN_BUFSIZ)
 		netBuf = BUFSIZ;
+	else
+		netBuf = io_align(netBuf, 1);	/* align netBuf length */
 
 #ifdef HAVE_SRANDOMDEV
 	srandomdev();
@@ -286,6 +288,21 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	rpc->call_crc ^= rpc->call_crc;
 	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
 
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLOUT;
+	do {
+		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (ret) {
+				if (errno == EAGAIN)
+					continue;
+				else
+					LOGERR;
+			} else
+				rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server");
+			return -1;
+		}
+	} while (0);
 	if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
 		LOGERR;
 		return -1;
@@ -298,18 +315,26 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	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;
-	}
+	do {
+		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (ret) {
+				if (errno == EAGAIN)
+					continue;
+				else
+					LOGERR;
+			} else {
+				if (wlen++ < 7)
+					continue;
+				else
+					rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server");
+			}
+			return -1;
+		}
+	} while (0);
 	memset(buf, 0, AIT_LEN(&cli->cli_buf));
 	if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) {
 		if (ret)
@@ -373,8 +398,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;
@@ -382,7 +407,7 @@ 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));
+		ret = AIT_GET_U16(io_array(arr, 0, ait_val_t*));
 	io_freeVars(&arr);
 
 	return ret;