--- libaitrpc/src/builtin.c	2011/09/07 00:53:06	1.3.2.11
+++ libaitrpc/src/builtin.c	2012/05/14 08:39:05	1.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.3.2.11 2011/09/07 00:53:06 misho Exp $
+* $Id: builtin.c,v 1.7 2012/05/14 08:39:05 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -58,9 +58,6 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv
 	int len;
 	const char *str = NULL;
 	char *val, wrk[INET6_ADDRSTRLEN];
-	struct sockaddr_in *s;
-	struct sockaddr_in6 *s6;
-	struct sockaddr_un *su;
 
 	RPC_CALLBACK_CHECK_INPUT(call);
 	if (!call->func_parent)
@@ -78,21 +75,18 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv
 		memset(val, 0, len);
 
 	for (i = 0, cli = srv->srv_clients; i < srv->srv_numcli; i++, cli++) {
-		if (!cli->cli_sa.sa_family)
+		if (!cli->cli_sa.sa.sa_family)
 			continue;
 
-		switch (cli->cli_sa.sa_family) {
+		switch (cli->cli_sa.sa.sa_family) {
 			case AF_INET:
-				s = (struct sockaddr_in*) &cli->cli_sa;
-				str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk);
+				str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.sin_addr, wrk, sizeof wrk);
 				break;
 			case AF_INET6:
-				s6 = (struct sockaddr_in6*) &cli->cli_sa;
-				str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk);
+				str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk);
 				break;
 			case AF_LOCAL:
-				su = (struct sockaddr_un*) &cli->cli_sa;
-				str = su->sun_path;
+				str = cli->cli_sa.sun.sun_path;
 				break;
 		}
 		if (str)
@@ -135,10 +129,14 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
 		memset(val, 0, len);
 
 	for (f = srv->srv_funcs, i = 0; f; f = f->func_next) {
-		if (*f->func_name) {
+		if (*AIT_GET_STR(&f->func_name)) {
 			memset(str, 0, sizeof str);
-			snprintf(str, sizeof str, "/%s/%s(%d); ", 
-					f->func_file, f->func_name, io_arraySize(f->func_vars));
+			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));
 			strlcat(val, str, len);
 		}
 	}
@@ -186,9 +184,7 @@ rpcServerShutdown(rpc_func_t *call, int ic, array_t *i
 	else
 		srv = call->func_parent;
 
-	pthread_mutex_lock(&srv->srv_mtx);
 	srv->srv_kill = kill;
-	pthread_mutex_unlock(&srv->srv_mtx);
 
 	return 0;
 }
@@ -206,9 +202,7 @@ rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_
 	else
 		srv = call->func_parent;
 
-	pthread_mutex_lock(&srv->srv_blob.mtx);
 	srv->srv_blob.state = kill;
-	pthread_mutex_unlock(&srv->srv_blob.mtx);
 
 	return 0;
 }
@@ -240,7 +234,6 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 		return 1;
 	}
 
-	pthread_mutex_lock(&srv->srv_blob.mtx);
 	for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next);
 	len = i * sizeof str;
 
@@ -251,7 +244,6 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 
 	if (!(val = malloc(len))) {
 		LOGERR;
-		pthread_mutex_unlock(&srv->srv_blob.mtx);
 		return -1;
 	} else
 		memset(val, 0, len);
@@ -264,7 +256,6 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 
 	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);
 	free(val);
-	pthread_mutex_unlock(&srv->srv_blob.mtx);
 	return 0;
 }
 
@@ -282,9 +273,7 @@ rpcBLOBServerState(rpc_func_t *call, int ic, array_t *
 	if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32)
 		return -1;
 
-	pthread_mutex_lock(&srv->srv_mtx);
 	srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*));
-	pthread_mutex_unlock(&srv->srv_mtx);
 	return 0;
 }
 
@@ -298,9 +287,6 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 	int len;
 	const char *str = NULL;
 	char *val, wrk[INET6_ADDRSTRLEN];
-	struct sockaddr_in *s;
-	struct sockaddr_in6 *s6;
-	struct sockaddr_un *su;
 
 	RPC_CALLBACK_CHECK_INPUT(call);
 	if (!call->func_parent)
@@ -327,21 +313,18 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 		memset(val, 0, len);
 
 	for (i = 0, cli = srv->srv_blob.clients; i < srv->srv_numcli; i++, cli++) {
-		if (!cli->cli_sa.sa_family)
+		if (!cli->cli_sa.sa.sa_family)
 			continue;
 
-		switch (cli->cli_sa.sa_family) {
+		switch (cli->cli_sa.sa.sa_family) {
 			case AF_INET:
-				s = (struct sockaddr_in*) &cli->cli_sa;
-				str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk);
+				str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.sin_addr, wrk, sizeof wrk);
 				break;
 			case AF_INET6:
-				s6 = (struct sockaddr_in6*) &cli->cli_sa;
-				str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk);
+				str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk);
 				break;
 			case AF_LOCAL:
-				su = (struct sockaddr_un*) &cli->cli_sa;
-				str = su->sun_path;
+				str = cli->cli_sa.sun.sun_path;
 				break;
 		}
 		if (str)