version 1.1.1.1.2.3, 2010/06/24 15:01:19
|
version 1.1.1.1.2.6, 2010/07/08 09:18:51
|
Line 32 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
Line 32 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) |
if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) |
return -1; |
return -1; |
|
|
for (i = 0, cli = srv->srv_clients, v = vals; i < srv->srv_numcli; cli++) { | for (i = 0, cli = srv->srv_clients, v = vals; i < srv->srv_numcli; i++, cli++) { |
if (!cli->cli_sa.sa_family) | if (!cli->cli_sa.sa_family) { |
| RPC_SET_STR(v++, ""); |
continue; |
continue; |
|
} |
|
|
if (AF_INET == cli->cli_sa.sa_family) { |
if (AF_INET == cli->cli_sa.sa_family) { |
s = (struct sockaddr_in*) &cli->cli_sa; |
s = (struct sockaddr_in*) &cli->cli_sa; |
Line 43 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
Line 45 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
s6 = (struct sockaddr_in6*) &cli->cli_sa; |
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_family, &s6->sin6_addr, wrk, sizeof wrk); |
} |
} |
if (str) { | if (str) |
RPC_SET_STR(v++, (char*) str); |
RPC_SET_STR(v++, (char*) str); |
i++; | else |
} | RPC_SET_STR(v++, "0.0.0.0"); |
} |
} |
|
|
return 0; |
return 0; |
Line 157 rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t
|
Line 159 rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t
|
else |
else |
srv = call->func_parent; |
srv = call->func_parent; |
|
|
|
pthread_mutex_lock(&srv->srv_blob.mtx); |
for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next); |
for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next); |
if (!(vals = rpc_srv_retValsCall(call, i))) | if (!(vals = rpc_srv_retValsCall(call, i))) { |
| pthread_mutex_unlock(&srv->srv_blob.mtx); |
return -1; |
return -1; |
|
} |
|
|
for (b = srv->srv_blob.blobs, v = vals; b; b = b->blob_next) |
for (b = srv->srv_blob.blobs, v = vals; b; b = b->blob_next) |
RPC_SET_U32(v++, b->blob_var); |
RPC_SET_U32(v++, b->blob_var); |
|
pthread_mutex_unlock(&srv->srv_blob.mtx); |
|
|
return 0; |
return 0; |
} |
} |
|
|
|
int |
|
rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t *iv) |
|
{ |
|
rpc_srv_t *srv; |
|
|
|
RPC_CALLBACK_CHECK_INPUT(call); |
|
RPC_CALLBACK_CHK_RETARGS(call, ic); |
|
if (!call->func_parent) |
|
return -1; |
|
else |
|
srv = call->func_parent; |
|
|
|
if (iv[0].val_type != i32) |
|
return -1; |
|
|
|
srv->srv_blob.state = RPC_GET_I32(&iv[0]); |
|
return 0; |
|
} |
|
|
|
int |
|
rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) |
|
{ |
|
rpc_srv_t *srv; |
|
rpc_val_t *v, *vals; |
|
rpc_cli_t *cli; |
|
register int i; |
|
const char *str; |
|
char wrk[INET6_ADDRSTRLEN]; |
|
struct sockaddr_in *s; |
|
struct sockaddr_in6 *s6; |
|
|
|
RPC_CALLBACK_CHECK_INPUT(call); |
|
if (!call->func_parent) |
|
return -1; |
|
else |
|
srv = call->func_parent; |
|
|
|
if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) |
|
return -1; |
|
|
|
for (i = 0, cli = srv->srv_blob.clients, v = vals; i < srv->srv_numcli; i++, cli++) { |
|
if (!cli->cli_sa.sa_family) { |
|
RPC_SET_STR(v++, ""); |
|
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); |
|
} |
|
if (str) |
|
RPC_SET_STR(v++, (char*) str); |
|
else |
|
RPC_SET_STR(v++, "0.0.0.0"); |
|
} |
|
|
|
return 0; |
|
} |