--- libaitrpc/src/builtin.c	2012/05/16 13:32:47	1.7.2.2
+++ libaitrpc/src/builtin.c	2012/05/16 13:47:16	1.7.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.7.2.2 2012/05/16 13:32:47 misho Exp $
+* $Id: builtin.c,v 1.7.2.3 2012/05/16 13:47:16 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -171,7 +171,6 @@ rpcServerShutdown(rpc_func_t *call, int ic, array_t *i
 
 /* ---------------------------------------------------- */
 
-#if 0
 int
 rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv)
 {
@@ -183,7 +182,7 @@ rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_
 	else
 		srv = call->func_parent;
 
-	srv->srv_blob.state = kill;
+	srv->srv_blob.kill = 1;
 
 	return 0;
 }
@@ -192,9 +191,8 @@ int
 rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv)
 {
 	rpc_srv_t *srv;
-	array_t *vals;
 	rpc_blob_t *b;
-	register int i;
+	register int i = 0;
 	char *val, str[64];
 	int len;
 
@@ -204,22 +202,17 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 	else
 		srv = call->func_parent;
 
-	rpc_srv_getVars(call, &vals);
-
-	if (srv->srv_blob.state == kill) {
-		AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is killed");
+	if (srv->srv_blob.kill) {
+		AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed");
 		return 1;
 	}
-	if (srv->srv_blob.state == disable) {
-		AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is disabled");
-		return 1;
-	}
 
-	for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next);
+	TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node)
+		i++;
 	len = i * sizeof str;
 
 	if (!len) {
-		AIT_SET_STR(io_array(vals, 0, ait_val_t*), "");
+		AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "");
 		return 0;
 	}
 
@@ -229,45 +222,27 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 	} else
 		memset(val, 0, len);
 
-	for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) {
+	TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node) {
 		memset(str, 0, sizeof str);
 		snprintf(str, sizeof str, "0x%0X(%lu)=%p ", b->blob_var, (u_long) b->blob_len, b->blob_data);
 		strlcat(val, str, len);
 	}
 
-	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);
+	AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val);
 	free(val);
 	return 0;
 }
 
 int
-rpcBLOBServerState(rpc_func_t *call, int ic, array_t *iv)
-{
-	rpc_srv_t *srv;
-
-	RPC_CALLBACK_CHK_ARGS(call, ic);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
-
-	if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32)
-		return -1;
-
-	srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*));
-	return 0;
-}
-
-int
 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t *iv)
 {
 	rpc_srv_t *srv;
-	array_t *vals;
 	rpc_cli_t *cli;
 	register int i;
 	int len;
 	const char *str = NULL;
-	char *val, wrk[INET6_ADDRSTRLEN];
+	char *val;
+	ait_val_t v;
 
 	RPC_CALLBACK_CHECK_INPUT(call);
 	if (!call->func_parent)
@@ -275,48 +250,33 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 	else
 		srv = call->func_parent;
 
-	rpc_srv_getVars(call, &vals);
-
-	if (srv->srv_blob.state == kill) {
-		AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is killed");
+	if (srv->srv_blob.kill) {
+		AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed");
 		return 1;
 	}
-	if (srv->srv_blob.state == disable) {
-		AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is disabled");
-		return 1;
-	}
 
-	len = srv->srv_numcli * STRSIZ;
+	len = io_arraySize(srv->srv_blob.clients) * STRSIZ;
 	if (!(val = malloc(len))) {
 		LOGERR;
 		return -1;
 	} else
 		memset(val, 0, len);
 
-	for (i = 0, cli = srv->srv_blob.clients; i < srv->srv_numcli; i++, cli++) {
-		if (!cli->cli_sa.sa.sa_family)
+	for (i = 0; i < io_arraySize(srv->srv_clients); i++) {
+		cli = io_array(srv->srv_blob.clients, i, rpc_cli_t*);
+		if (!cli)
 			continue;
 
-		switch (cli->cli_sa.sa.sa_family) {
-			case AF_INET:
-				str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.sin_addr, wrk, sizeof wrk);
-				break;
-			case AF_INET6:
-				str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk);
-				break;
-			case AF_LOCAL:
-				str = cli->cli_sa.sun.sun_path;
-				break;
-		}
+		str = io_n2addr(&cli->cli_sa, &v);
 		if (str)
 			strlcat(val, (char*) str, len);
 		else
 			strlcat(val, "0.0.0.0", len);
 		strlcat(val, " ", len);
+		AIT_FREE_VAL(&v);
 	}
 
-	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);
+	AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val);
 	free(val);
 	return 0;
 }
-#endif