--- libaitrpc/src/srv.c	2011/09/07 07:24:21	1.5
+++ 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.5 2011/09/07 07:24:21 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
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -46,278 +46,798 @@ SUCH DAMAGE.
 #include "global.h"
 
 
-static void *
-rpc_srv_dispatchCall(void *arg)
+/* SOCK_STREAM */
+static void *acceptClients(sched_task_t *);
+static void *closeClient(sched_task_t *);
+static void *rxPacket(sched_task_t *);
+static void *txPacket(sched_task_t *);
+
+/* SOCK_DGRAM */
+static void *freeClient(sched_task_t *);
+static void *rxUDPPacket(sched_task_t *);
+static void *txUDPPacket(sched_task_t *);
+
+/* SOCK_RAW */
+
+static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
+	{ acceptClients, closeClient, rxPacket, txPacket },	/* SOCK_STREAM */
+	{ acceptClients, closeClient, rxPacket, txPacket },	/* SOCK_STREAM */
+	{ rxUDPPacket, freeClient, rxUDPPacket, txUDPPacket }, 	/* SOCK_DGRAM */
+	{ NULL, NULL, NULL, NULL }				/* SOCK_RAW */
+};
+
+
+void
+rpc_freeCli(rpc_cli_t * __restrict c)
 {
-	rpc_cli_t *c = arg;
-	rpc_srv_t *s;
-	rpc_func_t *f = NULL;
-	array_t *arr;
-	struct tagRPCCall *rpc;
-	struct tagRPCRet *rrpc;
-	rpc_sess_t ses = { 0 };
-	fd_set fds;
-	u_char *buf;
-	int ret, argc = 0, Limit = 0;
+	rpc_srv_t *s = c->cli_parent;
+
+	schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
+
+	/* free buffer */
+	AIT_FREE_VAL(&c->cli_buf);
+
+	array_Del(s->srv_clients, c->cli_id, 0);
+	if (c)
+		e_free(c);
+}
+
+
+static inline int
+_check4freeslot(rpc_srv_t * __restrict srv, sockaddr_t * __restrict sa)
+{
+	rpc_cli_t *c = NULL;
 	register int i;
 
-	if (!arg) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced RPC client ...\n");
-		return NULL;
-	} else
-		s = c->cli_parent;
+	/* check free slots for connect */
+	for (i = 0; i < array_Size(srv->srv_clients) && 
+			(c = array(srv->srv_clients, i, rpc_cli_t*)); i++)
+		/* check for duplicates */
+		if (sa && !e_addrcmp(&c->cli_sa, sa, 42))
+			break;
+	if (i >= array_Size(srv->srv_clients))
+		return -1;	/* no more free slots! */
 
-	buf = malloc(s->srv_netbuf);
-	if (!buf) {
-		LOGERR;
+	return i;
+}
+
+static rpc_cli_t *
+_allocClient(rpc_srv_t * __restrict srv, sockaddr_t * __restrict sa)
+{
+	rpc_cli_t *c = NULL;
+	int n;
+
+	n = _check4freeslot(srv, sa);
+	if (n == -1)
 		return NULL;
+	else
+		c = array(srv->srv_clients, n, rpc_cli_t*);
+
+	if (!c) {
+		c = e_malloc(sizeof(rpc_cli_t));
+		if (!c) {
+			LOGERR;
+			srv->srv_kill = 1;
+			return NULL;
+		} else {
+			memset(c, 0, sizeof(rpc_cli_t));
+			array_Set(srv->srv_clients, n, c);
+			c->cli_id = n;
+			c->cli_parent = srv;
+		}
+
+		/* alloc empty buffer */
+		AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf);
 	}
 
-	do {
-		FD_ZERO(&fds);
-		FD_SET(c->cli_sock, &fds);
-		ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);
-		if (ret == -1) {
-			if (errno == EINTR && s->srv_kill != kill)
-				continue;
+	return c;
+}
 
-			LOGERR;
-			ret = -2;
-			break;
+
+static void *
+freeClient(sched_task_t *task)
+{
+	rpc_freeCli(TASK_ARG(task));
+
+	return NULL;
+}
+
+static void *
+closeClient(sched_task_t *task)
+{
+	int sock = ((rpc_cli_t*) TASK_ARG(task))->cli_sock;
+
+	rpc_freeCli(TASK_ARG(task));
+
+	/* close client socket */
+	shutdown(sock, SHUT_RDWR);
+	close(sock);
+	return NULL;
+}
+
+static void *
+txPacket(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 = 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) {
+			rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
+
+			rpc->call_argc ^= rpc->call_argc;
+			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, 
+					RPC_RETVARS(c));
+			/* Free return values */
+			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);
+			} else
+				wlen += ret;
 		}
-		memset(buf, 0, s->srv_netbuf);
-		ret = recv(c->cli_sock, buf, s->srv_netbuf, 0);
+	}
+
+	rpc->call_len = htonl(wlen);
+
+#if 0
+	/* calculate CRC */
+	rpc->call_crc ^= rpc->call_crc;
+	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
+#endif
+
+	/* 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 = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL);
 		if (ret == -1) {
-			LOGERR;
-			ret = -3;
-			break;
+			/* close connection */
+			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
 		}
-		if (!ret) {		/* receive EOF */
-			ret = 0;
-			break;
-		}
-		if (ret < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
-			ret = -4;
-			break;
-		} else
-			rpc = (struct tagRPCCall*) buf;
-		/* check RPC packet session info */
-		if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) {
-			rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n");
-			ret = -5;
-			goto makeReply;
-		} else
-			Limit = sizeof(struct tagRPCCall);
+	}
 
-		/* RPC is OK! Go decapsulate variables ... */
-		if (rpc->call_argc) {
-			arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, rpc->call_argc, 1);
-			if (!arr) {
-				ret = -5;
-				goto makeReply;
-			}
-		} else
-			arr = NULL;
+	return NULL;
+}
 
-		/* execute call */
-		argc = 0;
-		memcpy(&ses, &rpc->call_session, sizeof ses);
-		if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) {
-			rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n");
-			ret = -6;
-		} else
-			if ((ret = rpc_srv_execCall(f, rpc, arr)) == -1)
-				ret = -9;
-			else {
-				if (arr)
-					io_arrayDestroy(&arr);
-				argc = rpc_srv_getVars(f, &arr);
-				goto makeReply;		/* Call finish OK */
-			}
+static void *
+execCall(sched_task_t *task)
+{
+	rpc_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
+	rpc_func_t *f = NULL;
+	array_t *arr = NULL;
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
+	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
+	int argc = ntohs(rpc->call_argc);
 
-		if (arr)
-			io_arrayDestroy(&arr);
+	/* Go decapsulate variables ... */
+	if (argc) {
+		arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall), 
+				AIT_LEN(&c->cli_buf) - sizeof(struct tagRPCCall), argc, 42);
+		if (!arr) {
+			rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError());
 
-makeReply:
-		/* Made reply */
-		memset(buf, 0, s->srv_netbuf);
-		rrpc = (struct tagRPCRet*) buf;
-		Limit = sizeof(struct tagRPCRet);
+			rpc->call_argc ^= rpc->call_argc;
+			rpc->call_rep.ret = RPC_ERROR(-1);
+			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
+			return NULL;
+		}
+	} else
+		arr = NULL;
 
-		memcpy(&rrpc->ret_session, &ses, sizeof(rpc_sess_t));
-		rrpc->ret_tag = rpc->call_tag;
-		rrpc->ret_hash = rpc->call_hash;
-		rrpc->ret_errno = rpc_Errno;
-		rrpc->ret_retcode = ret;
-		rrpc->ret_argc = argc;
+	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {
+		rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
 
-		if (argc && arr) {
-			/* Go Encapsulate variables ... */
-			if ((i = io_vals2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
-				rpc_srv_freeVals(f);
-				argc = 0;
-				ret = -7;
-				rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
-				goto makeReply;
+		rpc->call_argc ^= rpc->call_argc;
+		rpc->call_rep.ret = RPC_ERROR(-1);
+		rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
+	} else {
+		/* if client doesn't want reply */
+		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)) {
+			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;
+			if (argc) {
+				/* without reply */
+				ait_freeVars(&c->cli_vars);
+				rpc->call_argc ^= rpc->call_argc;
 			} else {
-				Limit += i;
-
-				rpc_srv_freeVals(f);
+				/* reply */
+				rpc->call_argc = htons(array_Size(RPC_RETVARS(c)));
 			}
 		}
+	}
 
-		ret = send(c->cli_sock, buf, Limit, 0);
-		if (ret == -1) {
-			LOGERR;
-			ret = -8;
-			break;
+	array_Destroy(&arr);
+	return NULL;
+}
+
+static void *
+rxPacket(sched_task_t *task)
+{
+	rpc_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
+	int len, rlen, noreply, estlen;
+#if 0
+	u_short crc;
+#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), MSG_PEEK);
+	if (rlen < sizeof(struct tagRPCCall)) {
+		/* close connection */
+		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+				TASK_ARG(task), 0, NULL, 0);
+		return NULL;
+	} 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;
+	}
+
+	/* 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[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
 		}
-		if (ret != Limit) {
-			rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, "
-					"really is %d\n", Limit, ret);
-			ret = -9;
-			break;
+		rlen = recv(TASK_FD(task), buf, len, 0);
+		if (rlen == -1) {
+			/* close connection */
+			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
 		}
-	} while (ret > -1 || s->srv_kill != kill);
+	}
+	len = estlen;
 
-	shutdown(c->cli_sock, SHUT_RDWR);
-	close(c->cli_sock);
-	memset(c, 0, sizeof(rpc_cli_t));
-	free(buf);
-	return (void*) (long)ret;
-}
+#if 0
+	/* 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;
+	}
+#endif
 
+	noreply = RPC_CHK_NOREPLY(rpc);
 
+	/* check RPC packet session info */
+	if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+
+		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, TASK_ARG(task), (int) noreply, rpc, len);
+	}
+
+	/* send RPC reply */
+	if (!noreply)
+		schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], 
+				TASK_ARG(task), TASK_FD(task), rpc, len);
+
+	/* lets get next packet */
+	schedReadSelf(task);
+	return NULL;
+}
+
 static void *
-rpc_srv_dispatchVars(void *arg)
+acceptClients(sched_task_t *task)
 {
-	rpc_cli_t *c = arg;
-	rpc_srv_t *s;
-	rpc_blob_t *b;
-	int ret = 0;
-	fd_set fds;
-	u_char buf[sizeof(struct tagBLOBHdr)];
-	struct tagBLOBHdr *blob;
+	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
 
-	if (!arg) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced BLOB client ...\n");
-		return NULL;
+	c = _allocClient(srv, NULL);
+	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);
+	if (c->cli_sock == -1) {
+		LOGERR;
+		AIT_FREE_VAL(&c->cli_buf);
+		array_Del(srv->srv_clients, c->cli_id, 42);
+		goto end;
 	} else
-		s = c->cli_parent;
+		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
 
-	do {
-		/* check for disable service at this moment? */
-		if (s->srv_blob.state == disable && s->srv_kill != kill) {
-			usleep(100000);
-#ifdef HAVE_PTHREAD_YIELD
-			pthread_yield();
+#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
-			continue;
-		}
+	schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, 
+			c->cli_sock, NULL, 0);
+end:
+	schedReadSelf(task);
+	return NULL;
+}
 
-		FD_ZERO(&fds);
-		FD_SET(c->cli_sock, &fds);
-		ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);
-		if (ret == -1) {
-			if (errno == EINTR && s->srv_kill != kill && s->srv_blob.state != kill)
-				continue;
 
-			LOGERR;
-			ret = -2;
-			break;
+static void *
+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 = AIT_GET_BUF(&c->cli_buf);
+	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], 
+			 TASK_ARG(task), ts, TASK_ARG(task), 0);
+
+	if (rpc->call_argc) {
+		f = rpc_srv_getCall(s, ntohs(rpc->call_tag));
+		if (!f) {
+			rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
+			rpc->call_argc ^= rpc->call_argc;
+			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, 
+					RPC_RETVARS(c));
+			/* Free return values */
+			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);
+			} else
+				wlen += ret;
 		}
+	}
 
-		memset(buf, 0, sizeof buf);
-		ret = recv(c->cli_sock, buf, sizeof buf, 0);
+	rpc->call_len = htonl(wlen);
+
+	/* calculate CRC */
+	rpc->call_crc ^= rpc->call_crc;
+	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) {
-			LOGERR;
-			ret = -3;
-			break;
+			/* close connection */
+			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
 		}
-		/* receive EOF, disable or kill service */
-		if (!ret || s->srv_blob.state == kill || s->srv_kill == kill) {
-			ret = 0;
-			break;
+	}
+
+	return NULL;
+}
+
+static void *
+rxUDPPacket(sched_task_t *task)
+{
+	rpc_srv_t *srv = TASK_ARG(task);
+	rpc_cli_t *c = NULL;
+	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), 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) {
+		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);
+		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);
+
+		/* 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);
+	}
+
+	/* 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;
 		}
-		if (ret < sizeof(struct tagBLOBHdr)) {
-			rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n");
-			ret = -4;
-			break;
-		} else
-			blob = (struct tagBLOBHdr*) buf;
-		/* check BLOB packet session info */
-		if (memcmp(&blob->hdr_session, &s->srv_session, sizeof blob->hdr_session)) {
-			rpc_SetErr(EINVAL, "Error:: get invalid BLOB session ...\n");
-			ret = -5;
-			goto makeReply;
+		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;
 		}
-		/* Go to proceed packet ... */
-		switch (blob->hdr_cmd) {
-			case get:
-				if (!(b = rpc_srv_getBLOB(s, blob->hdr_var))) {
-					rpc_SetErr(EINVAL, "Error:: var (%x) not found into BLOB server ...\n", 
-							blob->hdr_var);
-					ret = -6;
-					break;
-				} else
-					blob->hdr_len = b->blob_len;
+		if (e_addrcmp(&c->cli_sa, &sa, 42))
+			rlen ^= rlen;	/* skip if arrive from different address */
+	}
+	len = estlen;
 
-				if (rpc_srv_blobMap(s, b) != -1) {
-					ret = rpc_srv_sendBLOB(c, b);
-					rpc_srv_blobUnmap(b);
-				} else
-					ret = -7;
-				break;
-			case set:
-				if ((b = rpc_srv_registerBLOB(s, blob->hdr_len))) {
-					/* set new BLOB variable for reply :) */
-					blob->hdr_var = b->blob_var;
+	/* 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;
+	}
 
-					ret = rpc_srv_recvBLOB(c, b);
-					rpc_srv_blobUnmap(b);
-				} else
-					ret = -7;
+	noreply = RPC_CHK_NOREPLY(rpc);
+
+	/* check RPC packet session info */
+	if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+
+		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);
+	}
+
+	/* 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;
+}
+
+/* ------------------------------------------------------ */
+
+void
+rpc_freeBLOBCli(rpc_cli_t * __restrict c)
+{
+	rpc_srv_t *s = c->cli_parent;
+
+	schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL);
+
+	/* free buffer */
+	AIT_FREE_VAL(&c->cli_buf);
+
+	array_Del(s->srv_blob.clients, c->cli_id, 0);
+	if (c)
+		e_free(c);
+}
+
+
+static void *
+closeBLOBClient(sched_task_t *task)
+{
+	int sock = ((rpc_cli_t*) TASK_ARG(task))->cli_sock;
+
+	rpc_freeBLOBCli(TASK_ARG(task));
+
+	/* close client socket */
+	shutdown(sock, SHUT_RDWR);
+	close(sock);
+	return NULL;
+}
+
+static void *
+txBLOB(sched_task_t *task)
+{
+	rpc_cli_t *c = TASK_ARG(task);
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
+	int wlen = sizeof(struct tagBLOBHdr);
+
+	/* send reply */
+	wlen = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL);
+	if (wlen == -1 || wlen != sizeof(struct tagBLOBHdr)) {
+		/* close blob connection */
+		schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0);
+	}
+
+	return NULL;
+}
+
+static void *
+rxBLOB(sched_task_t *task)
+{
+	rpc_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
+	rpc_blob_t *b;
+	struct tagBLOBHdr blob;
+	int rlen;
+
+	memset(&blob, 0, sizeof blob);
+	rlen = recv(TASK_FD(task), &blob, sizeof blob, 0);
+	if (rlen < 1) {
+		/* close blob connection */
+		schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0);
+		return NULL;
+	}
+
+	/* check BLOB packet */
+	if (rlen < sizeof(struct tagBLOBHdr)) {
+		rpc_SetErr(ERPCMISMATCH, "Short BLOB packet");
+
+		schedReadSelf(task);
+		return NULL;
+	}
+
+	/* check RPC packet session info */
+	if (rpc_chkPktSession(&blob.hdr_session, &s->srv_session)) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+		blob.hdr_cmd = error;
+		goto end;
+	}
+
+	/* Go to proceed packet ... */
+	switch (blob.hdr_cmd) {
+		case get:
+			if (!(b = rpc_srv_getBLOB(s, ntohl(blob.hdr_var)))) {
+				rpc_SetErr(EINVAL, "Var=%x not found", ntohl(blob.hdr_var));
+				blob.hdr_cmd = no;
+				blob.hdr_ret = RPC_ERROR(-1);
 				break;
-			case unset:
-				ret = rpc_srv_unregisterBLOB(s, blob->hdr_var);
-				if (ret == -1)
-					ret = -7;
-				break;
-			default:
-				rpc_SetErr(EPROCUNAVAIL, "Error:: unsupported BLOB command (%d)...\n", 
-						blob->hdr_cmd);
-				ret = -7;
-		}
+			} else
+				blob.hdr_len = htonl(b->blob_len);
 
-makeReply:
-		/* Replay to client! */
-		blob->hdr_cmd = ret < 0 ? error : ok;
-		blob->hdr_ret = ret;
-		ret = send(c->cli_sock, buf, sizeof buf, 0);
-		if (ret == -1) {
-			LOGERR;
-			ret = -8;
+			if (rpc_srv_blobMap(s, b) != -1) {
+				/* deliver BLOB variable to client */
+				blob.hdr_ret = htonl(rpc_srv_sendBLOB(c, b));
+				rpc_srv_blobUnmap(b);
+			} else {
+				blob.hdr_cmd = error;
+				blob.hdr_ret = RPC_ERROR(-1);
+			}
 			break;
-		}
-		if (ret != sizeof buf) {
-			rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, "
-					"really is %d\n", sizeof buf, ret);
-			ret = -9;
+		case set:
+			if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), 
+							ntohl(blob.hdr_ret)))) {
+				/* set new BLOB variable for reply :) */
+				blob.hdr_var = htonl(b->blob_var);
+
+				/* receive BLOB from client */
+				blob.hdr_ret = htonl(rpc_srv_recvBLOB(c, b));
+				rpc_srv_blobUnmap(b);
+			} else {
+				blob.hdr_cmd = error;
+				blob.hdr_ret = RPC_ERROR(-1);
+			}
 			break;
+		case unset:
+			if (rpc_srv_unregisterBLOB(s, ntohl(blob.hdr_var)) == -1) {
+				blob.hdr_cmd = error;
+				blob.hdr_ret = RPC_ERROR(-1);
+			}
+			break;
+		default:
+			rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd);
+			blob.hdr_cmd = error;
+			blob.hdr_ret = RPC_ERROR(-1);
+	}
+
+end:
+	memcpy(AIT_ADDR(&c->cli_buf), &blob, sizeof blob);
+	schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0);
+	schedReadSelf(task);
+	return NULL;
+}
+
+static void *
+flushBLOB(sched_task_t *task)
+{
+	rpc_srv_t *srv = TASK_ARG(task);
+	rpc_blob_t *b, *tmp;
+
+	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
+		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
+
+		rpc_srv_blobFree(srv, b);
+		e_free(b);
+	}
+
+	schedSignalSelf(task);
+	return NULL;
+}
+
+static void *
+acceptBLOBClients(sched_task_t *task)
+{
+	rpc_srv_t *srv = TASK_ARG(task);
+	rpc_cli_t *c = NULL;
+	register int i;
+	socklen_t salen = sizeof(sockaddr_t);
+	int sock;
+#ifdef TCP_NOPUSH
+	int n = 1;
+#endif
+
+	/* 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! */
+		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);
 		}
-	} while (ret > -1 || s->srv_kill != kill);
+		goto end;
+	}
 
-	shutdown(c->cli_sock, SHUT_RDWR);
-	close(c->cli_sock);
-	memset(c, 0, sizeof(rpc_cli_t));
-	return (void*) ((long)ret);
+	c = e_malloc(sizeof(rpc_cli_t));
+	if (!c) {
+		LOGERR;
+		srv->srv_kill = srv->srv_blob.kill = 1;
+		return NULL;
+	} else {
+		memset(c, 0, sizeof(rpc_cli_t));
+		array_Set(srv->srv_blob.clients, i, c);
+		c->cli_id = i;
+		c->cli_parent = srv;
+	}
+
+	/* alloc empty buffer */
+	AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf);
+
+	/* accept client */
+	c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen);
+	if (c->cli_sock == -1) {
+		LOGERR;
+		AIT_FREE_VAL(&c->cli_buf);
+		array_Del(srv->srv_blob.clients, i, 42);
+		goto end;
+	} else {
+#ifdef TCP_NOPUSH
+		setsockopt(c->cli_sock, IPPROTO_TCP, TCP_NOPUSH, &n, sizeof n);
+#endif
+		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
+	}
+
+	schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0);
+end:
+	schedReadSelf(task);
+	return NULL;
 }
 
-// -------------------------------------------------
+/* ------------------------------------------------------ */
 
 /*
- * rpc_srv_initBLOBServer() Init & create BLOB Server
+ * rpc_srv_initBLOBServer() - Init & create BLOB Server
+ *
  * @srv = RPC server instance
  * @Port = Port for bind server, if Port == 0 default port is selected
  * @diskDir = Disk place for BLOB file objects
@@ -327,512 +847,419 @@ int
 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir)
 {
 	int n = 1;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
 
-	if (!srv) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n");
+	if (!srv || srv->srv_kill) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server");
 		return -1;
 	}
-	if (srv->srv_blob.state) {
-		rpc_SetErr(EPERM, "Warning:: Already started BLOB server!\n");
-		return 0;
-	}
-	if (!Port)
-		Port = RPC_DEFPORT + 1;
 
 	memset(&srv->srv_blob, 0, sizeof srv->srv_blob);
 	if (access(diskDir, R_OK | W_OK) == -1) {
 		LOGERR;
 		return -1;
 	} else
-		strlcpy(srv->srv_blob.dir, diskDir, UCHAR_MAX + 1);
+		AIT_SET_STR(&srv->srv_blob.dir, diskDir);
 
-	srv->srv_blob.server.cli_tid = pthread_self();
+	/* init blob list */
+	TAILQ_INIT(&srv->srv_blob.blobs);
+
 	srv->srv_blob.server.cli_parent = srv;
 
-	memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);
-	switch (srv->srv_server.cli_sa.sa_family) {
+	memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(sockaddr_t));
+	switch (srv->srv_blob.server.cli_sa.sa.sa_family) {
 		case AF_INET:
-			sin->sin_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr));
+			srv->srv_blob.server.cli_sa.sin.sin_port = 
+				htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1);
 			break;
 		case AF_INET6:
-			sin6->sin6_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, sin6, sizeof(struct sockaddr));
+			srv->srv_blob.server.cli_sa.sin6.sin6_port = 
+				htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1);
 			break;
 		case AF_LOCAL:
-			strlcat(sun->sun_path, ".blob", sizeof sun->sun_path);
-			memcpy(&srv->srv_blob.server.cli_sa, sun, sizeof(struct sockaddr));
+			strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob", 
+					sizeof srv->srv_blob.server.cli_sa.sun.sun_path);
 			break;
 		default:
+			AIT_FREE_VAL(&srv->srv_blob.dir);
 			return -1;
 	}
 
 	/* create BLOB server socket */
-	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, SOCK_STREAM, 0);
+	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (srv->srv_blob.server.cli_sock == -1) {
 		LOGERR;
+		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
 	}
 	if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
+		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
 	}
 	n = srv->srv_netbuf;
 	if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
+		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
 	}
 	if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
+		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
 	}
-	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa, 
-				sizeof srv->srv_blob.server.cli_sa) == -1) {
+	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, 
+				srv->srv_blob.server.cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
+		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
-	}
+	} else
+		fcntl(srv->srv_blob.server.cli_sock, F_SETFL, 
+				fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK);
 
-	/* allocate pool for concurent clients */
-	srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
+
+	/* allocate pool for concurent blob clients */
+	srv->srv_blob.clients = array_Init(array_Size(srv->srv_clients));
 	if (!srv->srv_blob.clients) {
-		LOGERR;
+		rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
 		close(srv->srv_blob.server.cli_sock);
+		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
-	} else
-		memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
+	}
 
-	pthread_mutex_init(&srv->srv_blob.mtx, NULL);
+	/* init blob scheduler */
+	srv->srv_blob.root = schedBegin();
+	if (!srv->srv_blob.root) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		array_Destroy(&srv->srv_blob.clients);
+		close(srv->srv_blob.server.cli_sock);
+		AIT_FREE_VAL(&srv->srv_blob.dir);
+		return -1;
+	}
 
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 0);
-
-	srv->srv_blob.state = enable;	/* enable BLOB */
 	return 0;
 }
 
 /*
- * rpc_srv_endBLOBServer() Destroy BLOB server, close all opened sockets and free resources
+ * rpc_srv_endBLOBServer() - Destroy BLOB server, close all opened sockets and free resources
+ *
  * @srv = RPC Server instance
  * return: none
  */
 void
 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 {
-	rpc_cli_t *c;
-	register int i;
-	rpc_blob_t *f;
-
-	if (!srv) {
-		rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
+	if (!srv)
 		return;
-	} else
-		srv->srv_blob.state = kill;
 
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS);
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);
+	srv->srv_blob.kill = 1;
 
-	/* close all clients connections & server socket */
-	for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa_family)
-			shutdown(c->cli_sock, SHUT_RDWR);
-	close(srv->srv_blob.server.cli_sock);
-
-	pthread_mutex_lock(&srv->srv_blob.mtx);
-	if (srv->srv_blob.clients) {
-		free(srv->srv_blob.clients);
-		srv->srv_blob.clients = NULL;
-	}
-
-	/* detach blobs */
-	while ((f = srv->srv_blob.blobs)) {
-		srv->srv_blob.blobs = f->blob_next;
-		rpc_srv_blobFree(srv, f);
-		free(f);
-	}
-	pthread_mutex_unlock(&srv->srv_blob.mtx);
-
-	while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY);
-	pthread_mutex_destroy(&srv->srv_blob.mtx);
+	schedEnd(&srv->srv_blob.root);
 }
 
 /*
- * rpc_srv_loopBLOB() Execute Main BLOB server loop and wait for clients requests
+ * rpc_srv_loopBLOBServer() - Execute Main BLOB server loop and wait for clients requests
+ *
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
 int
-rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
+rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(struct sockaddr);
-	register int i;
 	rpc_cli_t *c;
-	fd_set fds;
-	int ret;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	register int i;
+	rpc_blob_t *b, *tmp;
+	struct timespec ts = { RPC_SCHED_POLLING, 0 };
 
-	if (!srv || srv->srv_blob.state == kill) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n");
+	if (!srv || srv->srv_kill) {
+		rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server");
 		return -1;
 	}
 
-	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
+	if (listen(srv->srv_blob.server.cli_sock, array_Size(srv->srv_blob.clients)) == -1) {
 		LOGERR;
 		return -1;
 	}
 
-	while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
-		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
-			if (!c->cli_sa.sa_family)
-				break;
-		if (i >= srv->srv_numcli) {
-#ifdef HAVE_PTHREAD_YIELD
-			pthread_yield();
-#else
-			usleep(1000000);
-#endif
-			continue;
-		}
+	schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0);
+	if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, 
+				srv->srv_blob.server.cli_sock, NULL, 0)) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		return -1;
+	}
 
-		FD_ZERO(&fds);
-		FD_SET(srv->srv_blob.server.cli_sock, &fds);
-		ret = select(srv->srv_blob.server.cli_sock + 1, &fds, NULL, NULL, &tv);
-		if (ret == -1) {
-			LOGERR;
-			ret = 1;
-			break;
-		}
-		if (!ret)
-			continue;
+	schedPolling(srv->srv_blob.root, &ts, NULL);
+	/* main rpc loop */
+	schedRun(srv->srv_blob.root, &srv->srv_blob.kill);
 
-		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen);
-		if (c->cli_sock == -1) {
-			LOGERR;
-			continue;
-		} else
-			c->cli_parent = srv;
+	/* detach blobs */
+	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
+		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
 
-		if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) {
-			LOGERR;
-			continue;
-		} else
-			pthread_detach(c->cli_tid);
+		rpc_srv_blobFree(srv, b);
+		e_free(b);
 	}
 
-	srv->srv_blob.state = kill;
+	/* close all clients connections & server socket */
+	for (i = 0; i < array_Size(srv->srv_blob.clients); i++) {
+		c = array(srv->srv_blob.clients, i, rpc_cli_t*);
+		if (c) {
+			shutdown(c->cli_sock, SHUT_RDWR);
+			close(c->cli_sock);
 
+			schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL);
+			AIT_FREE_VAL(&c->cli_buf);
+		}
+		array_Del(srv->srv_blob.clients, i, 42);
+	}
+	array_Destroy(&srv->srv_blob.clients);
+
+	close(srv->srv_blob.server.cli_sock);
+
+	AIT_FREE_VAL(&srv->srv_blob.dir);
 	return 0;
 }
 
 
 /*
- * rpc_srv_initServer() Init & create RPC Server
- * @regProgID = ProgramID for authentication & recognition
- * @regProcID = ProcessID for authentication & recognition
+ * rpc_srv_initServer() - Init & create RPC Server
+ *
+ * @InstID = Instance for authentication & recognition
  * @concurentClients = Concurent clients at same time to this server
- * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
- * @family = Family type, AF_INET, AF_INET6 or AF_LOCAL
+ * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
  * @csHost = Host name or address for bind server, if NULL any address
  * @Port = Port for bind server, if Port == 0 default port is selected
+ * @proto = Protocol, if == 0 choose SOCK_STREAM
  * return: NULL == error or !=NULL bind and created RPC server instance
  */
 rpc_srv_t *
-rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, 
-		int netBuf, u_short family, const char *csHost, u_short Port)
+rpc_srv_initServer(u_char InstID, int concurentClients, int netBuf, 
+		const char *csHost, u_short Port, int proto)
 {
-	rpc_srv_t *srv = NULL;
 	int n = 1;
-	struct hostent *host = NULL;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	rpc_srv_t *srv = NULL;
+	sockaddr_t sa = E_SOCKADDR_INIT;
 
-	if (!concurentClients || !regProgID || 
-			(family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n");
+	if (!concurentClients || (proto < 0 || proto > SOCK_DGRAM)) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
 		return NULL;
 	}
+	if (!e_gethostbyname(csHost, Port, &sa))
+		return NULL;
 	if (!Port)
 		Port = RPC_DEFPORT;
-	if (!netBuf)
+	if (!proto)
+		proto = SOCK_STREAM;
+	if (netBuf < RPC_MIN_BUFSIZ)
 		netBuf = BUFSIZ;
-	if (csHost && family != AF_LOCAL) {
-		host = gethostbyname2(csHost, family);
-		if (!host) {
-			rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));
-			return NULL;
-		}
-	}
-	memset(&sa, 0, sizeof sa);
-	sa.sa_family = family;
-	switch (family) {
-		case AF_INET:
-			sin->sin_len = sizeof(struct sockaddr_in);
-			sin->sin_port = htons(Port);
-			if (csHost)
-				memcpy(&sin->sin_addr, host->h_addr, host->h_length);
-			break;
-		case AF_INET6:
-			sin6->sin6_len = sizeof(struct sockaddr_in6);
-			sin6->sin6_port = htons(Port);
-			if (csHost)
-				memcpy(&sin6->sin6_addr, host->h_addr, host->h_length);
-			break;
-		case AF_LOCAL:
-			sun->sun_len = sizeof(struct sockaddr_un);
-			if (csHost)
-				strlcpy(sun->sun_path, csHost, sizeof sun->sun_path);
-			break;
-		default:
-			rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");
-			return NULL;
-	}
+	else
+		netBuf = E_ALIGN(netBuf, 2);	/* align netBuf length */
 
-	srv = malloc(sizeof(rpc_srv_t));
+#ifdef HAVE_SRANDOMDEV
+	srandomdev();
+#else
+	time_t tim;
+
+	srandom((time(&tim) ^ getpid()));
+#endif
+
+	srv = e_malloc(sizeof(rpc_srv_t));
 	if (!srv) {
 		LOGERR;
 		return NULL;
 	} else
 		memset(srv, 0, sizeof(rpc_srv_t));
 
+	srv->srv_proto = proto;
 	srv->srv_netbuf = netBuf;
-	srv->srv_numcli = concurentClients;
 	srv->srv_session.sess_version = RPC_VERSION;
-	srv->srv_session.sess_program = regProgID;
-	srv->srv_session.sess_process = regProcID;
+	srv->srv_session.sess_instance = InstID;
 
-	srv->srv_server.cli_tid = pthread_self();
 	srv->srv_server.cli_parent = srv;
-	switch (family) {
-		case AF_INET:
-			memcpy(&srv->srv_server.cli_sa, sin, sizeof srv->srv_server.cli_sa);
-			break;
-		case AF_INET6:
-			memcpy(&srv->srv_server.cli_sa, sin6, sizeof srv->srv_server.cli_sa);
-			break;
-		case AF_LOCAL:
-			memcpy(&srv->srv_server.cli_sa, sun, sizeof srv->srv_server.cli_sa);
-			unlink(sun->sun_path);
-			break;
+	memcpy(&srv->srv_server.cli_sa, &sa, sizeof srv->srv_server.cli_sa);
+
+	/* init functions */
+	pthread_mutex_init(&srv->srv_funcs.mtx, NULL);
+	SLIST_INIT(&srv->srv_funcs);
+	AVL_INIT(&srv->srv_funcs);
+
+	/* init scheduler */
+	srv->srv_root = schedBegin();
+	if (!srv->srv_root) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		pthread_mutex_destroy(&srv->srv_funcs.mtx);
+		e_free(srv);
+		return NULL;
 	}
 
+	/* init pool for clients */
+	srv->srv_clients = array_Init(concurentClients);
+	if (!srv->srv_clients) {
+		rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		schedEnd(&srv->srv_root);
+		pthread_mutex_destroy(&srv->srv_funcs.mtx);
+		e_free(srv);
+		return NULL;
+	}
+
 	/* create server socket */
-	srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);
+	srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, srv->srv_proto, 0);
 	if (srv->srv_server.cli_sock == -1) {
 		LOGERR;
-		free(srv);
+		array_Destroy(&srv->srv_clients);
+		schedEnd(&srv->srv_root);
+		pthread_mutex_destroy(&srv->srv_funcs.mtx);
+		e_free(srv);
 		return NULL;
 	}
 	if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
 		LOGERR;
-		close(srv->srv_server.cli_sock);
-		free(srv);
-		return NULL;
+		goto err;
 	}
 	n = srv->srv_netbuf;
 	if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
 		LOGERR;
-		close(srv->srv_server.cli_sock);
-		free(srv);
-		return NULL;
+		goto err;
 	}
 	if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
 		LOGERR;
-		close(srv->srv_server.cli_sock);
-		free(srv);
-		return NULL;
+		goto err;
 	}
-	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa, sizeof srv->srv_server.cli_sa) == -1) {
+	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, 
+				srv->srv_server.cli_sa.sa.sa_len) == -1) {
 		LOGERR;
-		close(srv->srv_server.cli_sock);
-		free(srv);
-		return NULL;
-	}
-
-	/* allocate pool for concurent clients */
-	srv->srv_clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
-	if (!srv->srv_clients) {
-		LOGERR;
-		close(srv->srv_server.cli_sock);
-		free(srv);
-		return NULL;
+		goto err;
 	} else
-		memset(srv->srv_clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
+		fcntl(srv->srv_server.cli_sock, F_SETFL, 
+				fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
 
-	pthread_mutex_init(&srv->srv_mtx, NULL);
+	rpc_register_srvPing(srv);
 
-	rpc_srv_registerCall(srv, NULL, CALL_SRVSHUTDOWN, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 1);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 4);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 1);
 	return srv;
+err:	/* error condition */
+	close(srv->srv_server.cli_sock);
+	array_Destroy(&srv->srv_clients);
+	schedEnd(&srv->srv_root);
+	pthread_mutex_destroy(&srv->srv_funcs.mtx);
+	e_free(srv);
+	return NULL;
 }
 
 /*
- * rpc_srv_endServer() Destroy RPC server, close all opened sockets and free resources
- * @srv = RPC Server instance
+ * rpc_srv_endServer() - Destroy RPC server, close all opened sockets and free resources
+ *
+ * @psrv = RPC Server instance
  * return: none
  */
 void
-rpc_srv_endServer(rpc_srv_t * __restrict srv)
+rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 {
-	rpc_cli_t *c;
-	register int i;
-	rpc_func_t *f;
-
-	if (!srv) {
-		rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
+	if (!psrv || !*psrv)
 		return;
-	}
 
-	rpc_srv_endBLOBServer(srv);
+	/* if send kill to blob server */
+	rpc_srv_endBLOBServer(*psrv);
 
-	/* close all clients connections & server socket */
-	for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa_family) {
-			shutdown(c->cli_sock, SHUT_RDWR);
-			close(c->cli_sock);
-		}
-	close(srv->srv_server.cli_sock);
+	(*psrv)->srv_kill = 1;
+	sleep(RPC_SCHED_POLLING);
 
-	if (srv->srv_clients) {
-		free(srv->srv_clients);
-		srv->srv_clients = NULL;
-		srv->srv_numcli = 0;
-	}
+	schedEnd(&(*psrv)->srv_root);
 
-	/* detach exported calls */
-	pthread_mutex_lock(&srv->srv_mtx);
-	while ((f = srv->srv_funcs)) {
-		srv->srv_funcs = f->func_next;
-		free(f);
-	}
-	pthread_mutex_unlock(&srv->srv_mtx);
-
-	while (pthread_mutex_trylock(&srv->srv_mtx) == EBUSY);
-	pthread_mutex_destroy(&srv->srv_mtx);
-
-	free(srv);
-	srv = NULL;
+	pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx);
+	e_free(*psrv);
+	*psrv = NULL;
 }
 
 /*
- * rpc_srv_loopServer() Execute Main server loop and wait for clients requests
+ * rpc_srv_loopServer() - Execute Main server loop and wait for clients requests
+ *
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
 int
 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(struct sockaddr);
-	register int i;
 	rpc_cli_t *c;
-	fd_set fds;
-	int ret;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	register int i;
+	rpc_func_t *f;
+	struct timespec ts = { RPC_SCHED_POLLING, 0 };
 
 	if (!srv) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n");
+		rpc_SetErr(EINVAL, "Invalid parameter can`t start RPC server");
 		return -1;
 	}
 
-	/* activate BLOB server worker if srv->srv_blob.state == enable */
-	rpc_srv_execBLOBServer(srv);
+	if (srv->srv_proto == SOCK_STREAM)
+		if (listen(srv->srv_server.cli_sock, array_Size(srv->srv_clients)) == -1) {
+			LOGERR;
+			return -1;
+		}
 
-	if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
-		LOGERR;
+	if (!schedRead(srv->srv_root, cbProto[srv->srv_proto][CB_ACCEPTCLIENT], srv, 
+				srv->srv_server.cli_sock, NULL, 0)) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
 		return -1;
 	}
 
-	while (srv->srv_kill != kill) {
-		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
-			if (!c->cli_sa.sa_family)
-				break;
-		if (i >= srv->srv_numcli) {
-#ifdef HAVE_PTHREAD_YIELD
-			pthread_yield();
-#else
-			usleep(1000000);
-#endif
-			continue;
-		}
+	schedPolling(srv->srv_root, &ts, NULL);
+	/* main rpc loop */
+	schedRun(srv->srv_root, &srv->srv_kill);
 
-		FD_ZERO(&fds);
-		FD_SET(srv->srv_server.cli_sock, &fds);
-		ret = select(srv->srv_server.cli_sock + 1, &fds, NULL, NULL, &tv);
-		if (ret == -1) {
-			LOGERR;
-			ret = 1;
-			break;
+	/* close all clients connections & server socket */
+	for (i = 0; i < array_Size(srv->srv_clients); i++) {
+		c = array(srv->srv_clients, i, rpc_cli_t*);
+		if (c) {
+			shutdown(c->cli_sock, SHUT_RDWR);
+			close(c->cli_sock);
+
+			schedCancelby(srv->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
+			ait_freeVars(&RPC_RETVARS(c));
+			AIT_FREE_VAL(&c->cli_buf);
 		}
-		if (!ret)
-			continue;
+		array_Del(srv->srv_clients, i, 42);
+	}
+	array_Destroy(&srv->srv_clients);
 
-		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen);
-		if (c->cli_sock == -1) {
-			LOGERR;
-			continue;
-		} else
-			c->cli_parent = srv;
+	close(srv->srv_server.cli_sock);
 
-		if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) {
-			LOGERR;
-			continue;
-		} else
-			pthread_detach(c->cli_tid);
+	/* detach exported calls */
+	RPC_FUNCS_LOCK(&srv->srv_funcs);
+	while ((f = SLIST_FIRST(&srv->srv_funcs))) {
+		SLIST_REMOVE_HEAD(&srv->srv_funcs, func_next);
+
+		AIT_FREE_VAL(&f->func_name);
+		e_free(f);
 	}
+	srv->srv_funcs.avlh_root = NULL;
+	RPC_FUNCS_UNLOCK(&srv->srv_funcs);
 
 	return 0;
 }
 
-// ---------------------------------------------------------
 
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
- * @call = Register RPC call
+ *
+ * @cli = RPC client
  * @rpc = IN RPC call structure
+ * @funcname = Execute RPC function
  * @args = IN RPC calling arguments from RPC client
  * return: -1 error, !=-1 ok
  */
 int
-rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
-		array_t * __restrict args)
+rpc_srv_execCall(rpc_cli_t * __restrict cli, struct tagRPCCall * __restrict rpc, 
+		ait_val_t funcname, array_t * __restrict args)
 {
-	void *dl;
 	rpc_callback_t func;
-	int ret;
 
-	if (!call || !rpc || !call->func_parent) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t exec call from RPC server ...\n");
+	if (!cli || !rpc || !AIT_ADDR(&funcname)) {
+		rpc_SetErr(EINVAL, "Invalid parameter can`t exec function");
 		return -1;
 	}
 
-	dl = dlopen((char*) (*call->func_file ? call->func_file : NULL), RTLD_NOW);
-	if (!dl) {
-		rpc_SetErr(ENOENT, "Error:: Can`t attach module %s!\n", dlerror());
-		return -1;
-	}
-
-	func = dlsym(dl, (char*) call->func_name);
-	if (func)
-		ret = func(call, rpc->call_argc, args);
-	else {
-		rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror());
-		ret = -1;
-	}
-
-	dlclose(dl);
-	return ret;
+	func = AIT_GET_LIKE(&funcname, rpc_callback_t);
+	return func(cli, rpc, args);
 }