version 1.2.4.2, 2011/08/19 08:24:13
|
version 1.2.4.3, 2011/08/19 09:20:46
|
Line 55 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
Line 55 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
rpc_val_t *v, *vals; |
rpc_val_t *v, *vals; |
rpc_cli_t *cli; |
rpc_cli_t *cli; |
register int i; |
register int i; |
const char *str; | const char *str = NULL; |
char wrk[INET6_ADDRSTRLEN]; |
char wrk[INET6_ADDRSTRLEN]; |
struct sockaddr_in *s; |
struct sockaddr_in *s; |
struct sockaddr_in6 *s6; |
struct sockaddr_in6 *s6; |
|
struct sockaddr_un *su; |
|
|
RPC_CALLBACK_CHECK_INPUT(call); |
RPC_CALLBACK_CHECK_INPUT(call); |
if (!call->func_parent) |
if (!call->func_parent) |
Line 75 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
Line 76 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
continue; |
continue; |
} |
} |
|
|
if (AF_INET == cli->cli_sa.sa_family) { | switch (cli->cli_sa.sa_family) { |
s = (struct sockaddr_in*) &cli->cli_sa; | case AF_INET: |
str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); | s = (struct sockaddr_in*) &cli->cli_sa; |
} else { | str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); |
s6 = (struct sockaddr_in6*) &cli->cli_sa; | break; |
str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); | 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) |
if (str) |
RPC_SET_STR(v++, (char*) str); |
RPC_SET_STR(v++, (char*) str); |
Line 235 rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
|
Line 243 rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
|
rpc_val_t *v, *vals; |
rpc_val_t *v, *vals; |
rpc_cli_t *cli; |
rpc_cli_t *cli; |
register int i; |
register int i; |
const char *str; | const char *str = NULL; |
char wrk[INET6_ADDRSTRLEN]; |
char wrk[INET6_ADDRSTRLEN]; |
struct sockaddr_in *s; |
struct sockaddr_in *s; |
struct sockaddr_in6 *s6; |
struct sockaddr_in6 *s6; |
|
struct sockaddr_un *su; |
|
|
RPC_CALLBACK_CHECK_INPUT(call); |
RPC_CALLBACK_CHECK_INPUT(call); |
if (!call->func_parent) |
if (!call->func_parent) |
Line 255 rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
|
Line 264 rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
|
continue; |
continue; |
} |
} |
|
|
if (AF_INET == cli->cli_sa.sa_family) { | switch (cli->cli_sa.sa_family) { |
s = (struct sockaddr_in*) &cli->cli_sa; | case AF_INET: |
str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); | s = (struct sockaddr_in*) &cli->cli_sa; |
} else { | str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); |
s6 = (struct sockaddr_in6*) &cli->cli_sa; | break; |
str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); | 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) |
if (str) |
RPC_SET_STR(v++, (char*) str); |
RPC_SET_STR(v++, (char*) str); |