--- libaitrpc/src/srv.c	2013/09/05 00:43:05	1.20
+++ libaitrpc/src/srv.c	2013/11/15 09:55:53	1.22
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.20 2013/09/05 00:43:05 misho Exp $
+* $Id: srv.c,v 1.22 2013/11/15 09:55:53 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -165,7 +165,14 @@ txPacket(sched_task_t *task)
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, estlen, wlen = sizeof(struct tagRPCCall);
 	struct pollfd pfd;
+#ifdef TCP_SESSION_TIMEOUT
+	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 
+	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL);
+	schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+			 TASK_ARG(task), ts, TASK_ARG(task), 0);
+#endif
+
 	if (rpc->call_argc) {
 		f = rpc_srv_getCall(s, ntohs(rpc->call_tag));
 		if (!f) {
@@ -216,7 +223,7 @@ txPacket(sched_task_t *task)
 			if (ret)
 				LOGERR;
 			else
-				rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
+				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);
@@ -305,7 +312,14 @@ rxPacket(sched_task_t *task)
 	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	struct pollfd pfd;
+#ifdef TCP_SESSION_TIMEOUT
+	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 
+	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL);
+	schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+			 TASK_ARG(task), ts, TASK_ARG(task), 0);
+#endif
+
 	memset(buf, 0, sizeof(struct tagRPCCall));
 	rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), MSG_PEEK);
 	if (rlen < sizeof(struct tagRPCCall)) {
@@ -332,7 +346,7 @@ rxPacket(sched_task_t *task)
 			if (rlen)
 				LOGERR;
 			else
-				rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
+				rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond");
 			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
 					TASK_ARG(task), 0, NULL, 0);
 			return NULL;
@@ -345,6 +359,7 @@ rxPacket(sched_task_t *task)
 			return NULL;
 		}
 	}
+	len = estlen;
 
 #if 0
 	/* check integrity of packet */
@@ -386,10 +401,20 @@ acceptClients(sched_task_t *task)
 	rpc_srv_t *srv = TASK_ARG(task);
 	rpc_cli_t *c = NULL;
 	socklen_t salen = sizeof(sockaddr_t);
+	int sock;
+#ifdef TCP_SESSION_TIMEOUT
+	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
+#endif
 
 	c = _allocClient(srv, NULL);
-	if (!c)
+	if (!c) {
+		EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n");
+		if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) {
+			shutdown(sock, SHUT_RDWR);
+			close(sock);
+		}
 		goto end;
+	}
 
 	/* accept client */
 	c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen);
@@ -401,6 +426,12 @@ acceptClients(sched_task_t *task)
 	} else
 		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
 
+#ifdef TCP_SESSION_TIMEOUT
+	/* 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);
+#endif
 	schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, 
 			c->cli_sock, NULL, 0);
 end:
@@ -417,8 +448,9 @@ txUDPPacket(sched_task_t *task)
 	rpc_func_t *f = NULL;
 	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
-	int ret, wlen = sizeof(struct tagRPCCall);
+	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], 
@@ -432,6 +464,13 @@ txUDPPacket(sched_task_t *task)
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 		} else {
+			/* calc estimated length */
+			estlen = ait_resideVars(RPC_RETVARS(c)) + wlen;
+			if (estlen > AIT_LEN(&c->cli_buf))
+				AIT_RE_BUF(&c->cli_buf, estlen);
+			buf = AIT_GET_BUF(&c->cli_buf);
+			rpc = (struct tagRPCCall*) buf;
+
 			rpc->call_argc = htons(array_Size(RPC_RETVARS(c)));
 			/* Go Encapsulate variables */
 			ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, 
@@ -455,12 +494,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! 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;
+		}
 	}
 
 	return NULL;
@@ -471,85 +526,99 @@ 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)
+	if (!c) {
+		EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n");
+		usleep(2000);	/* blocked client delay */
 		goto end;
-	else {
+	} 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! Client 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;
+		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);
+			return NULL;
 		}
+		if (e_addrcmp(&c->cli_sa, &sa, 42))
+			rlen ^= rlen;	/* skip if arrive from different address */
+	}
+	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;
@@ -712,6 +781,7 @@ acceptBLOBClients(sched_task_t *task)
 	rpc_cli_t *c = NULL;
 	register int i;
 	socklen_t salen = sizeof(sockaddr_t);
+	int sock;
 #ifdef TCP_NOPUSH
 	int n = 1;
 #endif
@@ -719,8 +789,15 @@ acceptBLOBClients(sched_task_t *task)
 	/* check free slots for connect */
 	for (i = 0; i < array_Size(srv->srv_blob.clients) && 
 			(c = array(srv->srv_blob.clients, i, rpc_cli_t*)); i++);
-	if (c)	/* no more free slots! */
+	if (c) {	/* no more free slots! */
+		EVERBOSE(1, "BLOB client quota exceeded! Connection will be shutdown!\n");
+		if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) {
+			shutdown(sock, SHUT_RDWR);
+			close(sock);
+		}
 		goto end;
+	}
+
 	c = e_malloc(sizeof(rpc_cli_t));
 	if (!c) {
 		LOGERR;