--- libaitrpc/src/srv.c	2013/08/23 13:53:15	1.19
+++ libaitrpc/src/srv.c	2013/11/14 21:44:14	1.21
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.19 2013/08/23 13:53:15 misho Exp $
+* $Id: srv.c,v 1.21 2013/11/14 21:44:14 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) {
@@ -271,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;
@@ -302,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)) {
@@ -383,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);
@@ -398,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:
@@ -709,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
@@ -716,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;