--- libaitrpc/src/builtin.c 2011/08/31 17:11:58 1.3.2.3 +++ libaitrpc/src/builtin.c 2011/09/01 11:39:26 1.3.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.3.2.3 2011/08/31 17:11:58 misho Exp $ +* $Id: builtin.c,v 1.3.2.4 2011/09/01 11:39:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -53,11 +53,10 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv { rpc_srv_t *srv; array_t *vals; - ait_val_t *v; rpc_cli_t *cli; register int i; const char *str = NULL; - char wrk[INET6_ADDRSTRLEN]; + char *val, wrk[INET6_ADDRSTRLEN]; struct sockaddr_in *s; struct sockaddr_in6 *s6; struct sockaddr_un *su; @@ -68,15 +67,17 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv else srv = call->func_parent; - if (!(vals = rpc_srv_returnVars(call, srv->srv_numcli))) + rpc_srv_getVars(call, &vals); + + if (!(val = calloc(srv->srv_numcli, STRSIZ))) { + LOGERR; return -1; + } else + memset(val, 0, srv->srv_numcli * STRSIZ); for (i = 0, cli = srv->srv_clients; i < srv->srv_numcli; i++, cli++) { - v = io_array(vals, i, ait_val_t*); - if (!cli->cli_sa.sa_family) { - AIT_SET_STR(v, ""); + if (!cli->cli_sa.sa_family) continue; - } switch (cli->cli_sa.sa_family) { case AF_INET: @@ -93,11 +94,14 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv break; } if (str) - AIT_SET_STR(v, (char*) str); + strlcat(val, (char*) str, srv->srv_numcli * STRSIZ); else - AIT_SET_STR(v, "0.0.0.0"); + strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ); + strlcat(val, " ", srv->srv_numcli * STRSIZ); } + AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + free(val); return 0; } @@ -106,10 +110,10 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; array_t *vals; - ait_val_t *v; rpc_func_t *f; register int i; - char str[MAXPATHLEN]; + int len; + char *val, str[MAXPATHLEN]; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -118,18 +122,27 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) srv = call->func_parent; for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next); - if (!(vals = rpc_srv_returnVars(call, i))) + len = i * STRSIZ; + + rpc_srv_getVars(call, &vals); + + if (!(val = malloc(len))) { + LOGERR; return -1; + } else + memset(val, 0, len); for (f = srv->srv_funcs, i = 0; f; f = f->func_next) { if (*f->func_name) { memset(str, 0, sizeof str); - snprintf(str, sizeof str, "/%s/%s()", f->func_file, f->func_name); - v = io_array(vals, i++, ait_val_t*); - AIT_SET_STR(v, str); + snprintf(str, sizeof str, "/%s/%s(%d); ", + f->func_file, f->func_name, io_arraySize(f->func_vars)); + strlcat(val, str, len); } } + AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + free(val); return 0; } @@ -146,8 +159,7 @@ rpcServerSessions(rpc_func_t *call, int ic, array_t *i else srv = call->func_parent; - if (!(vals = rpc_srv_returnVars(call, 4))) - return -1; + rpc_srv_getVars(call, &vals); v = io_array(vals, 0, ait_val_t*); AIT_SET_U8(v, srv->srv_session.sess_version); @@ -204,9 +216,10 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i { rpc_srv_t *srv; array_t *vals; - ait_val_t *v; rpc_blob_t *b; register int i; + char *val, str[12]; + int len; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -216,17 +229,25 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i pthread_mutex_lock(&srv->srv_blob.mtx); for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next); - if (!(vals = rpc_srv_returnVars(call, i))) { - pthread_mutex_unlock(&srv->srv_blob.mtx); - return 0; - } + len = i * sizeof str; + rpc_srv_getVars(call, &vals); + + if (!(val = malloc(len))) { + LOGERR; + return -1; + } else + memset(val, 0, len); + for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) { - v = io_array(vals, i, ait_val_t*); - AIT_SET_U32(v, b->blob_var); + memset(str, 0, sizeof str); + snprintf(str, sizeof str, "0x%0X ", b->blob_var); + strlcat(val, str, len); } pthread_mutex_unlock(&srv->srv_blob.mtx); + AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + free(val); return 0; } @@ -253,11 +274,10 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t { rpc_srv_t *srv; array_t *vals; - ait_val_t *v; rpc_cli_t *cli; register int i; const char *str = NULL; - char wrk[INET6_ADDRSTRLEN]; + char *val, wrk[INET6_ADDRSTRLEN]; struct sockaddr_in *s; struct sockaddr_in6 *s6; struct sockaddr_un *su; @@ -268,16 +288,17 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t else srv = call->func_parent; - if (!(vals = rpc_srv_returnVars(call, srv->srv_numcli))) + rpc_srv_getVars(call, &vals); + + if (!(val = calloc(srv->srv_numcli, STRSIZ))) { + LOGERR; return -1; + } else + memset(val, 0, srv->srv_numcli * STRSIZ); for (i = 0, cli = srv->srv_blob.clients; i < srv->srv_numcli; i++, cli++) { - v = io_array(vals, i, ait_val_t*); - - if (!cli->cli_sa.sa_family) { - AIT_SET_STR(v, ""); + if (!cli->cli_sa.sa_family) continue; - } switch (cli->cli_sa.sa_family) { case AF_INET: @@ -294,10 +315,13 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t break; } if (str) - AIT_SET_STR(v, (char*) str); + strlcat(val, (char*) str, srv->srv_numcli * STRSIZ); else - AIT_SET_STR(v, "0.0.0.0"); + strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ); + strlcat(val, " ", srv->srv_numcli * STRSIZ); } + AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + free(val); return 0; }