--- libaitrpc/src/builtin.c 2011/09/03 12:39:27 1.3.2.6 +++ libaitrpc/src/builtin.c 2012/05/16 13:47:16 1.7.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.3.2.6 2011/09/03 12:39:27 misho Exp $ +* $Id: builtin.c,v 1.7.2.3 2012/05/16 13:47:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -52,14 +52,12 @@ int rpcServerClients(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - 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; + char *val; + ait_val_t v; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -67,40 +65,28 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv else srv = call->func_parent; - rpc_srv_getVars(call, &vals); - - if (!(val = calloc(srv->srv_numcli, STRSIZ))) { + len = io_arraySize(srv->srv_clients) * 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) + for (i = 0; i < io_arraySize(srv->srv_clients); i++) { + cli = io_array(srv->srv_clients, i, rpc_cli_t*); + if (!cli) continue; - switch (cli->cli_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); - 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); - break; - case AF_LOCAL: - su = (struct sockaddr_un*) &cli->cli_sa; - str = su->sun_path; - break; - } + str = io_n2addr(&cli->cli_sa, &v); 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_FREE_VAL(&v); } - AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); free(val); return 0; } @@ -109,9 +95,8 @@ int rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - array_t *vals; rpc_func_t *f; - register int i; + register int i = 0; int len; char *val, str[MAXPATHLEN]; @@ -121,27 +106,25 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) else srv = call->func_parent; - for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next); + TAILQ_FOREACH(f, &srv->srv_funcs, func_node) + 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) { + TAILQ_FOREACH(f, &srv->srv_funcs, func_node) + if (AIT_ADDR(&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)); + snprintf(str, sizeof str, "/%hu/0x%p(%d); ", AIT_KEY(&f->func_name), + AIT_ADDR(&f->func_name), io_arraySize(f->func_vars)); strlcat(val, str, len); } - } - AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + AIT_SET_STR(io_array(f->func_vars, 0, ait_val_t*), val); free(val); return 0; } @@ -150,7 +133,6 @@ int rpcServerSessions(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - array_t *vals; ait_val_t *v; RPC_CALLBACK_CHECK_INPUT(call); @@ -159,16 +141,14 @@ rpcServerSessions(rpc_func_t *call, int ic, array_t *i else srv = call->func_parent; - rpc_srv_getVars(call, &vals); - - v = io_array(vals, 0, ait_val_t*); + v = io_array(call->func_vars, 0, ait_val_t*); AIT_SET_U8(v, srv->srv_session.sess_version); - v = io_array(vals, 1, ait_val_t*); + v = io_array(call->func_vars, 1, ait_val_t*); AIT_SET_U32(v, srv->srv_session.sess_program); - v = io_array(vals, 2, ait_val_t*); - AIT_SET_U32(v, srv->srv_session.sess_process); - v = io_array(vals, 3, ait_val_t*); - AIT_SET_I32(v, srv->srv_numcli); + v = io_array(call->func_vars, 2, ait_val_t*); + AIT_SET_U8(v, srv->srv_session.sess_process); + v = io_array(call->func_vars, 3, ait_val_t*); + AIT_SET_I32(v, io_arraySize(srv->srv_clients)); return 0; } @@ -184,14 +164,12 @@ rpcServerShutdown(rpc_func_t *call, int ic, array_t *i else srv = call->func_parent; - pthread_mutex_lock(&srv->srv_mtx); - srv->srv_kill = kill; - pthread_mutex_unlock(&srv->srv_mtx); + srv->srv_kill = 1; return 0; } -// ---------------------------------------------------- +/* ---------------------------------------------------- */ int rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv) @@ -204,9 +182,7 @@ rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_ else srv = call->func_parent; - pthread_mutex_lock(&srv->srv_blob.mtx); - srv->srv_blob.state = kill; - pthread_mutex_unlock(&srv->srv_blob.mtx); + srv->srv_blob.kill = 1; return 0; } @@ -215,10 +191,9 @@ int rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - array_t *vals; rpc_blob_t *b; - register int i; - char *val, str[12]; + register int i = 0; + char *val, str[64]; int len; RPC_CALLBACK_CHECK_INPUT(call); @@ -227,11 +202,19 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i else 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); + if (srv->srv_blob.kill) { + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed"); + return 1; + } + + TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node) + i++; len = i * sizeof str; - rpc_srv_getVars(call, &vals); + if (!len) { + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), ""); + return 0; + } if (!(val = malloc(len))) { LOGERR; @@ -239,51 +222,27 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i } else memset(val, 0, len); - for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) { + TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node) { 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); - printf("val=%s\n", val); - AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); free(val); return 0; } int -rpcBLOBServerState(rpc_func_t *call, int ic, array_t *iv) -{ - rpc_srv_t *srv; - - RPC_CALLBACK_CHK_ARGS(call, ic); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; - - 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; -} - -int rpcBLOBServerClients(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - 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; + char *val; + ait_val_t v; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -291,40 +250,33 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t else srv = call->func_parent; - rpc_srv_getVars(call, &vals); + if (srv->srv_blob.kill) { + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed"); + return 1; + } - if (!(val = calloc(srv->srv_numcli, STRSIZ))) { + len = io_arraySize(srv->srv_blob.clients) * 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) + for (i = 0; i < io_arraySize(srv->srv_clients); i++) { + cli = io_array(srv->srv_blob.clients, i, rpc_cli_t*); + if (!cli) continue; - switch (cli->cli_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); - 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); - break; - case AF_LOCAL: - su = (struct sockaddr_un*) &cli->cli_sa; - str = su->sun_path; - break; - } + str = io_n2addr(&cli->cli_sa, &v); 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_FREE_VAL(&v); } - AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); free(val); return 0; }