--- libaitrpc/src/srv.c	2011/08/19 09:32:38	1.3.2.8
+++ libaitrpc/src/srv.c	2011/09/07 09:10:55	1.5.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.3.2.8 2011/08/19 09:32:38 misho Exp $
+* $Id: srv.c,v 1.5.2.2 2011/09/07 09:10:55 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -51,13 +51,13 @@ rpc_srv_dispatchCall(void *arg)
 {
 	rpc_cli_t *c = arg;
 	rpc_srv_t *s;
-	rpc_val_t *vals = NULL, *v = NULL;
 	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[BUFSIZ], *data;
+	u_char *buf;
 	int ret, argc = 0, Limit = 0;
 	register int i;
 
@@ -67,183 +67,125 @@ rpc_srv_dispatchCall(void *arg)
 	} else
 		s = c->cli_parent;
 
+	buf = malloc(s->srv_netbuf);
+	if (!buf) {
+		LOGERR;
+		return NULL;
+	}
+
 	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) {
+			if (errno == EINTR && s->srv_kill != kill)
+				continue;
+
+			LOGERR;
 			ret = -2;
+			break;
 		}
-		memset(buf, 0, BUFSIZ);
-		if ((ret = read(c->cli_sock, buf, BUFSIZ)) == -1) {
+		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
+		if (!ret) {		/* receive EOF */
 			ret = 0;
 			break;
 		}
 		if (ret < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n");
+			rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
 			ret = -4;
 			break;
 		} else
 			rpc = (struct tagRPCCall*) buf;
-		// check RPC packet session info
-		if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) {
-			rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n");
+		/* 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 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");
+
+		/* 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
-				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;
-
-						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;
-				}
 			}
-		}
+		} else
+			arr = NULL;
 
+		/* execute call */
 		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");
+		if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)))) {
+			rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n");
 			ret = -6;
 		} else
-			if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)
+			if ((ret = rpc_srv_execCall(f, rpc, arr)) == -1)
 				ret = -9;
-			else
-				argc = rpc_srv_getVars(f, &vals);
+			else {
+				if (arr)
+					io_arrayDestroy(&arr);
+				argc = rpc_srv_getVars(f, &arr);
+				goto makeReply;		/* Call finish OK */
+			}
+
+		if (arr)
+			io_arrayDestroy(&arr);
+
 makeReply:
-		memset(buf, 0, BUFSIZ);
+		/* Made reply */
+		memset(buf, 0, s->srv_netbuf);
 		rrpc = (struct tagRPCRet*) buf;
 		Limit = sizeof(struct tagRPCRet);
 
 		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;
+		rrpc->ret_errno = htonl(rpc_Errno);
+		rrpc->ret_retcode = htonl(ret);
+		rrpc->ret_argc = htons(argc);
 
-		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_freeVars(f);
-				vals = NULL;
+		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(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
+				rpc_SetErr(EBADRPC, "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;
-						}
+			} else {
+				Limit += i;
 
-						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;
-						}
-
-						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;
-				}
-
-				RPC_FREE_VAL(&vals[i]);
+				rpc_srv_freeVals(f);
 			}
-			rpc_srv_freeVars(f);
-			vals = NULL;
-			argc = 0;
 		}
 
-		if ((ret = write(c->cli_sock, buf, Limit)) == -1) {
+		ret = send(c->cli_sock, buf, Limit, 0);
+		if (ret == -1) {
 			LOGERR;
 			ret = -8;
 			break;
 		}
 		if (ret != Limit) {
-			rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, "
+			rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, "
 					"really is %d\n", Limit, ret);
 			ret = -9;
 			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));
+	free(buf);
 	return (void*) (long)ret;
 }
 
@@ -254,7 +196,7 @@ 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;
@@ -266,42 +208,52 @@ 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 = read(c->cli_sock, buf, sizeof buf)) == -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;
 		} 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 +272,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,32 +286,33 @@ 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 = write(c->cli_sock, buf, sizeof buf)) == -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;
 		}
-	} 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);
 }
 
 // -------------------------------------------------
@@ -367,13 +320,12 @@ makeReply:
 /*
  * 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;
@@ -421,9 +373,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int
 	}
 
 	/* 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_family, SOCK_STREAM, 0);
 	if (srv->srv_blob.server.cli_sock == -1) {
 		LOGERR;
 		return -1;
@@ -433,6 +383,17 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int
 		close(srv->srv_blob.server.cli_sock);
 		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);
+		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);
+		return -1;
+	}
 	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa, 
 				sizeof srv->srv_blob.server.cli_sa) == -1) {
 		LOGERR;
@@ -451,14 +412,12 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int
 
 	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;
 }
 
@@ -478,7 +437,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 		rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
 		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);
@@ -491,13 +450,13 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 			shutdown(c->cli_sock, SHUT_RDWR);
 	close(srv->srv_blob.server.cli_sock);
 
+	pthread_mutex_lock(&srv->srv_blob.mtx);
 	if (srv->srv_blob.clients) {
 		free(srv->srv_blob.clients);
 		srv->srv_blob.clients = NULL;
 	}
 
 	/* 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,12 +469,12 @@ 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);
 	register int i;
@@ -524,24 +483,26 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 	int ret;
 	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 
-	if (!srv || srv->srv_blob.state == disable) {
+	if (!srv || srv->srv_blob.state == kill) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n");
 		return -1;
 	}
 
-	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;
-		}
+	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
+		LOGERR;
+		return -1;
+	}
 
 	while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
+#ifdef HAVE_PTHREAD_YIELD
+			pthread_yield();
+#else
 			usleep(1000000);
+#endif
 			continue;
 		}
 
@@ -556,11 +517,7 @@ 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, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
@@ -571,14 +528,10 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 			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);
+			pthread_detach(c->cli_tid);
 	}
 
-	srv->srv_blob.state = disable;
+	srv->srv_blob.state = kill;
 
 	return 0;
 }
@@ -589,7 +542,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
  * @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
@@ -597,7 +550,7 @@ 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;
@@ -614,6 +567,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) {
@@ -653,6 +608,7 @@ 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_program = regProgID;
@@ -674,8 +630,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	}
 
 	/* 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);
@@ -687,6 +642,19 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		free(srv);
 		return NULL;
 	}
+	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, sizeof srv->srv_server.cli_sa) == -1) {
 		LOGERR;
 		close(srv->srv_server.cli_sock);
@@ -707,9 +675,9 @@ 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;
 }
 
@@ -762,12 +730,12 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv)
 }
 
 /*
- * 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);
 	register int i;
@@ -781,18 +749,24 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		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;
-		}
+	/* 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;
+	}
+
 	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;
 		}
 
@@ -807,10 +781,7 @@ 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, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
@@ -820,12 +791,8 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		if (pthread_create(&c->cli_tid, NULL, 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);
-		}
+		} else
+			pthread_detach(c->cli_tid);
 	}
 
 	return 0;
@@ -837,12 +804,12 @@ 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;
@@ -861,7 +828,7 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct 
 
 	func = dlsym(dl, (char*) 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());
 		ret = -1;