--- libaitrpc/src/aitrpc.c	2015/01/21 21:17:05	1.17
+++ libaitrpc/src/aitrpc.c	2015/05/18 15:09:59	1.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.17 2015/01/21 21:17:05 misho Exp $
+* $Id: aitrpc.c,v 1.18 2015/05/18 15:09:59 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -147,22 +147,23 @@ rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)
  * @type = type of socket
  * @flags = receive flags
  * @sa = check client address, if you use udp protocol
- * @buf = buffer
- * @blen = buffer length
+ * @pkt = RPC packet
  * 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)
+rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt)
 {
 	struct pollfd pfd;
 	sockaddr_t sa2;
 	socklen_t salen;
-	int ret = 0, len, cx = 0;
+	int ret = 0, len, hlen, cx = 0;
 	ait_val_t v = AIT_VAL_INIT;
 	struct ether_header *eh;
 	struct bpf_hdr *h;
 	ether_addr_t bcst = {{ [0 ... sizeof bcst - 1] = 0xff }};
+	u_char *buf = AIT_GET_BUF(pkt);
+	size_t blen = AIT_LEN(pkt);
+	struct tagRPCCall *rpc = (struct tagRPCCall *) buf;
 
 	if (type == SOCK_BPF && sa) {
 		AIT_SET_BUF(&v, NULL, blen);
@@ -218,14 +219,9 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 						return -1;
 					}
 				}
-#if 0
-				else
-					e_getlinkbymac((const ether_addr_t*) eh->ether_shost, &sa2);
-				if (sa && e_addrcmp(sa, &sa2, 0)) {
-#else
+
 				if (!memcmp(bcst.octet, eh->ether_dhost, sizeof bcst) || 
 						!memcmp(bcst.octet, eh->ether_shost, sizeof bcst)) {
-#endif
 					if (cx < 3) {
 						cx++;
 						ret ^= ret;
@@ -242,11 +238,15 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 		} else {
 			ret = recvfrom(sock, buf, len, flags, &sa2.sa, &salen);
 			if (ret > -1 && sa && e_addrcmp(sa, &sa2, 42)) {
-				ret ^= ret;
-				continue;	/* wait for known address */
+				if (cx < 3) {
+					cx++;
+					ret ^= ret;
+					continue;	/* wait for known address */
+				} else
+					return -1;
 			}
 		}
-		if (ret == -1) {
+		if (ret < 0) {
 			LOGERR;
 			if (type == SOCK_BPF)
 				AIT_FREE_VAL(&v);
@@ -257,6 +257,36 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 				AIT_FREE_VAL(&v);
 			return 0;
 		}
+
+		/* check RPC packet header */
+		if ((u_char*) rpc == buf) {
+			if (type == SOCK_RAW) {
+				hlen = sa->sa.sa_family == AF_INET ? sizeof(struct ip) : sizeof(struct ip6_hdr);
+				ret -= hlen;
+				if (ret > 0)
+					memmove(buf, buf + hlen, blen - hlen);
+			}
+
+			/* 1st read for RPC header */
+			if (ret < sizeof(struct tagRPCCall)) {
+				rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
+				if (type == SOCK_BPF)
+					AIT_FREE_VAL(&v);
+				return -1;
+			}
+			/* check for loop request */
+			if (!(rpc->call_io & RPC_ACK)) {
+				ret ^= ret;
+				continue;
+			}
+			/* calc estimated length */
+			blen = len = ntohl(rpc->call_len);
+			if (blen > AIT_LEN(pkt)) {
+				AIT_RE_BUF(pkt, blen);
+				buf = AIT_GET_BUF(pkt);
+				rpc = (struct tagRPCCall*) buf;
+			}
+		}
 	}
 	ret = blen - len;
 
@@ -272,18 +302,19 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
  * @type = type of socket
  * @flags = send flags
  * @sa = send to client address, if you use udp protocol
- * @buf = buffer
+ * @pkt = RPC packet
  * @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)
+		ait_val_t * __restrict pkt, size_t blen)
 {
 	struct pollfd pfd;
 	int ret = 0, len = 0;
 	ait_val_t v = AIT_VAL_INIT;
 	struct ether_header *eh;
+	u_char *buf = AIT_GET_BUF(pkt);
 
 	if (type == SOCK_BPF && sa) {
 		AIT_SET_BUF(&v, NULL, blen + sizeof(struct ether_header));
@@ -325,7 +356,7 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 				AIT_FREE_VAL(&v);
 			return -1;
 		}
-		if (ret == -1) {
+		if (ret < 0) {
 			LOGERR;
 			if (type == SOCK_BPF)
 				AIT_FREE_VAL(&v);