--- libaitrpc/src/srv.c	2011/08/19 06:58:31	1.3.2.4
+++ libaitrpc/src/srv.c	2012/03/14 13:29:11	1.6.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.3.2.4 2011/08/19 06:58:31 misho Exp $
+* $Id: srv.c,v 1.6.2.7 2012/03/14 13:29:11 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
@@ -46,205 +46,236 @@ SUCH DAMAGE.
 #include "global.h"
 
 
+static void *rxPacket(sched_task_t*);
+
 static void *
-rpc_srv_dispatchCall(void *arg)
+txPacket(sched_task_t *task)
 {
-	rpc_cli_t *c = arg;
-	rpc_srv_t *s;
-	rpc_val_t *vals = NULL, *v = NULL;
+	rpc_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
 	rpc_func_t *f = NULL;
-	struct tagRPCCall *rpc;
-	struct tagRPCRet *rrpc;
-	rpc_sess_t ses = { 0 };
-	fd_set fds;
-	u_char buf[BUFSIZ], *data;
-	int ret, argc = 0, Limit = 0;
-	register int i;
+	u_char *buf = TASK_DATA(task);
+	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;
+	FTRACE();
 
-	do {
-		v = NULL;
-		FD_ZERO(&fds);
-		FD_SET(c->cli_sock, &fds);
-		ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);
-		if (ret == -1) {
-			ret = -2;
+	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, TASK_DATLEN(task) - wlen, arr);
+			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;
 		}
-		memset(buf, 0, BUFSIZ);
-		if ((ret = recv(c->cli_sock, buf, BUFSIZ, 0)) == -1) {
-			LOGERR;
-			ret = -3;
-			break;
+	}
+
+	/* calculate CRC */
+	rpc->call_crc ^= rpc->call_crc;
+	rpc->call_crc = htons(crcFletcher16((u_short*) buf, ((wlen + 1) & ~1) / 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);
+
+	/* lets get next packet */
+	schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+			TASK_DATA(task), TASK_DATLEN(task));
+	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 = TASK_DATA(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) {
+		arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), 
+				TASK_DATLEN(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;
 		}
-		if (!ret) {		// receive EOF
-			ret = 0;
-			break;
-		}
-		if (ret < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(EMSGSIZE, "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(EINVAL, "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) {
-			v = (rpc_val_t*) (buf + Limit);
-			// check RPC packet length
-			if (rpc->call_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
-				rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
-				ret = -5;
-				goto makeReply;
-			} else
-				Limit += rpc->call_argc * sizeof(rpc_val_t);
-			// RPC received variables types OK!
-			data = (u_char*) v + rpc->call_argc * sizeof(rpc_val_t);
-			for (i = 0; i < rpc->call_argc; i++) {
-				switch (v[i].val_type) {
-					case buffer:
-						if (v[i].val_len > BUFSIZ - Limit) {
-							rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
-							ret = -5;
-							goto makeReply;
-						} else
-							Limit += v[i].val_len;
+	}
 
-						v[i].val.buffer = data;
-					       	data += v[i].val_len;
-						break;
-					case string:
-						if (v[i].val_len > BUFSIZ - Limit) {
-							rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
-							ret = -5;
-							goto makeReply;
-						} else
-							Limit += v[i].val_len;
+	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 {
+		LOGGER("RPC function %s from module %s", AIT_GET_STR(&f->func_name), 
+				AIT_GET_STR(&f->func_file));
 
-						v[i].val.string = (int8_t*) data;
-						data += v[i].val_len;
-						break;
-					case blob:
-						if (s->srv_blob.state == disable) {
-							rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n");
-							ret = -5;
-							goto makeReply;
-						}
-					default:
-						break;
-				}
-			}
+		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));
 		}
+	}
 
-		argc = 0;
-		vals = NULL;
-		memcpy(&ses, &rpc->call_session, sizeof ses);
-		if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) {
-			rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n");
-			ret = -6;
-		} else
-			if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)
-				ret = -9;
-			else
-				argc = rpc_srv_getValsCall(f, &vals);
-makeReply:
-		memset(buf, 0, BUFSIZ);
-		rrpc = (struct tagRPCRet*) buf;
-		Limit = sizeof(struct tagRPCRet);
+	if (arr)
+		io_arrayDestroy(&arr);
+	return 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;
+static void *
+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;
+	struct tagRPCCall *rpc;
+	struct timespec ts;
 
-		if (argc && vals) {
-			v = (rpc_val_t*) (buf + Limit);
-			if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
-				for (i = 0; i < argc; i++)
-					RPC_FREE_VAL(&vals[i]);
-				rpc_srv_freeValsCall(f);
-				vals = NULL;
-				argc = 0;
-				ret = -7;
-				rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
-				goto makeReply;
-			} else
-				Limit += argc * sizeof(rpc_val_t);
-			memcpy(v, vals, argc * sizeof(rpc_val_t));
-			data = (u_char*) v + argc * sizeof(rpc_val_t);
-			for (ret = i = 0; i < argc; i++) {
-				switch (vals[i].val_type) {
-					case buffer:
-						if (ret || Limit + vals[i].val_len > BUFSIZ) {
-							rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");
-							rrpc->ret_retcode = ret = -7;
-							rrpc->ret_argc = 0;
-							break;
-						}
+	FTRACE();
 
-						memcpy(data, vals[i].val.buffer, vals[i].val_len);
-						data += vals[i].val_len;
-						Limit += vals[i].val_len;
-						break;
-					case string:
-						if (ret || Limit + vals[i].val_len > BUFSIZ) {
-							rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");
-							rrpc->ret_retcode = ret = -7;
-							rrpc->ret_argc = 0;
-							break;
-						}
+	memset(buf, 0, TASK_DATLEN(task));
+	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
+	if (rlen == -1) {
+		LOGERR;
+		s->srv_kill = kill;
 
-						memcpy(data, vals[i].val.string, vals[i].val_len);
-						data += vals[i].val_len;
-						Limit += vals[i].val_len;
-						break;
-					case blob:
-						if (s->srv_blob.state == disable) {
-							rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n");
-							rrpc->ret_retcode = ret = -5;
-							rrpc->ret_argc = 0;
-							break;
-						}
-					default:
-						break;
-				}
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+		return NULL;
+	} else if (!rlen) {	/* receive EOF */
+		s->srv_kill = kill;
 
-				RPC_FREE_VAL(&vals[i]);
-			}
-			rpc_srv_freeValsCall(f);
-			vals = NULL;
-			argc = 0;
-		}
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+		return NULL;
+	} else
+		LOGGER("Readed %d bytes", rlen);
 
-		if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) {
-			LOGERR;
-			ret = -8;
-			break;
-		}
-		if (ret != Limit) {
-			rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, "
-					"really is %d\n", Limit, ret);
-			ret = -9;
-			break;
-		}
-	} while (ret > -1);
+	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;
+
+	/* check integrity of packet */
+	crc = ntohs(rpc->call_crc);
+	rpc->call_crc ^= rpc->call_crc;
+	if (crc != crcFletcher16((u_short*) buf, ((rlen + 1) & ~1) / 2)) {
+		rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
+
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+		return NULL;
+	}
+
+	/* 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);
+	}
+
+	/* execute RPC call */
+	schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 0, 
+			TASK_DATA(task), TASK_DATLEN(task));
+
+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));
+	else
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+	return NULL;
+}
+
+static void *
+rpc_srv_dispatchCall(void *arg)
+{
+	rpc_cli_t *c = arg;
+	rpc_srv_t *s;
+	u_char *buf;
+	sched_root_task_t *root;
+	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
+
+	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) {
+		LOGERR;
+		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);
+	}
+
+	schedRead(root, rxPacket, c, c->cli_sock, buf, s->srv_netbuf);
+
+	schedRun(root, (void*) &s->srv_kill);
+	schedEnd(&root);
+
 	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;
 }
 
 
@@ -254,11 +285,13 @@ rpc_srv_dispatchVars(void *arg)
 	rpc_cli_t *c = arg;
 	rpc_srv_t *s;
 	rpc_blob_t *b;
-	int ret;
+	int ret = 0;
 	fd_set fds;
 	u_char buf[sizeof(struct tagBLOBHdr)];
 	struct tagBLOBHdr *blob;
 
+	FTRACE();
+
 	if (!arg) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced BLOB client ...\n");
 		return NULL;
@@ -266,42 +299,55 @@ rpc_srv_dispatchVars(void *arg)
 		s = c->cli_parent;
 
 	do {
-		// check for disable service at this moment?
-		if (s->srv_blob.state == disable) {
-			ret = 0;
-			break;
+		/* 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;
 		}
 
 		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;
 		}
 
 		memset(buf, 0, sizeof buf);
-		if ((ret = recv(c->cli_sock, buf, sizeof buf, 0)) == -1) {
+		ret = recv(c->cli_sock, buf, sizeof buf, 0);
+		if (ret == -1) {
 			LOGERR;
 			ret = -3;
 			break;
 		}
-		if (!ret || s->srv_blob.state == disable) {	// receive EOF or disable service
+		/* 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(EMSGSIZE, "Error:: too short BLOB packet ...\n");
+			rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n");
 			ret = -4;
-			break;
+			if (s->srv_kill != kill && s->srv_blob.state != kill)
+				continue;
+			else
+				break;
 		} else
 			blob = (struct tagBLOBHdr*) buf;
-		// check BLOB packet session info
+		/* 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 ...
+		/* Go to proceed packet ... */
 		switch (blob->hdr_cmd) {
 			case get:
 				if (!(b = rpc_srv_getBLOB(s, blob->hdr_var))) {
@@ -320,7 +366,7 @@ rpc_srv_dispatchVars(void *arg)
 				break;
 			case set:
 				if ((b = rpc_srv_registerBLOB(s, blob->hdr_len))) {
-					// set new BLOB variable for reply :)
+					/* set new BLOB variable for reply :) */
 					blob->hdr_var = b->blob_var;
 
 					ret = rpc_srv_recvBLOB(c, b);
@@ -334,136 +380,150 @@ rpc_srv_dispatchVars(void *arg)
 					ret = -7;
 				break;
 			default:
-				rpc_SetErr(EINVAL, "Error:: unsupported BLOB command (%d)...\n", 
+				rpc_SetErr(EPROCUNAVAIL, "Error:: unsupported BLOB command (%d)...\n", 
 						blob->hdr_cmd);
 				ret = -7;
 		}
 
 makeReply:
-		// Replay to client!
+		/* Replay to client! */
 		blob->hdr_cmd = ret < 0 ? error : ok;
 		blob->hdr_ret = ret;
-		if ((ret = send(c->cli_sock, buf, sizeof buf, 0)) == -1) {
+		ret = send(c->cli_sock, buf, sizeof buf, 0);
+		if (ret == -1) {
 			LOGERR;
 			ret = -8;
 			break;
 		}
 		if (ret != sizeof buf) {
-			rpc_SetErr(ECANCELED, "Error:: in send BLOB reply, should be send %d bytes, "
+			rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, "
 					"really is %d\n", sizeof buf, ret);
 			ret = -9;
-			break;
+			if (s->srv_kill != kill && s->srv_blob.state != kill)
+				continue;
+			else
+				break;
 		}
-	} while (ret > -1);
+	} 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;
+	return (void*) ((long)ret);
 }
 
 // -------------------------------------------------
 
 /*
- * rpc_srv_initBLOBServer() Init & create BLOB Server
+ * rpc_srv_initBLOBServer() - Init & create BLOB Server
+ *
  * @srv = RPC server instance
- * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW
  * @Port = Port for bind server, if Port == 0 default port is selected
  * @diskDir = Disk place for BLOB file objects
  * return: -1 == error or 0 bind and created BLOB server instance
  */
 int
-rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int sockType, u_short Port, const char *diskDir)
+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;
 
+	FTRACE();
+
 	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_type = sockType ? sockType : SOCK_STREAM;
-	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, 
-			srv->srv_blob.server.cli_type, 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;
 	}
-	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa, 
-				sizeof srv->srv_blob.server.cli_sa) == -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.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;
+	}
 
 	/* allocate pool for concurent clients */
 	srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
 	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);
 
-	pthread_mutex_lock(&srv->srv_mtx);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 1);
-	pthread_mutex_unlock(&srv->srv_mtx);
+	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
+	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
  */
@@ -474,30 +534,34 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	register int i;
 	rpc_blob_t *f;
 
+	FTRACE();
+
 	if (!srv) {
-		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;
 	} else
-		srv->srv_blob.state = disable;
+		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);
 
+	AIT_FREE_VAL(&srv->srv_blob.dir);
+
 	/* 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;
 	}
 
 	/* detach blobs */
-	pthread_mutex_lock(&srv->srv_blob.mtx);
 	while ((f = srv->srv_blob.blobs)) {
 		srv->srv_blob.blobs = f->blob_next;
 		rpc_srv_blobFree(srv, f);
@@ -510,39 +574,50 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 }
 
 /*
- * rpc_srv_execBLOBServer() 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_execBLOBServer(rpc_srv_t * __restrict srv)
+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;
 
-	if (!srv || srv->srv_blob.state == disable) {
+	FTRACE();
+
+	if (!srv || srv->srv_blob.state == kill) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n");
 		return -1;
 	}
 
-	printf("server.cli_type=%d:%d\n", srv->srv_blob.server.cli_type, SOCK_STREAM);
-	if (srv->srv_blob.server.cli_type == SOCK_STREAM || 
-			srv->srv_blob.server.cli_type == SOCK_SEQPACKET)
-		if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
-			LOGERR;
-			return -1;
-		}
+	tv.tv_sec = srv->srv_session.sess_timeout;
 
-	while (!blob_Kill && !rpc_Kill) {
+	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
+		LOGERR;
+		return -1;
+	}
+
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+	/* 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
 			continue;
 		}
 
@@ -557,40 +632,34 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		if (srv->srv_blob.server.cli_type == SOCK_STREAM || 
-				srv->srv_blob.server.cli_type == SOCK_SEQPACKET)
-			c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen);
-		else
-			c->cli_sock = dup(srv->srv_blob.server.cli_sock);
+		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 */
+		if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) {
 			LOGERR;
 			continue;
-		} else
-			if (srv->srv_blob.server.cli_type == SOCK_STREAM || 
-					srv->srv_blob.server.cli_type == SOCK_SEQPACKET)
-				pthread_detach(c->cli_tid);
-			else
-				pthread_join(c->cli_tid, NULL);
+		}
 	}
 
-	srv->srv_blob.state = disable;
+	srv->srv_blob.state = kill;
 
+	pthread_attr_destroy(&attr);
 	return 0;
 }
 
 
 /*
- * 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
- * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW
+ * @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
@@ -598,16 +667,15 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
  */
 rpc_srv_t *
 rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, 
-		int sockType, u_short family, const char *csHost, u_short Port)
+		int netBuf, u_short family, 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;
+	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");
@@ -615,6 +683,8 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	}
 	if (!Port)
 		Port = RPC_DEFPORT;
+	if (!netBuf)
+		netBuf = BUFSIZ;
 	if (csHost && family != AF_LOCAL) {
 		host = gethostbyname2(csHost, family);
 		if (!host) {
@@ -623,24 +693,25 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		}
 	}
 	memset(&sa, 0, sizeof sa);
-	sa.sa_family = family;
+	sa.sa.sa_family = family;
 	switch (family) {
 		case AF_INET:
-			sin->sin_len = sizeof(struct sockaddr_in);
-			sin->sin_port = htons(Port);
+			sa.sin.sin_len = sizeof(struct sockaddr_in);
+			sa.sin.sin_port = htons(Port);
 			if (csHost)
-				memcpy(&sin->sin_addr, host->h_addr, host->h_length);
+				memcpy(&sa.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);
+			sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
+			sa.sin6.sin6_port = htons(Port);
 			if (csHost)
-				memcpy(&sin6->sin6_addr, host->h_addr, host->h_length);
+				memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length);
 			break;
 		case AF_LOCAL:
-			sun->sun_len = sizeof(struct sockaddr_un);
+			sa.sun.sun_len = sizeof(struct sockaddr_un);
 			if (csHost)
-				strlcpy(sun->sun_path, csHost, sizeof sun->sun_path);
+				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");
@@ -654,29 +725,19 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	} else
 		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 sa);
 
 	/* create server socket */
-	srv->srv_server.cli_type = sockType ? sockType : SOCK_STREAM;
-	srv->srv_server.cli_sock = socket(family, srv->srv_server.cli_type, 0);
+	srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);
 	if (srv->srv_server.cli_sock == -1) {
 		LOGERR;
 		free(srv);
@@ -688,12 +749,26 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		free(srv);
 		return NULL;
 	}
-	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa, sizeof srv->srv_server.cli_sa) == -1) {
+	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;
 	}
+	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;
+	}
+	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));
@@ -708,92 +783,114 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	pthread_mutex_init(&srv->srv_mtx, NULL);
 
 	rpc_srv_registerCall(srv, NULL, CALL_SRVSHUTDOWN, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 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;
 }
 
 /*
- * 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) {
+	FTRACE();
+
+	if (!psrv || !*psrv) {
 		rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
 		return;
 	}
 
-	rpc_srv_endBLOBServer(srv);
+	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) {
+	for (i = 0, c = (*psrv)->srv_clients; i < (*psrv)->srv_numcli && c; i++, c++)
+		if (c->cli_sa.sa.sa_family) {
 			shutdown(c->cli_sock, SHUT_RDWR);
 			close(c->cli_sock);
 		}
-	close(srv->srv_server.cli_sock);
+	close((*psrv)->srv_server.cli_sock);
 
-	if (srv->srv_clients) {
-		free(srv->srv_clients);
-		srv->srv_clients = NULL;
-		srv->srv_numcli = 0;
+	if ((*psrv)->srv_clients) {
+		free((*psrv)->srv_clients);
+		(*psrv)->srv_clients = NULL;
+		(*psrv)->srv_numcli = 0;
 	}
 
 	/* detach exported calls */
-	pthread_mutex_lock(&srv->srv_mtx);
-	while ((f = srv->srv_funcs)) {
-		srv->srv_funcs = f->func_next;
+	pthread_mutex_lock(&(*psrv)->srv_mtx);
+	while ((f = (*psrv)->srv_funcs)) {
+		(*psrv)->srv_funcs = f->func_next;
+		io_freeVars(&f->func_vars);
+		AIT_FREE_VAL(&f->func_name);
+		AIT_FREE_VAL(&f->func_file);
 		free(f);
 	}
-	pthread_mutex_unlock(&srv->srv_mtx);
+	pthread_mutex_unlock(&(*psrv)->srv_mtx);
 
-	while (pthread_mutex_trylock(&srv->srv_mtx) == EBUSY);
-	pthread_mutex_destroy(&srv->srv_mtx);
+	while (pthread_mutex_trylock(&(*psrv)->srv_mtx) == EBUSY);
+	pthread_mutex_destroy(&(*psrv)->srv_mtx);
 
-	free(srv);
-	srv = NULL;
+	free(*psrv);
+	*psrv = NULL;
 }
 
 /*
- * rpc_srv_execServer() 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_execServer(rpc_srv_t * __restrict srv)
+rpc_srv_loopServer(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;
 
+	FTRACE();
+
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n");
 		return -1;
 	}
 
-	if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET)
-		if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
-			LOGERR;
-			return -1;
-		}
+	tv.tv_sec = srv->srv_session.sess_timeout;
 
-	while (!rpc_Kill) {
+	/* activate BLOB server worker if srv->srv_blob.state == enable */
+	rpc_srv_execBLOBServer(srv);
+
+	if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
+		LOGERR;
+		return -1;
+	}
+
+	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_family)
+			if (!c->cli_sa.sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
+#ifdef HAVE_PTHREAD_YIELD
+			pthread_yield();
+#else
 			usleep(1000000);
+#endif
 			continue;
 		}
 
@@ -808,27 +905,21 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET)
-			c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen);
-		else
-			c->cli_sock = dup(srv->srv_server.cli_sock);
+		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;
 
-		if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) {
+		/* spawn rpc client dispatcher */
+		if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchCall, c)) {
 			LOGERR;
 			continue;
-		} else {
-			if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET)
-				pthread_detach(c->cli_tid);
-			else
-				pthread_join(c->cli_tid, NULL);
 		}
 	}
 
+	pthread_attr_destroy(&attr);
 	return 0;
 }
 
@@ -836,35 +927,38 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
+ *
  * @call = Register RPC call
  * @rpc = IN RPC call structure
- * @args = IN RPC call array of rpc values
+ * @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, 
-		rpc_val_t * __restrict args)
+		array_t * __restrict args)
 {
 	void *dl;
 	rpc_callback_t func;
 	int ret;
 
+	FTRACE();
+
 	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_VOID(&call->func_file), RTLD_NOW);
 	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, rpc->call_argc, args);
+		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;
 	}