--- libaitrpc/src/aitrpc.c	2013/11/11 22:48:53	1.12
+++ libaitrpc/src/aitrpc.c	2013/11/15 09:55:52	1.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.12 2013/11/11 22:48:53 misho Exp $
+* $Id: aitrpc.c,v 1.13 2013/11/15 09:55:52 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -166,39 +166,31 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 	memset(&sa2, 0, sizeof sa2);
 	salen = sa2.ss.ss_len = sizeof(sockaddr_t);
 
-	if (type == SOCK_STREAM) {
-		for (len = blen; len > 0; len -= ret, buf += ret) {
-			if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-					pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+	for (len = blen; len > 0; len -= ret, buf += ret) {
+		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (ret)
 				LOGERR;
-				return -1;
-			} else
-				ret = recv(sock, buf, len, flags);
-			if (ret == -1) {
-				LOGERR;
-				return -1;
-			}
+			else
+				rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
+			return -1;
 		}
-		if (ret > -1)
-			ret = blen - len;
-	} else {
-		do {
-			if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-					pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-				LOGERR;
+		if (type == SOCK_STREAM)
+			ret = recv(sock, buf, len, flags);
+		else {
+			ret = recvfrom(sock, buf, len, flags, &sa2.sa, &salen);
+			if (ret > -1 && sa && e_addrcmp(sa, &sa2, 42)) {
+				rpc_SetErr(ERPCMISMATCH, 
+						"Received RPC response from unknown address");
 				return -1;
-			} else
-				ret = recvfrom(sock, buf, blen, flags, &sa2.sa, &salen);
-			if (ret < 0) {
-				LOGERR;
-				return -1;
 			}
-			if (e_addrcmp(sa, &sa2, 42))
-				rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address");
-			else
-				break;
-		} while (42);
+		}
+		if (ret == -1) {
+			LOGERR;
+			return -1;
+		}
 	}
+	ret = blen - len;
 
 	return ret;
 }
@@ -223,49 +215,32 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 
 	pfd.fd = sock;
 	pfd.events = POLLOUT;
-
-	if (type == SOCK_STREAM) {
-		for (len = blen; len > 0; len -= ret, buf += ret) {
-			if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-					pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-				if (!ret)
-					continue;
-				if (ret > 0)
-					rpc_SetErr(EPIPE, "Disconnected RPC session\n");
-				else
-					LOGERR;
-				return -1;
-			} else
-				ret = send(sock, buf, len, flags);
-			if (ret == -1) {
+	for (len = blen; len > 0; len -= ret, buf += ret) {
+		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (!ret)
+				continue;
+			if (ret > 0)
+				rpc_SetErr(EPIPE, "Disconnected RPC session\n");
+			else
 				LOGERR;
-				return -1;
-			}
+			return -1;
 		}
-		if (ret > -1)
-			ret = blen - len;
-	} else if (sa) {
-		do {
-			if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-					pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-				if (!ret)
-					continue;
-				if (ret > 0)
-					rpc_SetErr(EPIPE, "Disconnected RPC session\n");
-				else
-					LOGERR;
-				return -1;
-			} else
-				ret = sendto(sock, buf, blen, flags, &sa->sa, sa->sa.sa_len);
-		} while (0);
-	} else {
-		rpc_SetErr(EINVAL, "Invalid argument(s)!");
-		return -1;
+		if (type == SOCK_STREAM)
+			ret = send(sock, buf, len, flags);
+		else if (sa)
+			ret = sendto(sock, buf, len, flags, &sa->sa, sa->sa.sa_len);
+		else {
+			rpc_SetErr(EINVAL, "Invalid argument(s)!");
+			return -1;
+		}
+		if (ret == -1) {
+			LOGERR;
+			return -1;
+		}
 	}
-	if (ret == -1) {
-		LOGERR;
-		return -1;
-	} else if (ret != blen) {
+	ret = blen - len;
+	if (ret != blen) {
 		rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
 				"really sended %d bytes", len, ret);
 		return -1;