--- libaitrpc/src/srv.c	2013/08/22 13:09:53	1.17.6.3
+++ libaitrpc/src/srv.c	2013/11/14 13:37:08	1.20.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.17.6.3 2013/08/22 13:09:53 misho Exp $
+* $Id: srv.c,v 1.20.4.3 2013/11/14 13:37:08 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -164,7 +164,15 @@ txPacket(sched_task_t *task)
 	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	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) {
@@ -179,6 +187,7 @@ txPacket(sched_task_t *task)
 			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 */
@@ -188,6 +197,7 @@ txPacket(sched_task_t *task)
 			ait_freeVars(&c->cli_vars);
 			if (ret == -1) {
 				rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
+
 				rpc->call_argc ^= rpc->call_argc;
 				rpc->call_rep.ret = RPC_ERROR(-1);
 				rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
@@ -205,11 +215,27 @@ txPacket(sched_task_t *task)
 #endif
 
 	/* send reply */
-	ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL);
-	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 = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL);
+		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;
@@ -252,7 +278,10 @@ execCall(sched_task_t *task)
 		argc = RPC_CHK_NOREPLY(rpc);
 		rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(c, rpc, f->func_name, arr));
 		if (rpc->call_rep.ret == htonl(-1)) {
-			rpc->call_rep.eno = RPC_ERROR(errno);
+			if (!rpc->call_rep.eno) {
+				LOGERR;
+				rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
+			}
 			rpc->call_argc ^= rpc->call_argc;
 		} else {
 			rpc->call_rep.eno ^= rpc->call_rep.eno;
@@ -282,9 +311,17 @@ rxPacket(sched_task_t *task)
 #endif
 	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), 0);
+	rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), MSG_PEEK);
 	if (rlen < sizeof(struct tagRPCCall)) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
@@ -295,13 +332,25 @@ rxPacket(sched_task_t *task)
 		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) + sizeof(struct tagRPCCall);
-		len = estlen - sizeof(struct tagRPCCall);
+		buf = AIT_GET_BUF(&c->cli_buf);
+		len = estlen;
 	}
 
-	if (len) {
-		/* get next part of packet */
-		memset(buf, 0, len);
+	/* 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[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
+		}
 		rlen = recv(TASK_FD(task), buf, len, 0);
 		if (rlen == -1) {
 			/* close connection */
@@ -351,10 +400,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);
@@ -366,6 +425,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:
@@ -380,7 +445,7 @@ txUDPPacket(sched_task_t *task)
 	rpc_cli_t *c = TASK_ARG(task);
 	rpc_srv_t *s = c->cli_parent;
 	rpc_func_t *f = NULL;
-	u_char buf[USHRT_MAX] = { 0 };
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, wlen = sizeof(struct tagRPCCall);
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
@@ -389,9 +454,6 @@ txUDPPacket(sched_task_t *task)
 	schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
 			 TASK_ARG(task), ts, TASK_ARG(task), 0);
 
-	/* copy RPC header */
-	memcpy(buf, TASK_DATA(task), wlen);
-
 	if (rpc->call_argc) {
 		f = rpc_srv_getCall(s, ntohs(rpc->call_tag));
 		if (!f) {
@@ -402,7 +464,8 @@ txUDPPacket(sched_task_t *task)
 		} else {
 			rpc->call_argc = htons(array_Size(RPC_RETVARS(c)));
 			/* Go Encapsulate variables */
-			ret = ait_vars2buffer(buf + wlen, sizeof buf - wlen, RPC_RETVARS(c));
+			ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, 
+					RPC_RETVARS(c));
 			/* Free return values */
 			ait_freeVars(&c->cli_vars);
 			if (ret == -1) {
@@ -679,6 +742,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
@@ -686,8 +750,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;