--- libaitrpc/src/aitrpc.c	2013/05/30 09:22:01	1.10
+++ 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.10 2013/05/30 09:22:01 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
@@ -138,4 +138,119 @@ rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)
 	p->sess_instance = s->sess_instance;
 
 	return 0;
+}
+
+/*
+ * rpc_Read() - RPC read operation
+ *
+ * @sock = socket
+ * @type = type of socket
+ * @flags = receive flags
+ * @sa = check client address, if you use udp protocol
+ * @buf = buffer
+ * @blen = buffer length
+ * 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, 
+		u_char * __restrict buf, size_t blen)
+{
+	struct pollfd pfd;
+	sockaddr_t sa2;
+	socklen_t salen;
+	int ret = 0, len;
+
+	pfd.fd = sock;
+	pfd.events = POLLIN | POLLPRI;
+	memset(buf, 0, blen);
+	memset(&sa2, 0, sizeof sa2);
+	salen = sa2.ss.ss_len = sizeof(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 (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, 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;
+			}
+		}
+		if (ret == -1) {
+			LOGERR;
+			return -1;
+		}
+		if (!ret)	/* EOF */
+			return 0;
+	}
+	ret = blen - len;
+
+	return ret;
+}
+
+/*
+ * rpc_Write() - RPC write operation
+ *
+ * @sock = socket
+ * @type = type of socket
+ * @flags = send flags
+ * @sa = send to client address, if you use udp protocol
+ * @buf = buffer
+ * @blen = buffer length
+ * 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, 
+		u_char * __restrict buf, size_t blen)
+{
+	struct pollfd pfd;
+	int ret = 0, len = 0;
+
+	pfd.fd = sock;
+	pfd.events = POLLOUT;
+	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
+				LOGERR;
+			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)	/* EOF */
+			return 0;
+	}
+	ret = blen - len;
+	if (ret != blen) {
+		rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
+				"really sended %d bytes", len, ret);
+		return -1;
+	}
+
+	return ret;
 }