--- libaitrpc/src/builtin.c 2011/09/01 11:39:26 1.3.2.4 +++ libaitrpc/src/builtin.c 2011/11/03 12:52:36 1.4.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.3.2.4 2011/09/01 11:39:26 misho Exp $ +* $Id: builtin.c,v 1.4.2.2 2011/11/03 12:52:36 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -55,11 +55,9 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv array_t *vals; rpc_cli_t *cli; register int i; + int len; const char *str = NULL; char *val, wrk[INET6_ADDRSTRLEN]; - struct sockaddr_in *s; - struct sockaddr_in6 *s6; - struct sockaddr_un *su; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -69,35 +67,33 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv rpc_srv_getVars(call, &vals); - if (!(val = calloc(srv->srv_numcli, STRSIZ))) { + len = srv->srv_numcli * STRSIZ; + if (!(val = malloc(len))) { LOGERR; return -1; } 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++) { - if (!cli->cli_sa.sa_family) + if (!cli->cli_sa.sa.sa_family) continue; - switch (cli->cli_sa.sa_family) { + switch (cli->cli_sa.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); + str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.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); + str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk); break; case AF_LOCAL: - su = (struct sockaddr_un*) &cli->cli_sa; - str = su->sun_path; + str = cli->cli_sa.sun.sun_path; break; } if (str) - strlcat(val, (char*) str, srv->srv_numcli * STRSIZ); + strlcat(val, (char*) str, len); else - strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ); - strlcat(val, " ", srv->srv_numcli * STRSIZ); + strlcat(val, "0.0.0.0", len); + strlcat(val, " ", len); } AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); @@ -136,7 +132,8 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) if (*f->func_name) { memset(str, 0, sizeof str); snprintf(str, sizeof str, "/%s/%s(%d); ", - f->func_file, f->func_name, io_arraySize(f->func_vars)); + *f->func_file ? f->func_file : "*", + f->func_name, io_arraySize(f->func_vars)); strlcat(val, str, len); } } @@ -218,7 +215,7 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i array_t *vals; rpc_blob_t *b; register int i; - char *val, str[12]; + char *val, str[64]; int len; RPC_CALLBACK_CHECK_INPUT(call); @@ -227,27 +224,43 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i else srv = call->func_parent; + rpc_srv_getVars(call, &vals); + + if (srv->srv_blob.state == kill) { + AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is killed"); + return 1; + } + if (srv->srv_blob.state == disable) { + AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is disabled"); + return 1; + } + pthread_mutex_lock(&srv->srv_blob.mtx); for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next); len = i * sizeof str; - rpc_srv_getVars(call, &vals); + if (!len) { + AIT_SET_STR(io_array(vals, 0, ait_val_t*), ""); + pthread_mutex_unlock(&srv->srv_blob.mtx); + return 0; + } if (!(val = malloc(len))) { LOGERR; + pthread_mutex_unlock(&srv->srv_blob.mtx); return -1; } else memset(val, 0, len); for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) { 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, (u_long) b->blob_len, b->blob_data); strlcat(val, str, len); } - pthread_mutex_unlock(&srv->srv_blob.mtx); AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); free(val); + pthread_mutex_unlock(&srv->srv_blob.mtx); return 0; } @@ -265,7 +278,9 @@ rpcBLOBServerState(rpc_func_t *call, int ic, array_t * if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32) return -1; + pthread_mutex_lock(&srv->srv_mtx); srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*)); + pthread_mutex_unlock(&srv->srv_mtx); return 0; } @@ -276,11 +291,9 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t array_t *vals; rpc_cli_t *cli; register int i; + int len; const char *str = NULL; char *val, wrk[INET6_ADDRSTRLEN]; - struct sockaddr_in *s; - struct sockaddr_in6 *s6; - struct sockaddr_un *su; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -290,35 +303,42 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t rpc_srv_getVars(call, &vals); - if (!(val = calloc(srv->srv_numcli, STRSIZ))) { + if (srv->srv_blob.state == kill) { + AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is killed"); + return 1; + } + if (srv->srv_blob.state == disable) { + AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is disabled"); + return 1; + } + + len = srv->srv_numcli * STRSIZ; + if (!(val = malloc(len))) { LOGERR; return -1; } 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++) { - if (!cli->cli_sa.sa_family) + if (!cli->cli_sa.sa.sa_family) continue; - switch (cli->cli_sa.sa_family) { + switch (cli->cli_sa.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); + str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.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); + str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk); break; case AF_LOCAL: - su = (struct sockaddr_un*) &cli->cli_sa; - str = su->sun_path; + str = cli->cli_sa.sun.sun_path; break; } if (str) - strlcat(val, (char*) str, srv->srv_numcli * STRSIZ); + strlcat(val, (char*) str, len); else - strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ); - strlcat(val, " ", srv->srv_numcli * STRSIZ); + strlcat(val, "0.0.0.0", len); + strlcat(val, " ", len); } AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);