--- libaitrpc/src/srv.c	2011/09/07 10:46:54	1.5.2.5
+++ 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.5.2.5 2011/09/07 10:46:54 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
@@ -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
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,283 +47,430 @@ SUCH DAMAGE.
 
 
 static void *
-rpc_srv_dispatchCall(void *arg)
+closeClient(sched_task_t *task)
 {
-	rpc_cli_t *c = arg;
-	rpc_srv_t *s;
+	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;
-	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;
-	register int i;
-	uint16_t tag = 0;
-	uint32_t hash = 0;
+	u_char buf[USHRT_MAX] = { 0 };
+	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
+	int ret, wlen = sizeof(struct tagRPCCall);
+	array_t *arr = NULL;
 
-	if (!arg) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced RPC client ...\n");
-		return NULL;
-	} else
-		s = c->cli_parent;
+	/* copy RPC header */
+	memcpy(buf, TASK_DATA(task), wlen);
 
-	buf = malloc(s->srv_netbuf);
-	if (!buf) {
-		LOGERR;
-		return NULL;
+	if (rpc->call_argc) {
+		f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash));
+		if (!f) {
+			rpc->call_argc ^= rpc->call_argc;
+			rpc->call_rep.ret = RPC_ERROR(-1);
+			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
+		} else {
+			rpc->call_argc = htons(rpc_srv_getVars(f, &arr));
+			/* Go Encapsulate variables */
+			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");
+				rpc->call_argc ^= rpc->call_argc;
+				rpc->call_rep.ret = RPC_ERROR(-1);
+				rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
+			} else
+				wlen += ret;
+		}
 	}
 
-	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;
+	rpc->call_len = htons(wlen);
 
-			LOGERR;
-			ret = -2;
-			break;
+	/* calculate CRC */
+	rpc->call_crc ^= rpc->call_crc;
+	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
+
+	/* send reply */
+	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;
+}
+
+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) + TASK_VAL(task);
+	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
+	int argc = ntohs(rpc->call_argc);
+
+	/* Go decapsulate variables ... */
+	if (argc) {
+		arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), 
+				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;
+			rpc->call_rep.ret = RPC_ERROR(-1);
+			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
+			return NULL;
 		}
-		memset(buf, 0, s->srv_netbuf);
-		ret = recv(c->cli_sock, buf, s->srv_netbuf, 0);
-		if (ret == -1) {
-			LOGERR;
-			ret = -3;
-			break;
+	}
+
+	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)))) {
+		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 {
+		/* 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;
+			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));
 		}
-		if (!ret) {		/* receive EOF */
-			ret = 0;
-			break;
-		}
-		if (ret < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
-			ret = -4;
-			break;
+	}
+
+	if (arr)
+		io_arrayDestroy(&arr);
+	return NULL;
+}
+
+static void *
+rxPacket(sched_task_t *task)
+{
+	rpc_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
+	int len, rlen, noreply;
+	u_short crc, off = 0;
+	struct tagRPCCall *rpc;
+
+	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;
+	}
+
+	do {
+		/* check RPC packet */
+		if (rlen < sizeof(struct tagRPCCall)) {
+			rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
+
+			schedReadSelf(task);
+			return NULL;
 		} else
-			rpc = (struct tagRPCCall*) buf;
+			rpc = (struct tagRPCCall*) (buf + off);
+
+		len = ntohs(rpc->call_len);
+		rlen -= len;
+
+		/* 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");
+
+			off += len;
+			if (rlen < 1)
+				break;
+			else
+				continue;
+		}
+
+		noreply = rpc->call_req.flags & RPC_NOREPLY;
+
 		/* check RPC packet session info */
 		if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
-			rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n");
-			ret = -5;
-			goto makeReply;
-		} else
-			Limit = sizeof(struct tagRPCCall);
+			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);
+		}
 
-		tag = rpc->call_tag;
-		hash = rpc->call_hash;
+		/* send RPC reply */
+		if (!noreply)
+			schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), rpc, len);
 
-		/* RPC is OK! Go decapsulate variables ... */
-		if (ntohs(rpc->call_argc)) {
-			arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, 
-					ntohs(rpc->call_argc), 1);
-			if (!arr) {
-				ret = -5;
-				goto makeReply;
-			}
-		} else
-			arr = NULL;
+		off += len;
+	} while (rlen > 0);
 
-		/* execute call */
-		argc = 0;
-		memcpy(&ses, &rpc->call_session, sizeof ses);
-		if (!(f = rpc_srv_getCall(s, ntohs(tag), ntohl(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 */
-			}
+	/* lets get next packet */
+	schedReadSelf(task);
+	return NULL;
+}
 
-		if (arr)
-			io_arrayDestroy(&arr);
+static void *
+acceptClients(sched_task_t *task)
+{
+	rpc_srv_t *srv = TASK_ARG(task);
+	rpc_cli_t *c = NULL;
+	register int i;
+	socklen_t salen = sizeof(io_sockaddr_t);
 
-makeReply:
-		/* Made reply */
-		memset(buf, 0, s->srv_netbuf);
-		rrpc = (struct tagRPCRet*) buf;
-		Limit = sizeof(struct tagRPCRet);
+	/* 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;
+	} else {
+		memset(c, 0, sizeof(rpc_cli_t));
+		io_arraySet(srv->srv_clients, i, c);
+		c->cli_id = i;
+		c->cli_parent = srv;
+	}
 
-		memcpy(&rrpc->ret_session, &ses, sizeof(rpc_sess_t));
-		rrpc->ret_tag = tag;
-		rrpc->ret_hash = hash;
-		rrpc->ret_errno = htonl(rpc_Errno);
-		rrpc->ret_retcode = htonl(ret);
-		rrpc->ret_argc = htons(argc);
+	/* 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);
 
-		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;
-			} else {
-				Limit += i;
+	/* alloc empty buffer */
+	AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);
 
-				rpc_srv_freeVals(f);
+	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)
+{
+	u_char *buf = TASK_DATA(task);
+	struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf;
+	int wlen = sizeof(struct tagBLOBHdr);
+
+	/* calculate CRC */
+	blob->hdr_crc ^= blob->hdr_crc;
+	blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
+
+	/* send reply */
+	wlen = send(TASK_FD(task), buf, wlen, 0);
+	if (wlen == -1)
+		LOGERR;
+	else if (wlen != sizeof(struct tagBLOBHdr))
+		rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "
+				"really sended %d bytes", sizeof(struct tagBLOBHdr), wlen);
+
+	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;
+	u_char *buf = TASK_DATA(task);
+	struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf;
+	int rlen;
+	u_short crc;
+	struct timespec ts;
+
+	/* check for disable service at this moment? */
+	if (!s || s->srv_blob.state == disable) {
+		usleep(100000);
+#ifdef HAVE_PTHREAD_YIELD
+		pthread_yield();
+#endif
+		schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+		return NULL;
+	}
+
+	memset(buf, 0, TASK_DATLEN(task));
+	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
+	if (rlen == -1) {
+		LOGERR;
+		c->cli_kill = kill;
+		return NULL;
+	} else if (!rlen) { /* receive EOF */
+		c->cli_kill = kill;
+		return NULL;
+	}
+
+	if (rlen < sizeof(struct tagBLOBHdr)) {
+		rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet");
+		schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+		return NULL;
+	}
+
+	/* check integrity of packet */
+	crc = ntohs(blob->hdr_crc);
+	blob->hdr_crc ^= blob->hdr_crc;
+	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));
+		return NULL;
+	}
+
+	/* check RPC packet session info */
+	if ((crc = rpc_chkPktSession(&blob->hdr_session, &s->srv_session))) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+		blob->hdr_cmd = error;
+		goto end;
+	} else {
+		/* change socket timeout from last packet */
+		ts.tv_sec = blob->hdr_session.sess_timeout;
+		ts.tv_nsec = 0;
+		schedPolling(TASK_ROOT(task), &ts, NULL);
+	}
+
+	/* 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;
+			} else
+				blob->hdr_len = htonl(b->blob_len);
+
+			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;
+		case set:
+			if ((b = rpc_srv_registerBLOB(s, ntohl(blob->hdr_len)))) {
+				/* set new BLOB variable for reply :) */
+				blob->hdr_var = htonl(b->blob_var);
 
-		ret = send(c->cli_sock, buf, Limit, 0);
-		if (ret == -1) {
-			LOGERR;
-			ret = -8;
+				/* 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;
-		}
-		if (ret != Limit) {
-			rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, "
-					"really is %d\n", Limit, ret);
-			ret = -9;
+		case unset:
+			if (rpc_srv_unregisterBLOB(s, blob->hdr_var) == -1) {
+				blob->hdr_cmd = error;
+				blob->hdr_ret = RPC_ERROR(-1);
+			}
 			break;
-		}
-	} while (ret > -1 || s->srv_kill != kill);
+		default:
+			rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob->hdr_cmd);
+			blob->hdr_cmd = error;
+			blob->hdr_ret = RPC_ERROR(-1);
+	}
 
-	shutdown(c->cli_sock, SHUT_RDWR);
-	close(c->cli_sock);
-	memset(c, 0, sizeof(rpc_cli_t));
-	free(buf);
-	return (void*) (long)ret;
+end:
+	schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), 
+			TASK_DATA(task), TASK_DATLEN(task));
+	schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
+			TASK_DATA(task), TASK_DATLEN(task));
+	return NULL;
 }
 
-
 static void *
 rpc_srv_dispatchVars(void *arg)
 {
 	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;
+	sched_root_task_t *root;
+	u_char *buf;
+	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 
 	if (!arg) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced BLOB client ...\n");
+		rpc_SetErr(EINVAL, "Invalid parameter can`t procced BLOB");
 		return NULL;
 	} else
 		s = c->cli_parent;
 
-	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();
-#endif
-			continue;
-		}
+	/* allocate net buffer */
+	buf = malloc(sizeof(struct tagBLOBHdr));
+	if (!buf) {
+		LOGERR;
+		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;
+	root = schedBegin();
+	if (!root) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		free(buf);
+		return NULL;
+	} else {
+		schedTermCondition(root, kill);
+		schedPolling(root, &ts, NULL);
+	}
 
-			LOGERR;
-			ret = -2;
-			break;
-		}
+	schedRead(root, rxBLOB, c, c->cli_sock, buf, sizeof(struct tagBLOBHdr));
 
-		memset(buf, 0, sizeof buf);
-		ret = recv(c->cli_sock, buf, sizeof buf, 0);
-		if (ret == -1) {
-			LOGERR;
-			ret = -3;
-			break;
-		}
-		/* receive EOF, disable or kill service */
-		if (!ret || s->srv_blob.state == kill || s->srv_kill == kill) {
-			ret = 0;
-			break;
-		}
-		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;
-		}
-		/* 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;
+	schedRun(root, (void*) &c->cli_kill);
+	schedEnd(&root);
 
-				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;
-
-					ret = rpc_srv_recvBLOB(c, b);
-					rpc_srv_blobUnmap(b);
-				} else
-					ret = -7;
-				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;
-		}
-
-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;
-			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;
-			break;
-		}
-	} while (ret > -1 || s->srv_kill != kill);
-
 	shutdown(c->cli_sock, SHUT_RDWR);
 	close(c->cli_sock);
 	memset(c, 0, sizeof(rpc_cli_t));
-	return (void*) ((long)ret);
+	free(buf);
+	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
@@ -333,76 +480,75 @@ 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;
+	io_sockaddr_t sa;
 
 	if (!srv) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n");
+		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");
+		rpc_SetErr(EPERM, "Already started BLOB server!");
 		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();
 	srv->srv_blob.server.cli_parent = srv;
 
 	memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);
-	switch (srv->srv_server.cli_sa.sa_family) {
+	switch (sa.sa.sa_family) {
 		case AF_INET:
-			sin->sin_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr));
+			sa.sin.sin_port = htons(Port ? Port : ntohs(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));
+			sa.sin6.sin6_port = htons(Port ? Port : ntohs(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(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);
 			break;
 		default:
+			AIT_FREE_VAL(&srv->srv_blob.dir);
 			return -1;
 	}
+	memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 
 	/* 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;
 	}
 
@@ -411,12 +557,11 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	if (!srv->srv_blob.clients) {
 		LOGERR;
 		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);
-
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);
@@ -427,7 +572,8 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 }
 
 /*
- * 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
  */
@@ -438,10 +584,9 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	register int i;
 	rpc_blob_t *f;
 
-	if (!srv) {
-		rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
+	if (!srv || srv->srv_blob.state == disable)
 		return;
-	} else
+	else
 		srv->srv_blob.state = kill;
 
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);
@@ -451,11 +596,10 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 
 	/* 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)
+		if (c->cli_sa.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;
@@ -467,144 +611,121 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 		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);
+	AIT_FREE_VAL(&srv->srv_blob.dir);
+
+	/* at final, save disable BLOB service state */
+	srv->srv_blob.state = disable;
 }
 
 /*
- * rpc_srv_loopBLOB() Execute Main BLOB server loop and wait for clients requests
+ * rpc_srv_loopBLOB() - 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)
 {
-	socklen_t salen = sizeof(struct sockaddr);
+	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;
 
 	if (!srv || srv->srv_blob.state == kill) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n");
+		rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server");
 		return -1;
 	}
 
 	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++)
-			if (!c->cli_sa.sa_family)
+			if (!c->cli_sa.sa.sa_family)
 				break;
 		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, &salen);
+		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
 		} else
 			c->cli_parent = srv;
 
-		if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) {
+		/* spawn dispatch thread for BLOB client */
+		c->cli_kill = enable;
+		if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) {
 			LOGERR;
 			continue;
-		} else
-			pthread_detach(c->cli_tid);
+		}
 	}
 
 	srv->srv_blob.state = kill;
 
+	pthread_attr_destroy(&attr);
 	return 0;
 }
+#endif
 
 
 /*
- * rpc_srv_initServer() Init & create RPC Server
+ * rpc_srv_initServer() - Init & create RPC Server
+ *
  * @regProgID = ProgramID for authentication & recognition
  * @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;
-	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;
+	io_sockaddr_t sa;
 
-	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;
-	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 = io_align(netBuf, 1);	/* align netBuf length */
 
 	srv = malloc(sizeof(rpc_srv_t));
 	if (!srv) {
@@ -614,80 +735,74 @@ 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;
-	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 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, 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;
+		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;
 }
 
 /*
- * rpc_srv_endServer() Destroy RPC server, close all opened sockets and free resources
+ * rpc_srv_endServer() - Destroy RPC server, close all opened sockets and free resources
+ *
  * @psrv = RPC Server instance
  * return: none
  */
@@ -696,118 +811,79 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 {
 	rpc_cli_t *c;
 	register int i;
-	rpc_func_t *f;
+	rpc_func_t *f, *tmp;
 
 	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_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;
-		rpc_srv_destroyVars(f);
+	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;
 }
 
 /*
- * 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 };
+	*/
 
 	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 (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);
 
-	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;
-		}
-
-		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, &salen);
-		if (c->cli_sock == -1) {
-			LOGERR;
-			continue;
-		} else
-			c->cli_parent = srv;
-
-		if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) {
-			LOGERR;
-			continue;
-		} else
-			pthread_detach(c->cli_tid);
+	if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		return -1;
 	}
 
+	/* main rpc loop */
+	schedRun(srv->srv_root, &srv->srv_kill);
 	return 0;
 }
 
-// ---------------------------------------------------------
 
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
+ *
  * @call = Register RPC call
  * @rpc = IN RPC call structure
  * @args = IN RPC calling arguments from RPC client
@@ -822,21 +898,21 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct 
 	int ret;
 
 	if (!call || !rpc || !call->func_parent) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t exec call from RPC server ...\n");
+		rpc_SetErr(EINVAL, "Invalid parameter can`t exec function");
 		return -1;
 	}
 
-	dl = dlopen((char*) (*call->func_file ? call->func_file : NULL), RTLD_NOW);
+	dl = dlopen(AIT_ADDR(&call->func_file), RTLD_LAZY | RTLD_GLOBAL);
 	if (!dl) {
-		rpc_SetErr(ENOENT, "Error:: Can`t attach module %s!\n", dlerror());
+		rpc_SetErr(ENOENT, "Can`t attach module %s!", dlerror());
 		return -1;
 	}
 
-	func = dlsym(dl, (char*) call->func_name);
+	func = dlsym(dl, (const char*) AIT_GET_STR(&call->func_name));
 	if (func)
 		ret = func(call, ntohs(rpc->call_argc), args);
 	else {
-		rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror());
+		rpc_SetErr(ENOEXEC, "Can`t find function %s!", dlerror());
 		ret = -1;
 	}