--- libaitrpc/src/builtin.c 2011/08/19 08:24:13 1.2.4.2 +++ libaitrpc/src/builtin.c 2011/08/19 09:20:46 1.2.4.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.2.4.2 2011/08/19 08:24:13 misho Exp $ +* $Id: builtin.c,v 1.2.4.3 2011/08/19 09:20:46 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -55,10 +55,11 @@ rpcServerClients(rpc_func_t *call, int ic, rpc_val_t * rpc_val_t *v, *vals; rpc_cli_t *cli; register int i; - const char *str; + const char *str = NULL; char wrk[INET6_ADDRSTRLEN]; struct sockaddr_in *s; struct sockaddr_in6 *s6; + struct sockaddr_un *su; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -75,12 +76,19 @@ rpcServerClients(rpc_func_t *call, int ic, rpc_val_t * continue; } - if (AF_INET == cli->cli_sa.sa_family) { - s = (struct sockaddr_in*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); - } else { - s6 = (struct sockaddr_in6*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); + switch (cli->cli_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); + 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); + break; + case AF_LOCAL: + su = (struct sockaddr_un*) &cli->cli_sa; + str = su->sun_path; + break; } if (str) RPC_SET_STR(v++, (char*) str); @@ -235,10 +243,11 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val rpc_val_t *v, *vals; rpc_cli_t *cli; register int i; - const char *str; + const char *str = NULL; char wrk[INET6_ADDRSTRLEN]; struct sockaddr_in *s; struct sockaddr_in6 *s6; + struct sockaddr_un *su; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -255,12 +264,19 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val continue; } - if (AF_INET == cli->cli_sa.sa_family) { - s = (struct sockaddr_in*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); - } else { - s6 = (struct sockaddr_in6*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); + switch (cli->cli_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); + 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); + break; + case AF_LOCAL: + su = (struct sockaddr_un*) &cli->cli_sa; + str = su->sun_path; + break; } if (str) RPC_SET_STR(v++, (char*) str);