--- libaitrpc/src/cli.c	2012/05/17 21:40:02	1.9.2.14
+++ libaitrpc/src/cli.c	2012/05/18 23:03:00	1.9.2.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.9.2.14 2012/05/17 21:40:02 misho Exp $
+* $Id: cli.c,v 1.9.2.18 2012/05/18 23:03:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -290,50 +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)) {
-		LOGERR;
+		if (ret)
+			LOGERR;
+		else
+			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;
 	}
@@ -382,8 +400,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;
@@ -391,7 +409,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;