--- libaitrpc/src/builtin.c	2012/05/14 08:39:05	1.7
+++ libaitrpc/src/builtin.c	2012/05/16 13:32:47	1.7.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.7 2012/05/14 08:39:05 misho Exp $
+* $Id: builtin.c,v 1.7.2.2 2012/05/16 13:32:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -52,12 +52,12 @@ int
 rpcServerClients(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)
@@ -65,38 +65,28 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv
 	else
 		srv = call->func_parent;
 
-	rpc_srv_getVars(call, &vals);
-
-	len = srv->srv_numcli * STRSIZ;
+	len = io_arraySize(srv->srv_clients) * STRSIZ;
 	if (!(val = malloc(len))) {
 		LOGERR;
 		return -1;
 	} else
 		memset(val, 0, len);
 
-	for (i = 0, cli = srv->srv_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_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;
 }
@@ -105,9 +95,8 @@ int
 rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
 {
 	rpc_srv_t *srv;
-	array_t *vals;
 	rpc_func_t *f;
-	register int i;
+	register int i = 0;
 	int len;
 	char *val, str[MAXPATHLEN];
 
@@ -117,31 +106,25 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
 	else
 		srv = call->func_parent;
 
-	for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next);
+	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
+		i++;
 	len = i * STRSIZ;
 
-	rpc_srv_getVars(call, &vals);
-
 	if (!(val = malloc(len))) {
 		LOGERR;
 		return -1;
 	} else
 		memset(val, 0, len);
 
-	for (f = srv->srv_funcs, i = 0; f; f = f->func_next) {
-		if (*AIT_GET_STR(&f->func_name)) {
+	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
+		if (AIT_ADDR(&f->func_name)) {
 			memset(str, 0, sizeof str);
-			if (AIT_ISEMPTY(&f->func_file))
-				snprintf(str, sizeof str, "/*/%s(%d); ", 
-						AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars));
-			else
-				snprintf(str, sizeof str, "/%s/%s(%d); ", AIT_GET_STR(&f->func_file), 
-						AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars));
+			snprintf(str, sizeof str, "/%hu/0x%p(%d); ", AIT_KEY(&f->func_name), 
+					AIT_ADDR(&f->func_name), io_arraySize(f->func_vars));
 			strlcat(val, str, len);
 		}
-	}
 
-	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);
+	AIT_SET_STR(io_array(f->func_vars, 0, ait_val_t*), val);
 	free(val);
 	return 0;
 }
@@ -150,7 +133,6 @@ int
 rpcServerSessions(rpc_func_t *call, int ic, array_t *iv)
 {
 	rpc_srv_t *srv;
-	array_t *vals;
 	ait_val_t *v;
 
 	RPC_CALLBACK_CHECK_INPUT(call);
@@ -159,16 +141,14 @@ rpcServerSessions(rpc_func_t *call, int ic, array_t *i
 	else
 		srv = call->func_parent;
 
-	rpc_srv_getVars(call, &vals);
-
-	v = io_array(vals, 0, ait_val_t*);
+	v = io_array(call->func_vars, 0, ait_val_t*);
 	AIT_SET_U8(v, srv->srv_session.sess_version);
-	v = io_array(vals, 1, ait_val_t*);
+	v = io_array(call->func_vars, 1, ait_val_t*);
 	AIT_SET_U32(v, srv->srv_session.sess_program);
-	v = io_array(vals, 2, ait_val_t*);
-	AIT_SET_U32(v, srv->srv_session.sess_process);
-	v = io_array(vals, 3, ait_val_t*);
-	AIT_SET_I32(v, srv->srv_numcli);
+	v = io_array(call->func_vars, 2, ait_val_t*);
+	AIT_SET_U8(v, srv->srv_session.sess_process);
+	v = io_array(call->func_vars, 3, ait_val_t*);
+	AIT_SET_I32(v, io_arraySize(srv->srv_clients));
 
 	return 0;
 }
@@ -184,13 +164,14 @@ rpcServerShutdown(rpc_func_t *call, int ic, array_t *i
 	else
 		srv = call->func_parent;
 
-	srv->srv_kill = kill;
+	srv->srv_kill = 1;
 
 	return 0;
 }
 
-// ----------------------------------------------------
+/* ---------------------------------------------------- */
 
+#if 0
 int
 rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv)
 {
@@ -338,3 +319,4 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 	free(val);
 	return 0;
 }
+#endif