--- libaitrpc/src/builtin.c 2011/05/02 23:07:55 1.1.1.1.2.9 +++ libaitrpc/src/builtin.c 2015/07/22 20:01:46 1.23 @@ -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.23 2015/07/22 20:01:46 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 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -48,225 +48,287 @@ SUCH DAMAGE. /* builtin RPC server functions */ -int -rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) +static int +rpcServerClients(RPC_CALL_STDARGS) { rpc_srv_t *srv; - rpc_val_t *v, *vals; - rpc_cli_t *cli; + rpc_cli_t *c; 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) - return -1; - else - srv = call->func_parent; + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); - if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) + len = array_Size(srv->srv_clients) * STRSIZ; + if (!(val = e_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 < array_Size(srv->srv_clients); i++) { + c = array(srv->srv_clients, i, rpc_cli_t*); + if (!c) 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 = e_n2addr(&c->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); } + /* return values */ + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } -int -rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv) +static int +rpcServerCalls(RPC_CALL_STDARGS) { 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) - return -1; - else - srv = call->func_parent; + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); - for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next); - if (!(vals = rpc_srv_retValsCall(call, i))) + SLIST_FOREACH(f, &srv->srv_funcs, func_next) + i++; + len = i * STRSIZ; + + if (!(val = e_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); + SLIST_FOREACH(f, &srv->srv_funcs, func_next) + if (AIT_ADDR(&f->func_name)) { + memset(str, 0, sizeof str); + snprintf(str, sizeof str, "/%hu/0x%p; ", AIT_KEY(&f->func_name), + AIT_ADDR(&f->func_name)); + strlcat(val, str, len); } - } + /* return variables */ + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } -int -rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t *iv) +static int +rpcServerSessions(RPC_CALL_STDARGS) { rpc_srv_t *srv; - rpc_val_t *vals; - RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); - if (!(vals = rpc_srv_retValsCall(call, 4))) - return -1; + AIT_SET_I32(ait_getVars(&RPC_RETVARS(cli), 2), array_Size(srv->srv_clients)); + AIT_SET_U8(ait_getVars(&RPC_RETVARS(cli), 0), srv->srv_session.sess_version); + AIT_SET_U8(ait_getVars(&RPC_RETVARS(cli), 1), srv->srv_session.sess_instance); - 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) +static int +rpcServerShutdown(RPC_CALL_STDARGS) { rpc_srv_t *srv; - RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); + + srv->srv_blob.kill = 1; + if (srv->srv_blob.tid) + pthread_kill(srv->srv_blob.tid, SIGFBLOB); + srv->srv_kill = 1; + return 0; +} - pthread_mutex_lock(&srv->srv_mtx); - rpc_Kill = 1; - pthread_mutex_unlock(&srv->srv_mtx); - +static int +rpcServerPing(RPC_CALL_STDARGS) +{ + if (ntohl((u_long) rpc->call_req.flags) == RPC_REPLY) + AIT_SET_U16(ait_getVars(&RPC_RETVARS(cli), 0), random() % USHRT_MAX); return 0; } -// ---------------------------------------------------- +/* ---------------------------------------------------- */ -int -rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_val_t *iv) +static int +rpcBLOBServerShutdown(RPC_CALL_STDARGS) { rpc_srv_t *srv; - RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); - pthread_mutex_lock(&srv->srv_blob.mtx); - blob_Kill = 1; - pthread_mutex_unlock(&srv->srv_blob.mtx); + rpc_freeBLOBCli(cli); + srv->srv_blob.kill = 1; return 0; } -int -rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t *iv) +static int +rpcBLOBServerVars(RPC_CALL_STDARGS) { 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) - return -1; - else - srv = call->func_parent; + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); - 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); + if (srv->srv_blob.kill) { + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed"); + return 1; + } + + TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node) + i++; + len = i * sizeof str; + + if (!len) { + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), ""); return 0; } - 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); + if (!(val = e_malloc(len))) { + LOGERR; + return -1; + } else + memset(val, 0, len); + 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); + } + + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } -int -rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t *iv) +static int +rpcBLOBServerClients(RPC_CALL_STDARGS) { rpc_srv_t *srv; + rpc_cli_t *c; + register int i; + int len; + const char *str = NULL; + char *val; + ait_val_t v; - RPC_CALLBACK_CHK_ARGS(call, ic); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); - if (iv[0].val_type != i32) + if (srv->srv_blob.kill) { + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed"); + return 1; + } + + len = array_Size(srv->srv_blob.clients) * STRSIZ; + if (!(val = e_malloc(len))) { + LOGERR; return -1; + } else + memset(val, 0, len); - srv->srv_blob.state = RPC_GET_I32(&iv[0]); + for (i = 0; i < array_Size(srv->srv_clients); i++) { + c = array(srv->srv_blob.clients, i, rpc_cli_t*); + if (!c) + continue; + + str = e_n2addr(&c->cli_sa, &v); + if (str) + strlcat(val, (char*) str, len); + else + strlcat(val, "0.0.0.0", len); + strlcat(val, " ", len); + AIT_FREE_VAL(&v); + } + + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } +/* ----------------------------------------------------------------- */ + +/* + * rpc_register_srvPing() - Register ping service function + * + * @srv = RPC server instance + * return: -1 error or 0 ok + */ int -rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) +rpc_register_srvPing(rpc_srv_t * __restrict srv) { - 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; + if (!srv) + return -1; - RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) + if (rpc_srv_registerCall(srv, CALL_SRVPING, rpcServerPing) < 1) return -1; - else - srv = call->func_parent; - if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) + return 0; +} + +/* + * rpc_register_srvServices() - Register internal service functions + * + * @srv = RPC server instance + * return: -1 error or 0 ok + */ +int +rpc_register_srvServices(rpc_srv_t * __restrict srv) +{ + if (!srv) return -1; - 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++, ""); - continue; - } + if (rpc_srv_registerCall(srv, CALL_SRVSHUTDOWN, rpcServerShutdown) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_SRVCLIENTS, rpcServerClients) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_SRVSESSIONS, rpcServerSessions) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_SRVCALLS, rpcServerCalls) < 1) + return -1; - 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); - } - if (str) - RPC_SET_STR(v++, (char*) str); - else - RPC_SET_STR(v++, "0.0.0.0"); - } + return 0; +} + +/* + * rpc_register_blobServices() - Register internal service functions + * + * @srv = RPC server instance + * return: -1 error or 0 ok + */ +int +rpc_register_blobServices(rpc_srv_t * __restrict srv) +{ + if (!srv) + return -1; + + if (rpc_srv_registerCall(srv, CALL_BLOBSHUTDOWN, rpcBLOBServerShutdown) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_BLOBCLIENTS, rpcBLOBServerClients) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_BLOBVARS, rpcBLOBServerVars) < 1) + return -1; return 0; }