--- libaitrpc/src/srv.c	2012/03/15 01:22:55	1.6.2.10
+++ libaitrpc/src/srv.c	2012/05/15 16:10:58	1.9.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.6.2.10 2012/03/15 01:22:55 misho Exp $
+* $Id: srv.c,v 1.9.2.5 2012/05/15 16:10:58 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,21 +46,39 @@ SUCH DAMAGE.
 #include "global.h"
 
 
-static void *rxPacket(sched_task_t*);
-static void *rxBLOB(sched_task_t*);
+static void *
+closeClient(sched_task_t *task)
+{
+	rpc_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
 
+	schedCancelby(s->srv_root, taskMAX, CRITERIA_FD, (void*) c->cli_sock, NULL);
+
+	/* close client socket */
+	if (TASK_VAL(task))
+		shutdown(c->cli_sock, SHUT_RDWR);
+	close(c->cli_sock);
+
+	/* free buffer */
+	AIT_FREE_VAL(&c->cli_buf);
+
+	io_arrayDel(s->srv_clients, c->cli_id, 42);
+	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 = TASK_DATA(task);
+	u_char buf[USHRT_MAX] = { 0 };
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, wlen = sizeof(struct tagRPCCall);
 	array_t *arr = NULL;
 
-	FTRACE();
+	/* copy RPC header */
+	memcpy(buf, TASK_DATA(task), wlen);
 
 	if (rpc->call_argc) {
 		f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash));
@@ -71,7 +89,8 @@ txPacket(sched_task_t *task)
 		} else {
 			rpc->call_argc = htons(rpc_srv_getVars(f, &arr));
 			/* Go Encapsulate variables */
-			ret = io_vars2buffer(buf + wlen, TASK_DATLEN(task) - wlen, arr);
+			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, arr);
+			/* Free return values */
 			io_clrVars(f->func_vars);
 			if (ret == -1) {
 				rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
@@ -83,19 +102,18 @@ txPacket(sched_task_t *task)
 		}
 	}
 
+	rpc->call_len = htons(wlen);
+
 	/* calculate CRC */
 	rpc->call_crc ^= rpc->call_crc;
-	rpc->call_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2));
+	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
 
 	/* send reply */
-	ret = send(TASK_FD(task), buf, wlen, 0);
-	if (ret == -1)
-		LOGERR;
-	else if (ret != wlen)
-		rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "
-				"really sended %d bytes", wlen, ret);
-	else
-		LOGGER("Sended %d bytes", ret);
+	ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL);
+	if (ret == -1 || ret != wlen) {
+		/* close connection */
+		schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0);
+	}
 
 	return NULL;
 }
@@ -107,16 +125,15 @@ execCall(sched_task_t *task)
 	rpc_srv_t *s = c->cli_parent;
 	rpc_func_t *f = NULL;
 	array_t *arr = NULL;
-	u_char *buf = TASK_DATA(task);
+	u_char *buf = AIT_GET_BUF(&c->cli_buf) + TASK_VAL(task);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int argc = ntohs(rpc->call_argc);
 
-	FTRACE();
-
 	/* Go decapsulate variables ... */
-	if (!(rpc->call_req.flags & RPC_NOREPLY) && argc) {
+	if (argc) {
 		arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), 
-				TASK_DATLEN(task) - sizeof(struct tagRPCCall), argc, 1);
+				AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), 
+				argc, 1);
 		if (!arr) {
 			rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError());
 			rpc->call_argc ^= rpc->call_argc;
@@ -132,16 +149,20 @@ execCall(sched_task_t *task)
 		rpc->call_rep.ret = RPC_ERROR(-1);
 		rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 	} else {
-		LOGGER("RPC function %s from module %s", AIT_GET_STR(&f->func_name), 
-				AIT_GET_LIKE(&f->func_file, char*));
-
+		/* if client doesn't want reply */
+		argc = rpc->call_req.flags & RPC_NOREPLY;
 		rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(f, rpc, arr));
 		if (rpc->call_rep.ret == htonl(-1)) {
 			rpc->call_rep.eno = RPC_ERROR(errno);
 			rpc->call_argc ^= rpc->call_argc;
 		} else {
 			rpc->call_rep.eno ^= rpc->call_rep.eno;
-			rpc->call_argc = htons(rpc_srv_getVars(f, NULL));
+			if (argc) {
+				/* without reply */
+				io_clrVars(f->func_vars);
+				rpc->call_argc ^= rpc->call_argc;
+			} else
+				rpc->call_argc = htons(rpc_srv_getVars(f, NULL));
 		}
 	}
 
@@ -155,122 +176,114 @@ rxPacket(sched_task_t *task)
 {
 	rpc_cli_t *c = TASK_ARG(task);
 	rpc_srv_t *s = c->cli_parent;
-	u_char *buf = TASK_DATA(task);
-	int rlen;
-	u_short crc;
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
+	int len, rlen, noreply;
+	u_short crc, off = 0;
 	struct tagRPCCall *rpc;
-	struct timespec ts;
 
-	FTRACE();
-
-	memset(buf, 0, TASK_DATLEN(task));
-	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
-	if (rlen == -1) {
-		LOGERR;
-		s->srv_kill = s->srv_blob.state = kill;
+	memset(buf, 0, AIT_LEN(&c->cli_buf));
+	rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0);
+	if (rlen < 1) {
+		/* close connection */
+		schedEvent(TASK_ROOT(task), closeClient, c, 0, NULL, 0);
 		return NULL;
-	} else if (!rlen) {	/* receive EOF */
-		s->srv_kill = s->srv_blob.state = kill;
-		return NULL;
-	} else
-		LOGGER("Readed %d bytes", rlen);
+	}
 
-	if (rlen < sizeof(struct tagRPCCall)) {
-		rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
+	do {
+		/* check RPC packet */
+		if (rlen < sizeof(struct tagRPCCall)) {
+			rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
 
-		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
-		return NULL;
-	} else
-		rpc = (struct tagRPCCall*) buf;
+			schedReadSelf(task);
+			return NULL;
+		} else
+			rpc = (struct tagRPCCall*) (buf + off);
 
-	/* check integrity of packet */
-	crc = ntohs(rpc->call_crc);
-	rpc->call_crc ^= rpc->call_crc;
-	if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) {
-		rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
+		len = ntohs(rpc->call_len);
+		rlen -= len;
 
-		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
-		return NULL;
-	}
+		/* check integrity of packet */
+		crc = ntohs(rpc->call_crc);
+		rpc->call_crc ^= rpc->call_crc;
+		if (crc != crcFletcher16((u_short*) (buf + off), len / 2)) {
+			rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
 
-	/* 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);
-		goto end;
-	} else {
-		/* change socket timeout from last packet */
-		ts.tv_sec = rpc->call_session.sess_timeout;
-		ts.tv_nsec = 0;
-		schedPolling(TASK_ROOT(task), &ts, NULL);
-	}
+			off += len;
+			if (rlen < 1)
+				break;
+			else
+				continue;
+		}
 
-	/* execute RPC call */
-	schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 0, 
-			TASK_DATA(task), TASK_DATLEN(task));
+		noreply = rpc->call_req.flags & RPC_NOREPLY;
 
-end:
-	/* send RPC reply */
-	if (!(rpc->call_req.flags & RPC_NOREPLY))
-		schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
+		/* 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), off, NULL, 0);
+		}
+
+		/* send RPC reply */
+		if (!noreply)
+			schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), rpc, len);
+
+		off += len;
+	} while (rlen > 0);
+
 	/* lets get next packet */
-	schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
-			TASK_DATA(task), TASK_DATLEN(task));
+	schedReadSelf(task);
 	return NULL;
 }
 
 static void *
-rpc_srv_dispatchCall(void *arg)
+acceptClients(sched_task_t *task)
 {
-	rpc_cli_t *c = arg;
-	rpc_srv_t *s;
-	u_char *buf;
-	sched_root_task_t *root;
-	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
+	rpc_srv_t *srv = TASK_ARG(task);
+	rpc_cli_t *c = NULL;
+	register int i;
+	socklen_t salen = sizeof(io_sockaddr_t);
 
-	FTRACE();
-
-	if (!arg) {
-		rpc_SetErr(EINVAL, "Invalid parameter can`t procced RPC client");
-		return NULL;
-	} else
-		s = c->cli_parent;
-
-	/* allocate net buffer */
-	buf = malloc(s->srv_netbuf);
-	if (!buf) {
+	/* check free slots for connect */
+	for (i = 0; i < io_arraySize(srv->srv_clients) && 
+			(c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++);
+	if (c)	/* no more free slots! */
+		goto end;
+	c = malloc(sizeof(rpc_cli_t));
+	if (!c) {
 		LOGERR;
+		srv->srv_kill = kill;
 		return NULL;
-	}
-
-	root = schedBegin();
-	if (!root) {
-		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
-		free(buf);
-		return NULL;
 	} else {
-		schedTermCondition(root, kill);
-		schedPolling(root, &ts, NULL);
+		memset(c, 0, sizeof(rpc_cli_t));
+		io_arraySet(srv->srv_clients, i, c);
+		c->cli_id = i;
+		c->cli_parent = srv;
 	}
 
-	schedRead(root, rxPacket, c, c->cli_sock, buf, s->srv_netbuf);
+	/* accept client */
+	c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
+	if (c->cli_sock == -1) {
+		LOGERR;
+		io_arrayDel(srv->srv_clients, i, 42);
+		goto end;
+	} else
+		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
 
-	schedRun(root, (void*) &s->srv_kill);
-	schedEnd(&root);
+	/* alloc empty buffer */
+	AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);
 
-	shutdown(c->cli_sock, SHUT_RDWR);
-	close(c->cli_sock);
-	memset(c, 0, sizeof(rpc_cli_t));
-	free(buf);
+	schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0);
+end:
+	schedReadSelf(task);
 	return NULL;
 }
 
-
+#if 0
 static void *
 txBLOB(sched_task_t *task)
 {
@@ -278,11 +291,9 @@ txBLOB(sched_task_t *task)
 	struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf;
 	int wlen = sizeof(struct tagBLOBHdr);
 
-	FTRACE();
-
 	/* calculate CRC */
 	blob->hdr_crc ^= blob->hdr_crc;
-	blob->hdr_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2));
+	blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
 
 	/* send reply */
 	wlen = send(TASK_FD(task), buf, wlen, 0);
@@ -291,8 +302,6 @@ txBLOB(sched_task_t *task)
 	else if (wlen != sizeof(struct tagBLOBHdr))
 		rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "
 				"really sended %d bytes", sizeof(struct tagBLOBHdr), wlen);
-	else
-		LOGGER("Sended %d bytes", wlen);
 
 	return NULL;
 }
@@ -309,10 +318,8 @@ rxBLOB(sched_task_t *task)
 	u_short crc;
 	struct timespec ts;
 
-	FTRACE();
-
 	/* check for disable service at this moment? */
-	if (s->srv_blob.state == disable) {
+	if (!s || s->srv_blob.state == disable) {
 		usleep(100000);
 #ifdef HAVE_PTHREAD_YIELD
 		pthread_yield();
@@ -326,13 +333,12 @@ rxBLOB(sched_task_t *task)
 	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
 	if (rlen == -1) {
 		LOGERR;
-		s->srv_blob.state = kill;
+		c->cli_kill = kill;
 		return NULL;
-	} else if (!rlen || s->srv_kill == kill) { /* receive EOF */
-		s->srv_blob.state = kill;
+	} else if (!rlen) { /* receive EOF */
+		c->cli_kill = kill;
 		return NULL;
-	} else
-		LOGGER("Readed %d bytes", rlen);
+	}
 
 	if (rlen < sizeof(struct tagBLOBHdr)) {
 		rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet");
@@ -344,7 +350,7 @@ rxBLOB(sched_task_t *task)
 	/* check integrity of packet */
 	crc = ntohs(blob->hdr_crc);
 	blob->hdr_crc ^= blob->hdr_crc;
-	if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) {
+	if (crc != crcFletcher16((u_short*) buf, rlen / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
 		schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
 				TASK_DATA(task), TASK_DATLEN(task));
@@ -425,8 +431,6 @@ rpc_srv_dispatchVars(void *arg)
 	u_char *buf;
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 
-	FTRACE();
-
 	if (!arg) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t procced BLOB");
 		return NULL;
@@ -452,7 +456,7 @@ rpc_srv_dispatchVars(void *arg)
 
 	schedRead(root, rxBLOB, c, c->cli_sock, buf, sizeof(struct tagBLOBHdr));
 
-	schedRun(root, (void*) &s->srv_blob.state);
+	schedRun(root, (void*) &c->cli_kill);
 	schedEnd(&root);
 
 	shutdown(c->cli_sock, SHUT_RDWR);
@@ -478,8 +482,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	int n = 1;
 	io_sockaddr_t sa;
 
-	FTRACE();
-
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server");
 		return -1;
@@ -560,8 +562,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	} else
 		memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
 
-	pthread_mutex_init(&srv->srv_blob.mtx, NULL);
-
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);
@@ -584,12 +584,9 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	register int i;
 	rpc_blob_t *f;
 
-	FTRACE();
-
-	if (!srv) {
-		rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!");
+	if (!srv || srv->srv_blob.state == disable)
 		return;
-	} else
+	else
 		srv->srv_blob.state = kill;
 
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);
@@ -603,7 +600,6 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 			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;
@@ -615,12 +611,11 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 		rpc_srv_blobFree(srv, f);
 		free(f);
 	}
-	pthread_mutex_unlock(&srv->srv_blob.mtx);
 
 	AIT_FREE_VAL(&srv->srv_blob.dir);
 
-	while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY);
-	pthread_mutex_destroy(&srv->srv_blob.mtx);
+	/* at final, save disable BLOB service state */
+	srv->srv_blob.state = disable;
 }
 
 /*
@@ -635,28 +630,27 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 	socklen_t salen = sizeof(io_sockaddr_t);
 	register int i;
 	rpc_cli_t *c;
-	fd_set fds;
 	int ret;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 	pthread_attr_t attr;
+	struct pollfd pfd;
 
-	FTRACE();
-
 	if (!srv || srv->srv_blob.state == kill) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server");
 		return -1;
 	}
 
-	tv.tv_sec = srv->srv_session.sess_timeout;
-
 	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
 		LOGERR;
 		return -1;
-	}
+	} else
+		fcntl(srv->srv_blob.server.cli_sock, F_SETFL, 
+				fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK);
 
 	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
+	pfd.fd = srv->srv_blob.server.cli_sock;
+	pfd.events = POLLIN | POLLPRI;
 	/* main BLOB loop */
 	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++)
@@ -665,21 +659,17 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 		if (i >= srv->srv_numcli) {
 #ifdef HAVE_PTHREAD_YIELD
 			pthread_yield();
-#else
-			usleep(1000000);
 #endif
+			usleep(1000000);
 			continue;
 		}
 
-		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) {
+		if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
 			ret = 1;
 			break;
-		}
-		if (!ret)
+		} else if (!ret)
 			continue;
 
 		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
@@ -690,6 +680,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 			c->cli_parent = srv;
 
 		/* spawn dispatch thread for BLOB client */
+		c->cli_kill = enable;
 		if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) {
 			LOGERR;
 			continue;
@@ -701,6 +692,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 	pthread_attr_destroy(&attr);
 	return 0;
 }
+#endif
 
 
 /*
@@ -710,65 +702,30 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
  * @regProcID = ProcessID 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
  * @csHost = Host name or address for bind server, if NULL any address
  * @Port = Port for bind server, if Port == 0 default port is selected
  * 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)
+		int netBuf, const char *csHost, u_short Port)
 {
-	rpc_srv_t *srv = NULL;
 	int n = 1;
-	struct hostent *host = NULL;
+	rpc_srv_t *srv = NULL;
 	io_sockaddr_t sa;
 
-	FTRACE();
-
-	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 || !regProgID) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
 		return NULL;
 	}
+	if (!io_gethostbyname(csHost, Port, &sa))
+		return NULL;
 	if (!Port)
 		Port = RPC_DEFPORT;
 	if (!netBuf)
 		netBuf = BUFSIZ;
 	else
 		netBuf = io_align(netBuf, 1);	/* align netBuf length */
-	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.sa_family = family;
-	switch (family) {
-		case AF_INET:
-			sa.sin.sin_len = sizeof(struct sockaddr_in);
-			sa.sin.sin_port = htons(Port);
-			if (csHost)
-				memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length);
-			break;
-		case AF_INET6:
-			sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
-			sa.sin6.sin6_port = htons(Port);
-			if (csHost)
-				memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length);
-			break;
-		case AF_LOCAL:
-			sa.sun.sun_len = sizeof(struct sockaddr_un);
-			if (csHost)
-				strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path);
-			unlink(sa.sun.sun_path);
-			break;
-		default:
-			rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");
-			return NULL;
-	}
 
 	srv = malloc(sizeof(rpc_srv_t));
 	if (!srv) {
@@ -778,67 +735,69 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		memset(srv, 0, sizeof(rpc_srv_t));
 
 	srv->srv_netbuf = netBuf;
-	srv->srv_numcli = concurentClients;
 	srv->srv_session.sess_version = RPC_VERSION;
 	srv->srv_session.sess_timeout = DEF_RPC_TIMEOUT;
 	srv->srv_session.sess_program = regProgID;
 	srv->srv_session.sess_process = regProcID;
 
-	srv->srv_server.cli_tid = pthread_self();
 	srv->srv_server.cli_parent = srv;
-	memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa);
+	memcpy(&srv->srv_server.cli_sa, &sa, sizeof srv->srv_server.cli_sa);
 
+	/* init functions list */
+	TAILQ_INIT(&srv->srv_funcs);
+
+	/* init scheduler */
+	srv->srv_root = schedBegin();
+	if (!srv->srv_root) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		free(srv);
+		return NULL;
+	}
+
+	/* init pool for clients */
+	srv->srv_clients = io_arrayInit(concurentClients);
+	if (!srv->srv_clients) {
+		rpc_SetErr(io_GetErrno(), "%s", io_GetError());
+		schedEnd(&srv->srv_root);
+		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, SOCK_STREAM, 0);
 	if (srv->srv_server.cli_sock == -1) {
 		LOGERR;
+		io_arrayDestroy(&srv->srv_clients);
+		schedEnd(&srv->srv_root);
 		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.sa, 
 				srv->srv_server.cli_sa.sa.sa_len) == -1) {
 		LOGERR;
-		close(srv->srv_server.cli_sock);
-		free(srv);
-		return NULL;
+		goto err;
 	}
 
-	/* 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;
-	} else
-		memset(srv->srv_clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
-
-	pthread_mutex_init(&srv->srv_mtx, NULL);
-
-	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);
+	io_arrayDestroy(&srv->srv_clients);
+	schedEnd(&srv->srv_root);
+	free(srv);
+	return NULL;
 }
 
 /*
@@ -852,45 +811,36 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 {
 	rpc_cli_t *c;
 	register int i;
-	rpc_func_t *f;
+	rpc_func_t *f, *tmp;
 
-	FTRACE();
-
 	if (!psrv || !*psrv) {
-		rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
+		rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!");
 		return;
 	}
 
-	rpc_srv_endBLOBServer(*psrv);
-
 	/* close all clients connections & server socket */
-	for (i = 0, c = (*psrv)->srv_clients; i < (*psrv)->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa.sa_family) {
+	for (i = 0; i < io_arraySize((*psrv)->srv_clients); i++) {
+		c = io_array((*psrv)->srv_clients, i, rpc_cli_t*);
+		if (c) {
 			shutdown(c->cli_sock, SHUT_RDWR);
 			close(c->cli_sock);
+			free(c);
+			io_arrayDel((*psrv)->srv_clients, i, 0);
 		}
-	close((*psrv)->srv_server.cli_sock);
-
-	if ((*psrv)->srv_clients) {
-		free((*psrv)->srv_clients);
-		(*psrv)->srv_clients = NULL;
-		(*psrv)->srv_numcli = 0;
 	}
+	io_arrayDestroy(&(*psrv)->srv_clients);
 
+	close((*psrv)->srv_server.cli_sock);
+
 	/* detach exported calls */
-	pthread_mutex_lock(&(*psrv)->srv_mtx);
-	while ((f = (*psrv)->srv_funcs)) {
-		(*psrv)->srv_funcs = f->func_next;
+	TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) {
 		io_freeVars(&f->func_vars);
 		AIT_FREE_VAL(&f->func_name);
 		AIT_FREE_VAL(&f->func_file);
 		free(f);
 	}
-	pthread_mutex_unlock(&(*psrv)->srv_mtx);
 
-	while (pthread_mutex_trylock(&(*psrv)->srv_mtx) == EBUSY);
-	pthread_mutex_destroy(&(*psrv)->srv_mtx);
-
+	schedEnd(&(*psrv)->srv_root);
 	free(*psrv);
 	*psrv = NULL;
 }
@@ -904,78 +854,32 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 int
 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(io_sockaddr_t);
-	register int i;
-	rpc_cli_t *c;
-	fd_set fds;
+	/*
 	int ret;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
-	pthread_attr_t attr;
+	*/
 
-	FTRACE();
-
 	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;
 	}
 
-	tv.tv_sec = srv->srv_session.sess_timeout;
-
-	/* activate BLOB server worker if srv->srv_blob.state == enable */
-	rpc_srv_execBLOBServer(srv);
-
-	if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
+	if (listen(srv->srv_server.cli_sock, io_arraySize(srv->srv_clients)) == -1) {
 		LOGERR;
 		return -1;
-	}
+	} else
+		fcntl(srv->srv_server.cli_sock, F_SETFL, 
+				fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
 
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
-	/* main rpc loop */
-	while (srv->srv_kill != kill) {
-		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
-			if (!c->cli_sa.sa.sa_family)
-				break;
-		if (i >= srv->srv_numcli) {
-#ifdef HAVE_PTHREAD_YIELD
-			pthread_yield();
-#else
-			usleep(1000000);
-#endif
-			continue;
-		}
-
-		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;
-		}
-		if (!ret)
-			continue;
-
-		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
-		if (c->cli_sock == -1) {
-			LOGERR;
-			continue;
-		} else
-			c->cli_parent = srv;
-
-		/* spawn rpc client dispatcher */
-		if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchCall, c)) {
-			LOGERR;
-			continue;
-		}
+	if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		return -1;
 	}
 
-	pthread_attr_destroy(&attr);
+	/* main rpc loop */
+	schedRun(srv->srv_root, &srv->srv_kill);
 	return 0;
 }
 
-// ---------------------------------------------------------
 
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
@@ -993,14 +897,12 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct 
 	rpc_callback_t func;
 	int ret;
 
-	FTRACE();
-
 	if (!call || !rpc || !call->func_parent) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t exec function");
 		return -1;
 	}
 
-	dl = dlopen(AIT_VOID(&call->func_file), RTLD_NOW);
+	dl = dlopen(AIT_ADDR(&call->func_file), RTLD_LAZY | RTLD_GLOBAL);
 	if (!dl) {
 		rpc_SetErr(ENOENT, "Can`t attach module %s!", dlerror());
 		return -1;