--- libaitrpc/src/cli.c	2013/08/22 15:31:09	1.17
+++ libaitrpc/src/cli.c	2013/08/23 13:53:15	1.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.17 2013/08/22 15:31:09 misho Exp $
+* $Id: cli.c,v 1.18 2013/08/23 13:53:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -265,8 +265,6 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
 int
 rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len)
 {
-	struct pollfd pfd;
-	int ret;
 	u_char *buf;
 
 	if (!pkt) {
@@ -275,38 +273,7 @@ rpc_pkt_Send(int sock, int type, sockaddr_t * __restri
 	} else
 		buf = AIT_GET_BUF(pkt);
 
-	pfd.fd = sock;
-	pfd.events = POLLOUT;
-	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-		if (ret)
-			LOGERR;
-		else
-			rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server");
-		return -1;
-	}
-	do {
-		if (type == SOCK_STREAM)
-			ret = send(sock, buf, len, MSG_NOSIGNAL);
-		else if (sa)
-			ret = sendto(sock, buf, len, MSG_NOSIGNAL, &sa->sa, sa->sa.sa_len);
-		else {
-			rpc_SetErr(EINVAL, "Invalid argument(s)!");
-			return -1;
-		}
-		if (ret == -1) {
-			if (errno == EAGAIN)
-				continue;
-			LOGERR;
-			return -1;
-		} else if (ret != len) {
-			rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
-					"really sended %d bytes", len, ret);
-			return -1;
-		}
-	} while (0);
-
-	return ret;
+	return rpc_Write(sock, type, MSG_NOSIGNAL, sa, buf, len);
 }
 
 /*
@@ -321,11 +288,8 @@ rpc_pkt_Send(int sock, int type, sockaddr_t * __restri
 int
 rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt)
 {
-	struct pollfd pfd;
-	int ret, estlen, blen = sizeof(struct tagRPCCall), len = 0;
+	int ret, estlen = 0, blen = sizeof(struct tagRPCCall);
 	u_char *buf;
-	sockaddr_t sa2;
-	socklen_t salen;
 	struct tagRPCCall *rpc;
 
 	if (!pkt) {
@@ -335,75 +299,38 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 		buf = AIT_GET_BUF(pkt);
 
 	/* reply from RPC server */
-	pfd.fd = sock;
-	pfd.events = POLLIN | POLLPRI;
 	do {
-		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-			if (ret) {
-				LOGERR;
-			} else {
-				if (len++ < 7)
-					continue;
-				else
-					rpc_SetErr(ETIMEDOUT, 
-							"Timeout, no answer from RPC server");
-			}
-
-			return -1;
-		}
-
-payload:
-		if (type == SOCK_STREAM) {
-			memset(buf, 0, blen);
-			ret = recv(sock, buf, blen, 0);
-			/* handling case for reply without payload */
-			if (!ret && buf != AIT_GET_BUF(pkt))
-				return (buf - AIT_GET_BUF(pkt));
-		} else {
-			blen = AIT_LEN(pkt);
-			memset(buf, 0, blen);
-			memset(&sa2, 0, sizeof sa2);
-			salen = sa2.ss.ss_len = sizeof(sockaddr_t);
-			ret = recvfrom(sock, buf, blen, 0, &sa2.sa, &salen);
-		}
+		if (type == SOCK_STREAM)
+			ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen);
+		else
+			ret = rpc_Read(sock, type, 0, sa, buf, AIT_LEN(pkt));
 		if (ret < 1) {
-			if (ret) {
-				if (errno == EAGAIN)
-					continue;
-				else
-					LOGERR;
-			}
+			LOGERR;
 			return -1;
 		}
 
 		/* check for response from known address */
-		if (type == SOCK_DGRAM) {
-			if (e_addrcmp(sa, &sa2, 42)) {
-				rpc_SetErr(ERPCMISMATCH, 
-						"Received RPC response from unknown address");
-				continue;
-			}
-		} else {
+		if (type == SOCK_STREAM && !estlen) {
 			/* 1st read for RPC header */
-			if (buf == AIT_GET_BUF(pkt)) {
-				if (ret < sizeof(struct tagRPCCall)) {
-					rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
-					return -1;
-				}
+			if (ret < sizeof(struct tagRPCCall)) {
+				rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
+				return -1;
+			}
 
-				/* calc estimated length */
-				rpc = (struct tagRPCCall*) buf;
-				estlen = ntohl(rpc->call_len);
-				if (estlen > AIT_LEN(pkt))
-					AIT_RE_BUF(pkt, estlen);
-				buf = AIT_GET_BUF(pkt) + blen;
-				blen = estlen - blen;
-				goto payload;
-			} else
-				ret += sizeof(struct tagRPCCall);
+			/* calc estimated length */
+			rpc = (struct tagRPCCall*) buf;
+			estlen = ntohl(rpc->call_len);
+			if (estlen > AIT_LEN(pkt))
+				AIT_RE_BUF(pkt, estlen);
+			buf = AIT_GET_BUF(pkt);
+			blen = estlen;
+			rpc = (struct tagRPCCall*) buf;
+			continue;
 		}
-	} while (0);
+
+		/* compiler optimize loop if while(0) and stop working 'continue' on some platforms */
+		break;
+	} while (42);
 
 	if (ret < sizeof(struct tagRPCCall)) {
 		rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);