version 1.1.1.1.2.9, 2011/05/02 23:07:55
|
version 1.2.4.4, 2011/08/19 14:13:31
|
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 66 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
Line 67 rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
|
else |
else |
srv = call->func_parent; |
srv = call->func_parent; |
|
|
if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) | if (!(vals = rpc_srv_returnVars(call, srv->srv_numcli))) |
return -1; |
return -1; |
|
|
for (i = 0, cli = srv->srv_clients, v = vals; i < srv->srv_numcli; i++, cli++) { |
for (i = 0, cli = srv->srv_clients, v = vals; i < srv->srv_numcli; i++, cli++) { |
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 107 rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv
|
Line 115 rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv
|
srv = call->func_parent; |
srv = call->func_parent; |
|
|
for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next); |
for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next); |
if (!(vals = rpc_srv_retValsCall(call, i))) | if (!(vals = rpc_srv_returnVars(call, i))) |
return -1; |
return -1; |
|
|
for (f = srv->srv_funcs, v = vals; f; f = f->func_next) { |
for (f = srv->srv_funcs, v = vals; f; f = f->func_next) { |
if (*f->func_name) { |
if (*f->func_name) { |
memset(str, 0, MAXPATHLEN); | memset(str, 0, sizeof str); |
snprintf(str, MAXPATHLEN, "/%s/%s()", f->func_file, f->func_name); | snprintf(str, sizeof str, "/%s/%s()", f->func_file, f->func_name); |
RPC_SET_STR(v++, str); |
RPC_SET_STR(v++, str); |
} |
} |
} |
} |
Line 133 rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t
|
Line 141 rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t
|
else |
else |
srv = call->func_parent; |
srv = call->func_parent; |
|
|
if (!(vals = rpc_srv_retValsCall(call, 4))) | if (!(vals = rpc_srv_returnVars(call, 4))) |
return -1; |
return -1; |
|
|
RPC_SET_U8(&vals[0], srv->srv_session.sess_version); |
RPC_SET_U8(&vals[0], srv->srv_session.sess_version); |
Line 156 rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t
|
Line 164 rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t
|
srv = call->func_parent; |
srv = call->func_parent; |
|
|
pthread_mutex_lock(&srv->srv_mtx); |
pthread_mutex_lock(&srv->srv_mtx); |
rpc_Kill = 1; | srv->srv_kill = kill; |
pthread_mutex_unlock(&srv->srv_mtx); |
pthread_mutex_unlock(&srv->srv_mtx); |
|
|
return 0; |
return 0; |
Line 176 rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_va
|
Line 184 rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_va
|
srv = call->func_parent; |
srv = call->func_parent; |
|
|
pthread_mutex_lock(&srv->srv_blob.mtx); |
pthread_mutex_lock(&srv->srv_blob.mtx); |
blob_Kill = 1; | srv->srv_blob.state = kill; |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
|
|
return 0; |
return 0; |
Line 198 rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t
|
Line 206 rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t
|
|
|
pthread_mutex_lock(&srv->srv_blob.mtx); |
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_returnVars(call, i))) { |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
return 0; |
return 0; |
} |
} |
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 246 rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
|
Line 255 rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
|
else |
else |
srv = call->func_parent; |
srv = call->func_parent; |
|
|
if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) | if (!(vals = rpc_srv_returnVars(call, srv->srv_numcli))) |
return -1; |
return -1; |
|
|
for (i = 0, cli = srv->srv_blob.clients, v = vals; i < srv->srv_numcli; i++, cli++) { |
for (i = 0, cli = srv->srv_blob.clients, v = vals; i < srv->srv_numcli; i++, cli++) { |
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); |