version 1.3.2.4, 2011/09/01 11:39:26
|
version 1.3.2.8, 2011/09/06 23:58:48
|
Line 55 rpcServerClients(rpc_func_t *call, int ic, array_t *iv
|
Line 55 rpcServerClients(rpc_func_t *call, int ic, array_t *iv
|
array_t *vals; |
array_t *vals; |
rpc_cli_t *cli; |
rpc_cli_t *cli; |
register int i; |
register int i; |
|
int len; |
const char *str = NULL; |
const char *str = NULL; |
char *val, wrk[INET6_ADDRSTRLEN]; |
char *val, wrk[INET6_ADDRSTRLEN]; |
struct sockaddr_in *s; |
struct sockaddr_in *s; |
Line 69 rpcServerClients(rpc_func_t *call, int ic, array_t *iv
|
Line 70 rpcServerClients(rpc_func_t *call, int ic, array_t *iv
|
|
|
rpc_srv_getVars(call, &vals); |
rpc_srv_getVars(call, &vals); |
|
|
if (!(val = calloc(srv->srv_numcli, STRSIZ))) { | len = srv->srv_numcli * STRSIZ; |
| if (!(val = malloc(len))) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} else |
} else |
memset(val, 0, srv->srv_numcli * STRSIZ); | memset(val, 0, len); |
|
|
for (i = 0, cli = srv->srv_clients; i < srv->srv_numcli; i++, cli++) { |
for (i = 0, cli = srv->srv_clients; i < srv->srv_numcli; i++, cli++) { |
if (!cli->cli_sa.sa_family) |
if (!cli->cli_sa.sa_family) |
Line 94 rpcServerClients(rpc_func_t *call, int ic, array_t *iv
|
Line 96 rpcServerClients(rpc_func_t *call, int ic, array_t *iv
|
break; |
break; |
} |
} |
if (str) |
if (str) |
strlcat(val, (char*) str, srv->srv_numcli * STRSIZ); | strlcat(val, (char*) str, len); |
else |
else |
strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ); | strlcat(val, "0.0.0.0", len); |
strlcat(val, " ", srv->srv_numcli * STRSIZ); | strlcat(val, " ", len); |
} |
} |
|
|
AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); |
AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); |
Line 218 rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
|
Line 220 rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
|
array_t *vals; |
array_t *vals; |
rpc_blob_t *b; |
rpc_blob_t *b; |
register int i; |
register int i; |
char *val, str[12]; | char *val, str[64]; |
int len; |
int len; |
|
|
RPC_CALLBACK_CHECK_INPUT(call); |
RPC_CALLBACK_CHECK_INPUT(call); |
Line 235 rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
|
Line 237 rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
|
|
|
if (!(val = malloc(len))) { |
if (!(val = malloc(len))) { |
LOGERR; |
LOGERR; |
|
pthread_mutex_unlock(&srv->srv_blob.mtx); |
return -1; |
return -1; |
} else |
} else |
memset(val, 0, len); |
memset(val, 0, len); |
|
|
for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) { |
for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) { |
memset(str, 0, sizeof str); |
memset(str, 0, sizeof str); |
snprintf(str, sizeof str, "0x%0X ", b->blob_var); | snprintf(str, sizeof str, "0x%0X(%lu)=%p ", b->blob_var, b->blob_len, b->blob_data); |
strlcat(val, str, len); |
strlcat(val, str, len); |
} |
} |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
|
|
|
AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); |
AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); |
free(val); |
free(val); |
|
pthread_mutex_unlock(&srv->srv_blob.mtx); |
return 0; |
return 0; |
} |
} |
|
|
Line 265 rpcBLOBServerState(rpc_func_t *call, int ic, array_t *
|
Line 268 rpcBLOBServerState(rpc_func_t *call, int ic, array_t *
|
if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32) |
if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32) |
return -1; |
return -1; |
|
|
|
pthread_mutex_lock(&srv->srv_mtx); |
srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*)); |
srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*)); |
|
pthread_mutex_unlock(&srv->srv_mtx); |
return 0; |
return 0; |
} |
} |
|
|
Line 276 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
|
Line 281 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
|
array_t *vals; |
array_t *vals; |
rpc_cli_t *cli; |
rpc_cli_t *cli; |
register int i; |
register int i; |
|
int len; |
const char *str = NULL; |
const char *str = NULL; |
char *val, wrk[INET6_ADDRSTRLEN]; |
char *val, wrk[INET6_ADDRSTRLEN]; |
struct sockaddr_in *s; |
struct sockaddr_in *s; |
Line 290 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
|
Line 296 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
|
|
|
rpc_srv_getVars(call, &vals); |
rpc_srv_getVars(call, &vals); |
|
|
if (!(val = calloc(srv->srv_numcli, STRSIZ))) { | len = srv->srv_numcli * STRSIZ; |
| if (!(val = malloc(len))) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} else |
} else |
memset(val, 0, srv->srv_numcli * STRSIZ); | memset(val, 0, len); |
|
|
for (i = 0, cli = srv->srv_blob.clients; i < srv->srv_numcli; i++, cli++) { |
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_family) |
Line 315 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
|
Line 322 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
|
break; |
break; |
} |
} |
if (str) |
if (str) |
strlcat(val, (char*) str, srv->srv_numcli * STRSIZ); | strlcat(val, (char*) str, len); |
else |
else |
strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ); | strlcat(val, "0.0.0.0", len); |
strlcat(val, " ", srv->srv_numcli * STRSIZ); | strlcat(val, " ", len); |
} |
} |
|
|
AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); |
AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); |