--- libaitrpc/src/srv.c	2015/06/25 22:39:05	1.26.2.5
+++ libaitrpc/src/srv.c	2015/06/28 21:40:46	1.26.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.26.2.5 2015/06/25 22:39:05 misho Exp $
+* $Id: srv.c,v 1.26.2.6 2015/06/28 21:40:46 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -478,7 +478,6 @@ txUDPPacket(sched_task_t *task)
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, estlen, wlen = sizeof(struct tagRPCCall);
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
-	struct pollfd pfd;
 
 	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL);
 	schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
@@ -524,28 +523,13 @@ txUDPPacket(sched_task_t *task)
 	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
 
 	/* send reply */
-	pfd.fd = TASK_FD(task);
-	pfd.events = POLLOUT;
-	for (; wlen > 0; wlen -= 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! Client not respond");
-			/* close connection */
-			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-					TASK_ARG(task), 0, NULL, 0);
-			return NULL;
-		}
-		ret = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, 
-				&c->cli_sa.sa, c->cli_sa.sa.sa_len);
-		if (ret == -1) {
-			/* close connection */
-			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-					TASK_ARG(task), 0, NULL, 0);
-			return NULL;
-		}
+	ret = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, 
+			&c->cli_sa.sa, c->cli_sa.sa.sa_len);
+	if (ret == -1) {
+		/* close connection */
+		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+				TASK_ARG(task), 0, NULL, 0);
+		return NULL;
 	}
 
 	return NULL;
@@ -556,35 +540,39 @@ rxUDPPacket(sched_task_t *task)
 {
 	rpc_srv_t *srv = TASK_ARG(task);
 	rpc_cli_t *c = NULL;
-	int len, rlen, noreply, estlen;
+	int len, rlen, noreply;
 	u_short crc;
-	u_char *buf, b[sizeof(struct tagRPCCall)];
-	struct tagRPCCall *rpc = (struct tagRPCCall*) b;
+	struct tagRPCCall *rpc;
 	sockaddr_t sa;
 	socklen_t salen;
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
-	struct pollfd pfd;
+	ait_val_t b = AIT_VAL_INIT;
 
 	/* receive connect packet */
+	AIT_SET_BUF(&b, NULL, srv->srv_netbuf);
 	salen = sa.ss.ss_len = sizeof(sockaddr_t);
-	rlen = recvfrom(TASK_FD(task), b, sizeof b, MSG_PEEK, &sa.sa, &salen);
-	if (rlen < sizeof(struct tagRPCCall)) {
+	rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen);
+	rpc = (struct tagRPCCall*) AIT_GET_BUF(&b);
+	if (rlen < sizeof(struct tagRPCCall) || rlen < ntohl(rpc->call_len)) {
 		rpc_SetErr(ERPCMISMATCH, "Short RPC packet");
 		goto end;
 	}
 
+	/* skip loop packet */
+	if (rpc->call_io & RPC_ACK)
+		goto end;
+
 	c = _allocClient(srv, &sa);
 	if (!c) {
 		EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n");
 		usleep(2000);	/* blocked client delay */
 		goto end;
 	} else {
-		estlen = ntohl(rpc->call_len);
-		if (estlen > AIT_LEN(&c->cli_buf))
-			AIT_RE_BUF(&c->cli_buf, estlen);
+		len = ntohl(rpc->call_len);
+		if (len > AIT_LEN(&c->cli_buf))
+			AIT_RE_BUF(&c->cli_buf, len);
+		memcpy(AIT_GET_BUF(&c->cli_buf), AIT_GET_BUF(&b), len);
 		rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf);
-		buf = AIT_GET_BUF(&c->cli_buf);
-		len = estlen;
 
 		c->cli_sock = TASK_FD(task);
 		memcpy(&c->cli_sa, &sa, sizeof c->cli_sa);
@@ -595,38 +583,6 @@ rxUDPPacket(sched_task_t *task)
 				c, ts, c, 0);
 	}
 
-	/* get next part of packet */
-	memset(buf, 0, len);
-	pfd.fd = TASK_FD(task);
-	pfd.events = POLLIN | POLLPRI;
-	for (; len > 0; len -= rlen, buf += rlen) {
-		if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-			if (rlen)
-				LOGERR;
-			else
-				rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond");
-			schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], 
-					c, 0, NULL, 0);
-			goto end;
-		}
-		salen = sa.ss.ss_len = sizeof(sockaddr_t);
-		rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen);
-		if (rlen == -1) {
-			/* close connection */
-			schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], 
-					c, 0, NULL, 0);
-			goto end;
-		}
-		if (e_addrcmp(&c->cli_sa, &sa, 42))
-			rlen ^= rlen;	/* skip if arrive from different address */
-	}
-	len = estlen;
-
-	/* skip loop packet */
-	if (rpc->call_io & RPC_ACK)
-		goto end;
-
 	/* check integrity of packet */
 	crc = ntohs(rpc->call_crc);
 	rpc->call_crc ^= rpc->call_crc;
@@ -657,6 +613,7 @@ rxUDPPacket(sched_task_t *task)
 		schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
 				c, TASK_FD(task), rpc, len);
 end:
+	AIT_FREE_VAL(&b);
 	schedReadSelf(task);
 	return NULL;
 }
@@ -768,7 +725,7 @@ rxRAWPacket(sched_task_t *task)
 				(AIT_GET_BUF(&b) + sizeof(struct ip6_hdr));
 		}
 	}
-	if (rlen < sizeof(struct tagRPCCall)) {
+	if (rlen < sizeof(struct tagRPCCall) || rlen < ntohl(rpc->call_len)) {
 		rpc_SetErr(ERPCMISMATCH, "Short RPC packet");
 		goto end;
 	}
@@ -1084,16 +1041,15 @@ rxEXTPacket(sched_task_t *task)
 	/* receive connect packet */
 	AIT_SET_BUF(&b, NULL, srv->srv_netbuf);
 	rlen = read(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b));
-	if (rlen < sizeof(struct tagRPCCall)) {
+	rpc = (struct tagRPCCall*) AIT_GET_BUF(&b);
+	if (rlen < sizeof(struct tagRPCCall) || rlen < ntohl(rpc->call_len)) {
 		rpc_SetErr(ERPCMISMATCH, "Short RPC packet");
 		goto end;
-	} else {
-		rpc = (struct tagRPCCall*) AIT_GET_BUF(&b);
-
-		/* skip loop packet */
-		if (rpc->call_io & RPC_ACK)
-			goto end;
 	}
+
+	/* skip loop packet */
+	if (rpc->call_io & RPC_ACK)
+		goto end;
 
 	c = _allocClient(srv, &sa);
 	if (!c) {