--- libaitrpc/src/srv.c	2013/11/14 21:44:14	1.21
+++ libaitrpc/src/srv.c	2013/11/14 23:38:41	1.21.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.21 2013/11/14 21:44:14 misho Exp $
+* $Id: srv.c,v 1.21.2.2 2013/11/14 23:38:41 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -359,6 +359,7 @@ rxPacket(sched_task_t *task)
 			return NULL;
 		}
 	}
+	len = estlen;
 
 #if 0
 	/* check integrity of packet */
@@ -449,6 +450,7 @@ txUDPPacket(sched_task_t *task)
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, 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], 
@@ -485,12 +487,28 @@ txUDPPacket(sched_task_t *task)
 	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
 
 	/* send reply */
-	ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, 
-			&c->cli_sa.sa, c->cli_sa.sa.sa_len);
-	if (ret == -1 || ret != wlen) {
-		/* close connection */
-		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				 TASK_ARG(task), 0, NULL, 0);
+	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! Server 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;
+		}
 	}
 
 	return NULL;
@@ -501,85 +519,94 @@ rxUDPPacket(sched_task_t *task)
 {
 	rpc_srv_t *srv = TASK_ARG(task);
 	rpc_cli_t *c = NULL;
-	int len, rlen, noreply;
-	u_short crc, off = 0;
-	u_char buf[USHRT_MAX + 1];
-	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
+	int len, rlen, noreply, estlen;
+	u_short crc;
+	u_char *buf, b[sizeof(struct tagRPCCall)];
+	struct tagRPCCall *rpc = (struct tagRPCCall*) b;
 	sockaddr_t sa;
 	socklen_t salen;
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
+	struct pollfd pfd;
 
 	/* receive connect packet */
 	salen = sa.ss.ss_len = sizeof(sockaddr_t);
-	rlen = recvfrom(TASK_FD(task), buf, sizeof buf, 0, &sa.sa, &salen);
-	if (rlen < 1)
+	rlen = recvfrom(TASK_FD(task), b, sizeof b, MSG_PEEK, &sa.sa, &salen);
+	if (rlen < sizeof(struct tagRPCCall)) {
+		rpc_SetErr(ERPCMISMATCH, "Short RPC packet");
 		goto end;
+	}
 
 	c = _allocClient(srv, &sa);
 	if (!c)
 		goto end;
 	else {
+		estlen = ntohl(rpc->call_len);
+		if (estlen > AIT_LEN(&c->cli_buf))
+			AIT_RE_BUF(&c->cli_buf, estlen);
+		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);
-		memcpy(AIT_GET_BUF(&c->cli_buf), buf, AIT_LEN(&c->cli_buf));
+
 		/* armed timer for close stateless connection */
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL);
 		schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], 
 				c, ts, c, 0);
 	}
 
-	do {
-		/* check RPC packet */
-		if (rlen < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(ERPCMISMATCH, "Short RPC packet");
-			break;
-		} else
-			rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off);
-
-		len = ntohl(rpc->call_len);
-		rlen -= len;
-
-		/* check RPC packet lengths */
-		if (rlen < 0 || len < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(ERPCMISMATCH, "Broken RPC packet length");
-			/* skip entire packet */
-			break;
+	/* 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! Server not respond");
+			schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], 
+					c, 0, NULL, 0);
+			return NULL;
 		}
-
-		/* check integrity of packet */
-		crc = ntohs(rpc->call_crc);
-		rpc->call_crc ^= rpc->call_crc;
-		if (crc != crcFletcher16((u_short*) rpc, len / 2)) {
-			rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
-
-			off += len;
-			/* try next packet remaining into buffer */
-			continue;
+		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);
+			return NULL;
 		}
+	}
+	len = estlen;
 
-		noreply = RPC_CHK_NOREPLY(rpc);
+	/* check integrity of packet */
+	crc = ntohs(rpc->call_crc);
+	rpc->call_crc ^= rpc->call_crc;
+	if (crc != crcFletcher16((u_short*) rpc, len / 2)) {
+		rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
+		return NULL;
+	}
 
-		/* check RPC packet session info */
-		if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) {
-			rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+	noreply = RPC_CHK_NOREPLY(rpc);
 
-			rpc->call_argc ^= rpc->call_argc;
-			rpc->call_rep.ret = RPC_ERROR(-1);
-			rpc->call_rep.eno = RPC_ERROR(errno);
-		} else {
-			/* execute RPC call */
-			schedEvent(TASK_ROOT(task), execCall, c, 
-					(int) noreply, rpc, len);
-		}
+	/* check RPC packet session info */
+	if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
 
-		/* send RPC reply */
-		if (!noreply)
-			schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
-					c, TASK_FD(task), rpc, len);
+		rpc->call_argc ^= rpc->call_argc;
+		rpc->call_rep.ret = RPC_ERROR(-1);
+		rpc->call_rep.eno = RPC_ERROR(errno);
+	} else {
+		/* execute RPC call */
+		schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len);
+	}
 
-		off += len;
-	} while (rlen > 0);
-
+	/* send RPC reply */
+	if (!noreply)
+		schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
+				c, TASK_FD(task), rpc, len);
 end:
 	schedReadSelf(task);
 	return NULL;