--- libaitrpc/src/srv.c	2011/11/03 15:32:21	1.6
+++ libaitrpc/src/srv.c	2012/03/13 17:10:13	1.6.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.6 2011/11/03 15:32:21 misho Exp $
+* $Id: srv.c,v 1.6.2.4 2012/03/13 17:10:13 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,158 +46,217 @@ 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_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
 	rpc_func_t *f = NULL;
-	array_t *arr;
+	u_char *buf = TASK_DATA(task);
+	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
+	int ret, wlen = sizeof(struct tagRPCCall);
+	array_t *arr = 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, 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;
+		}
+	}
+
+	/* 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);
+
+	/* 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);
+
+	/* 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 (!(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 {
+		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 (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 = TASK_DATA(task);
+	int rlen;
+	u_short crc;
 	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;
+	struct timespec ts;
 
-	if (!arg) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced RPC client ...\n");
+	memset(buf, 0, TASK_DATLEN(task));
+	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
+	if (rlen == -1) {
+		LOGERR;
+		s->srv_kill = kill;
+
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
 		return NULL;
-	} else
-		s = c->cli_parent;
+	} else if (!rlen) {	/* receive EOF */
+		s->srv_kill = kill;
 
-	buf = malloc(s->srv_netbuf);
-	if (!buf) {
-		LOGERR;
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
 		return NULL;
 	}
+	if (rlen < sizeof(struct tagRPCCall)) {
+		rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
 
-	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;
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+		return NULL;
+	} else
+		rpc = (struct tagRPCCall*) buf;
 
-			LOGERR;
-			ret = -2;
-			break;
-		}
-		memset(buf, 0, s->srv_netbuf);
-		ret = recv(c->cli_sock, buf, s->srv_netbuf, 0);
-		if (ret == -1) {
-			LOGERR;
-			ret = -3;
-			break;
-		}
-		if (!ret) {		/* receive EOF */
-			ret = 0;
-			break;
-		}
-		if (ret < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
-			ret = -4;
-			if (s->srv_kill != kill)
-				continue;
-			else
-				break;
-		} else
-			rpc = (struct tagRPCCall*) buf;
-		/* 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);
+	/* 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");
 
-		tag = rpc->call_tag;
-		hash = rpc->call_hash;
+		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+				TASK_DATA(task), TASK_DATLEN(task));
+		return NULL;
+	}
 
-		/* RPC is OK! Go decapsulate variables ... */
-		if (ntohs(rpc->call_argc)) {
-			arr = io_buffer2vars(buf + Limit, s->srv_netbuf - Limit, 
-					ntohs(rpc->call_argc), 1);
-			if (!arr) {
-				ret = -5;
-				goto makeReply;
-			}
-		} else
-			arr = 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 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 */
-			}
+	/* execute RPC call */
+	schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 0, 
+			TASK_DATA(task), TASK_DATLEN(task));
 
-		if (arr)
-			io_arrayDestroy(&arr);
+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;
+}
 
-makeReply:
-		/* Made reply */
-		memset(buf, 0, s->srv_netbuf);
-		rrpc = (struct tagRPCRet*) buf;
-		Limit = sizeof(struct tagRPCRet);
+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 };
 
-		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);
+	if (!arg) {
+		rpc_SetErr(EINVAL, "Invalid parameter can`t procced RPC client");
+		return NULL;
+	} else
+		s = c->cli_parent;
 
-		if (argc && arr) {
-			/* Go Encapsulate variables ... */
-			if ((i = io_vars2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
-				io_clrVars(f->func_vars);
-				argc = 0;
-				ret = -7;
-				rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
-				goto makeReply;
-			} else {
-				Limit += i;
+	/* allocate net buffer */
+	buf = malloc(s->srv_netbuf);
+	if (!buf) {
+		LOGERR;
+		return NULL;
+	}
 
-				io_clrVars(f->func_vars);
-			}
-		}
+	root = schedBegin();
+	if (!root) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		free(buf);
+		return NULL;
+	} else {
+		schedTermCondition(root, kill);
+		schedPolling(root, &ts, NULL);
+	}
 
-		ret = send(c->cli_sock, buf, Limit, 0);
-		if (ret == -1) {
-			LOGERR;
-			ret = -8;
-			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;
-			if (s->srv_kill != kill)
-				continue;
-			else
-				break;
-		}
-	} while (ret > -1 || s->srv_kill != kill);
+	schedRead(root, rxPacket, c, c->cli_sock, buf, s->srv_netbuf);
 
+	schedRun(root, (intptr_t*) &s->srv_kill);
+	schedEnd(&root);
+
 	shutdown(c->cli_sock, SHUT_RDWR);
 	close(c->cli_sock);
 	memset(c, 0, sizeof(rpc_cli_t));
 	free(buf);
-	return (void*) (long)ret;
+	return NULL;
 }
 
 
@@ -335,7 +394,8 @@ makeReply:
 // -------------------------------------------------
 
 /*
- * 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
@@ -348,11 +408,11 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	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;
 	}
 
@@ -361,7 +421,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		LOGERR;
 		return -1;
 	} else
-		strlcpy(srv->srv_blob.dir, diskDir, UCHAR_MAX + 1);
+		srv->srv_blob.dir = strdup(diskDir);
 
 	srv->srv_blob.server.cli_tid = pthread_self();
 	srv->srv_blob.server.cli_parent = srv;
@@ -378,6 +438,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 			strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);
 			break;
 		default:
+			free(srv->srv_blob.dir);
 			return -1;
 	}
 	memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
@@ -386,28 +447,33 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	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;
+		free(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);
+		free(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);
+		free(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);
+		free(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);
+		free(srv->srv_blob.dir);
 		return -1;
 	}
 
@@ -416,6 +482,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	if (!srv->srv_blob.clients) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
+		free(srv->srv_blob.dir);
 		return -1;
 	} else
 		memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
@@ -432,7 +499,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
  */
@@ -444,7 +512,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	rpc_blob_t *f;
 
 	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 = kill;
@@ -454,6 +522,9 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);
 
+	if (srv->srv_blob.dir)
+		free(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.sa_family)
@@ -479,7 +550,8 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 }
 
 /*
- * 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 ...
  */
@@ -492,17 +564,24 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 	fd_set fds;
 	int ret;
 	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	pthread_attr_t attr;
 
 	if (!srv || srv->srv_blob.state == kill) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n");
 		return -1;
 	}
 
+	tv.tv_sec = srv->srv_session.sess_timeout;
+
 	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.sa_family)
@@ -534,21 +613,23 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 		} 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
-			pthread_detach(c->cli_tid);
+		}
 	}
 
 	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
@@ -619,6 +700,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	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;
 
@@ -680,7 +762,8 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 }
 
 /*
- * 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
  */
@@ -717,6 +800,8 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	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(&(*psrv)->srv_mtx);
@@ -729,7 +814,8 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 }
 
 /*
- * 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 ...
  */
@@ -742,12 +828,15 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 	fd_set fds;
 	int ret;
 	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	pthread_attr_t attr;
 
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n");
 		return -1;
 	}
 
+	tv.tv_sec = srv->srv_session.sess_timeout;
+
 	/* activate BLOB server worker if srv->srv_blob.state == enable */
 	rpc_srv_execBLOBServer(srv);
 
@@ -756,6 +845,10 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		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.sa_family)
@@ -787,13 +880,14 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		} 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
-			pthread_detach(c->cli_tid);
+		}
 	}
 
+	pthread_attr_destroy(&attr);
 	return 0;
 }
 
@@ -801,6 +895,7 @@ rpc_srv_loopServer(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 calling arguments from RPC client
@@ -815,21 +910,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_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, 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;
 	}