--- libaitrpc/src/aitrpc.c	2013/11/14 22:43:19	1.12.4.2
+++ libaitrpc/src/aitrpc.c	2013/12/15 23:01:02	1.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.12.4.2 2013/11/14 22:43:19 misho Exp $
+* $Id: aitrpc.c,v 1.14 2013/12/15 23:01:02 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -149,7 +149,7 @@ rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)
  * @sa = check client address, if you use udp protocol
  * @buf = buffer
  * @blen = buffer length
- * return: -1 error or >-1 readed bytes into buffer
+ * return: -1 error, 0 EOF or or >0 readed bytes into buffer
  */
 ssize_t
 rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa, 
@@ -169,15 +169,19 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 	for (len = blen; len > 0; len -= ret, buf += ret) {
 		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-			LOGERR;
+			if (ret)
+				LOGERR;
+			else
+				rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
 			return -1;
 		}
 		if (type == SOCK_STREAM)
 			ret = recv(sock, buf, len, flags);
 		else {
-			ret = recvfrom(sock, buf, blen, flags, &sa2.sa, &salen);
-			if (ret > -1 && e_addrcmp(sa, &sa2, 42)) {
-				rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address");
+			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;
 			}
 		}
@@ -185,6 +189,8 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 			LOGERR;
 			return -1;
 		}
+		if (!ret)	/* EOF */
+			return 0;
 	}
 	ret = blen - len;
 
@@ -200,7 +206,7 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
  * @sa = send to client address, if you use udp protocol
  * @buf = buffer
  * @blen = buffer length
- * return: -1 error or >-1 written bytes into buffer
+ * return: -1 error, 0 EOF or >0 written bytes into buffer
  */
 ssize_t
 rpc_Write(int sock, int type, int flags, sockaddr_t * __restrict sa, 
@@ -214,8 +220,10 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 	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 0
 			if (!ret)
 				continue;
+#endif
 			if (ret > 0)
 				rpc_SetErr(EPIPE, "Disconnected RPC session\n");
 			else
@@ -234,6 +242,8 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 			LOGERR;
 			return -1;
 		}
+		if (!ret)	/* EOF */
+			return 0;
 	}
 	ret = blen - len;
 	if (ret != blen) {