--- libaitrpc/src/builtin.c	2011/09/07 07:24:21	1.4
+++ libaitrpc/src/builtin.c	2011/10/31 14:45:26	1.4.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.4 2011/09/07 07:24:21 misho Exp $
+* $Id: builtin.c,v 1.4.2.1 2011/10/31 14:45:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -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)
@@ -299,9 +293,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)
@@ -328,21 +319,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)