--- libaitrpc/src/builtin.c 2011/05/02 23:07:55 1.1.1.1.2.9 +++ 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.1.1.1.2.9 2011/05/02 23:07:55 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 @@ -49,16 +49,15 @@ SUCH DAMAGE. /* builtin RPC server functions */ int -rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerClients(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; rpc_cli_t *cli; register int i; - const char *str; - char wrk[INET6_ADDRSTRLEN]; - struct sockaddr_in *s; - struct sockaddr_in6 *s6; + int len; + const char *str = NULL; + char *val; + ait_val_t v; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -66,39 +65,40 @@ rpcServerClients(rpc_func_t *call, int ic, rpc_val_t * else srv = call->func_parent; - if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) + len = io_arraySize(srv->srv_clients) * STRSIZ; + if (!(val = malloc(len))) { + LOGERR; return -1; + } else + memset(val, 0, len); - for (i = 0, cli = srv->srv_clients, v = vals; i < srv->srv_numcli; i++, cli++) { - if (!cli->cli_sa.sa_family) { - RPC_SET_STR(v++, ""); + for (i = 0; i < io_arraySize(srv->srv_clients); i++) { + cli = io_array(srv->srv_clients, i, rpc_cli_t*); + if (!cli) continue; - } - if (AF_INET == cli->cli_sa.sa_family) { - s = (struct sockaddr_in*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); - } else { - s6 = (struct sockaddr_in6*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); - } + str = io_n2addr(&cli->cli_sa, &v); if (str) - RPC_SET_STR(v++, (char*) str); + strlcat(val, (char*) str, len); else - RPC_SET_STR(v++, "0.0.0.0"); + strlcat(val, "0.0.0.0", len); + strlcat(val, " ", len); + AIT_FREE_VAL(&v); } + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); + free(val); return 0; } int -rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; rpc_func_t *f; - register int i; - char str[MAXPATHLEN]; + register int i = 0; + int len; + char *val, str[MAXPATHLEN]; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -106,26 +106,34 @@ rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv else srv = call->func_parent; - for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next); - if (!(vals = rpc_srv_retValsCall(call, i))) + TAILQ_FOREACH(f, &srv->srv_funcs, func_node) + i++; + len = i * STRSIZ; + + if (!(val = malloc(len))) { + LOGERR; return -1; + } else + memset(val, 0, len); - for (f = srv->srv_funcs, v = vals; f; f = f->func_next) { - if (*f->func_name) { - memset(str, 0, MAXPATHLEN); - snprintf(str, MAXPATHLEN, "/%s/%s()", f->func_file, f->func_name); - RPC_SET_STR(v++, str); + TAILQ_FOREACH(f, &srv->srv_funcs, func_node) + if (AIT_ADDR(&f->func_name)) { + memset(str, 0, sizeof str); + 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(f->func_vars, 0, ait_val_t*), val); + free(val); return 0; } int -rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerSessions(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *vals; + ait_val_t *v; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -133,19 +141,20 @@ rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t else srv = call->func_parent; - if (!(vals = rpc_srv_retValsCall(call, 4))) - return -1; + v = io_array(call->func_vars, 0, ait_val_t*); + AIT_SET_U8(v, srv->srv_session.sess_version); + v = io_array(call->func_vars, 1, ait_val_t*); + AIT_SET_U32(v, srv->srv_session.sess_program); + 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)); - RPC_SET_U8(&vals[0], srv->srv_session.sess_version); - RPC_SET_U32(&vals[1], srv->srv_session.sess_program); - RPC_SET_U32(&vals[2], srv->srv_session.sess_process); - RPC_SET_I32(&vals[3], srv->srv_numcli); - return 0; } int -rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerShutdown(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; @@ -155,17 +164,15 @@ rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t else srv = call->func_parent; - pthread_mutex_lock(&srv->srv_mtx); - rpc_Kill = 1; - pthread_mutex_unlock(&srv->srv_mtx); + srv->srv_kill = 1; return 0; } -// ---------------------------------------------------- +/* ---------------------------------------------------- */ int -rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; @@ -175,20 +182,19 @@ rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_va else srv = call->func_parent; - pthread_mutex_lock(&srv->srv_blob.mtx); - blob_Kill = 1; - pthread_mutex_unlock(&srv->srv_blob.mtx); + srv->srv_blob.kill = 1; return 0; } int -rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; rpc_blob_t *b; - register int i; + register int i = 0; + char *val, str[64]; + int len; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -196,49 +202,47 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t 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 (!(vals = rpc_srv_retValsCall(call, i))) { - pthread_mutex_unlock(&srv->srv_blob.mtx); - return 0; + if (srv->srv_blob.kill) { + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed"); + return 1; } - for (b = srv->srv_blob.blobs, v = vals; b; b = b->blob_next) - RPC_SET_U32(v++, b->blob_var); - pthread_mutex_unlock(&srv->srv_blob.mtx); + TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node) + i++; + len = i * sizeof str; - return 0; -} + if (!len) { + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), ""); + return 0; + } -int -rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t *iv) -{ - rpc_srv_t *srv; - - RPC_CALLBACK_CHK_ARGS(call, ic); - if (!call->func_parent) + if (!(val = malloc(len))) { + LOGERR; return -1; - else - srv = call->func_parent; + } else + memset(val, 0, len); - if (iv[0].val_type != i32) - return -1; + TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node) { + memset(str, 0, sizeof str); + snprintf(str, sizeof str, "0x%0X(%lu)=%p ", b->blob_var, (u_long) b->blob_len, b->blob_data); + strlcat(val, str, len); + } - srv->srv_blob.state = RPC_GET_I32(&iv[0]); + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); + free(val); return 0; } int -rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerClients(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; rpc_cli_t *cli; register int i; - const char *str; - char wrk[INET6_ADDRSTRLEN]; - struct sockaddr_in *s; - struct sockaddr_in6 *s6; + int len; + const char *str = NULL; + char *val; + ait_val_t v; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -246,27 +250,33 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val else srv = call->func_parent; - if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) + if (srv->srv_blob.kill) { + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed"); + return 1; + } + + len = io_arraySize(srv->srv_blob.clients) * STRSIZ; + if (!(val = malloc(len))) { + LOGERR; return -1; + } else + memset(val, 0, len); - for (i = 0, cli = srv->srv_blob.clients, v = vals; i < srv->srv_numcli; i++, cli++) { - if (!cli->cli_sa.sa_family) { - RPC_SET_STR(v++, ""); + for (i = 0; i < io_arraySize(srv->srv_clients); i++) { + cli = io_array(srv->srv_blob.clients, i, rpc_cli_t*); + if (!cli) continue; - } - if (AF_INET == cli->cli_sa.sa_family) { - s = (struct sockaddr_in*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); - } else { - s6 = (struct sockaddr_in6*) &cli->cli_sa; - str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); - } + str = io_n2addr(&cli->cli_sa, &v); if (str) - RPC_SET_STR(v++, (char*) str); + strlcat(val, (char*) str, len); else - RPC_SET_STR(v++, "0.0.0.0"); + strlcat(val, "0.0.0.0", len); + strlcat(val, " ", len); + AIT_FREE_VAL(&v); } + AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); + free(val); return 0; }