--- libaitrpc/src/srv.c	2012/05/16 07:24:08	1.9.2.9
+++ libaitrpc/src/srv.c	2012/05/16 07:54:49	1.9.2.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.9 2012/05/16 07:24:08 misho Exp $
+* $Id: srv.c,v 1.9.2.11 2012/05/16 07:54:49 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -168,8 +168,7 @@ execCall(sched_task_t *task)
 		}
 	}
 
-	if (arr)
-		io_arrayDestroy(&arr);
+	io_arrayDestroy(&arr);
 	return NULL;
 }
 
@@ -468,8 +467,8 @@ rpc_srv_dispatchVars(void *arg)
 	free(buf);
 	return NULL;
 }
+#endif
 
-// -------------------------------------------------
 
 /*
  * rpc_srv_initBLOBServer() - Init & create BLOB Server
@@ -501,10 +500,12 @@ 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();
+	/* init blob list */
+	TAILQ_INIT(&srv->srv_blob.blobs);
+
 	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);
@@ -519,7 +520,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);
@@ -555,15 +555,14 @@ 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));
+	}
 
 	srv->srv_blob.state = enable;	/* enable BLOB */
 	return 0;
@@ -580,34 +579,33 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 {
 	rpc_cli_t *c;
 	register int i;
-	rpc_blob_t *f;
+	rpc_blob_t *b, *tmp;
 
 	if (!srv || srv->srv_blob.state == disable)
 		return;
 	else
 		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);
-
 	/* 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)
+	for (i = 0; i < io_arraySize(srv->srv_blob.clients); i++) {
+		c = io_array(srv->srv_blob.clients, i, rpc_cli_t*);
+		if (c) {
 			shutdown(c->cli_sock, SHUT_RDWR);
-	close(srv->srv_blob.server.cli_sock);
+			close(c->cli_sock);
 
-	if (srv->srv_blob.clients) {
-		free(srv->srv_blob.clients);
-		srv->srv_blob.clients = NULL;
+			io_arrayDel(srv->srv_blob.clients, i, 42);
+		}
 	}
+	io_arrayDestroy(&srv->srv_blob.clients);
 
+	close(srv->srv_blob.server.cli_sock);
+
 	/* detach blobs */
-	while ((f = srv->srv_blob.blobs)) {
-		srv->srv_blob.blobs = f->blob_next;
-		rpc_srv_blobFree(srv, f);
-		free(f);
+	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
+		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
+
+		rpc_srv_blobFree(srv, b);
+		free(b);
 	}
 
 	AIT_FREE_VAL(&srv->srv_blob.dir);
@@ -616,6 +614,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	srv->srv_blob.state = disable;
 }
 
+#if 0
 /*
  * rpc_srv_loopBLOB() - Execute Main BLOB server loop and wait for clients requests
  *
@@ -822,8 +821,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 			shutdown(c->cli_sock, SHUT_RDWR);
 			close(c->cli_sock);
 
-			free(c);
-			io_arrayDel((*psrv)->srv_clients, i, 0);
+			io_arrayDel((*psrv)->srv_clients, i, 42);
 		}
 	}
 	io_arrayDestroy(&(*psrv)->srv_clients);
@@ -832,6 +830,8 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 
 	/* detach exported calls */
 	TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) {
+		TAILQ_REMOVE(&(*psrv)->srv_funcs, f, func_node);
+
 		io_freeVars(&f->func_vars);
 		AIT_FREE_VAL(&f->func_name);
 		free(f);