--- libaitrpc/src/srv.c	2012/05/15 20:49:25	1.9.2.6
+++ libaitrpc/src/srv.c	2012/05/16 07:37:37	1.9.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.6 2012/05/15 20:49:25 misho Exp $
+* $Id: srv.c,v 1.9.2.10 2012/05/16 07:37:37 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -75,7 +75,6 @@ txPacket(sched_task_t *task)
 	u_char buf[USHRT_MAX] = { 0 };
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, wlen = sizeof(struct tagRPCCall);
-	array_t *arr = NULL;
 
 	/* copy RPC header */
 	memcpy(buf, TASK_DATA(task), wlen);
@@ -87,9 +86,9 @@ txPacket(sched_task_t *task)
 			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));
+			rpc->call_argc = htons(io_arraySize(f->func_vars));
 			/* Go Encapsulate variables */
-			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, arr);
+			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, f->func_vars);
 			/* Free return values */
 			io_clrVars(f->func_vars);
 			if (ret == -1) {
@@ -141,7 +140,8 @@ execCall(sched_task_t *task)
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 			return NULL;
 		}
-	}
+	} else
+		arr = NULL;
 
 	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {
 		rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
@@ -161,13 +161,14 @@ execCall(sched_task_t *task)
 				/* without reply */
 				io_clrVars(f->func_vars);
 				rpc->call_argc ^= rpc->call_argc;
-			} else
-				rpc->call_argc = htons(rpc_srv_getVars(f, NULL));
+			} else {
+				/* reply */
+				rpc->call_argc = htons(io_arraySize(f->func_vars));
+			}
 		}
 	}
 
-	if (arr)
-		io_arrayDestroy(&arr);
+	io_arrayDestroy(&arr);
 	return NULL;
 }
 
@@ -466,8 +467,8 @@ rpc_srv_dispatchVars(void *arg)
 	free(buf);
 	return NULL;
 }
+#endif
 
-// -------------------------------------------------
 
 /*
  * rpc_srv_initBLOBServer() - Init & create BLOB Server
@@ -499,10 +500,9 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	} else
 		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);
+	memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(io_sockaddr_t));
 	switch (sa.sa.sa_family) {
 		case AF_INET:
 			sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);
@@ -517,7 +517,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 			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.sa_family, SOCK_STREAM, 0);
@@ -553,25 +552,20 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		return -1;
 	}
 
-	/* allocate pool for concurent clients */
-	srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
+	/* allocate pool for concurent blob clients */
+	srv->srv_blob.clients = io_arrayInit(io_arraySize(srv->srv_clients));
 	if (!srv->srv_blob.clients) {
-		LOGERR;
+		rpc_SetErr(io_GetErrno(), "%s", io_GetError());
 		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));
+	}
 
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
-	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 */
 	return 0;
 }
 
+#if 0
 /*
  * rpc_srv_endBLOBServer() - Destroy BLOB server, close all opened sockets and free resources
  *