--- libaitrpc/src/builtin.c 2012/05/16 13:47:16 1.7.2.3 +++ 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.7.2.3 2012/05/16 13:47:16 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, 2012 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -48,36 +48,33 @@ SUCH DAMAGE. /* builtin RPC server functions */ -int -rpcServerClients(rpc_func_t *call, int ic, array_t *iv) +static int +rpcServerClients(RPC_CALL_STDARGS) { rpc_srv_t *srv; - rpc_cli_t *cli; + rpc_cli_t *c; register int i; 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); - len = io_arraySize(srv->srv_clients) * STRSIZ; - if (!(val = malloc(len))) { + len = array_Size(srv->srv_clients) * STRSIZ; + if (!(val = e_malloc(len))) { LOGERR; return -1; } else memset(val, 0, len); - for (i = 0; i < io_arraySize(srv->srv_clients); i++) { - cli = io_array(srv->srv_clients, i, rpc_cli_t*); - if (!cli) + for (i = 0; i < array_Size(srv->srv_clients); i++) { + c = array(srv->srv_clients, i, rpc_cli_t*); + if (!c) continue; - str = io_n2addr(&cli->cli_sa, &v); + str = e_n2addr(&c->cli_sa, &v); if (str) strlcat(val, (char*) str, len); else @@ -86,13 +83,14 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv AIT_FREE_VAL(&v); } - AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); - free(val); + /* 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, array_t *iv) +static int +rpcServerCalls(RPC_CALL_STDARGS) { rpc_srv_t *srv; rpc_func_t *f; @@ -100,95 +98,89 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) 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); - TAILQ_FOREACH(f, &srv->srv_funcs, func_node) + SLIST_FOREACH(f, &srv->srv_funcs, func_next) i++; len = i * STRSIZ; - if (!(val = malloc(len))) { + if (!(val = e_malloc(len))) { LOGERR; return -1; } else memset(val, 0, len); - TAILQ_FOREACH(f, &srv->srv_funcs, func_node) + 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(%d); ", AIT_KEY(&f->func_name), - AIT_ADDR(&f->func_name), io_arraySize(f->func_vars)); + snprintf(str, sizeof str, "/%hu/0x%p; ", AIT_KEY(&f->func_name), + AIT_ADDR(&f->func_name)); strlcat(val, str, len); } - AIT_SET_STR(io_array(f->func_vars, 0, ait_val_t*), val); - free(val); + /* 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, array_t *iv) +static int +rpcServerSessions(RPC_CALL_STDARGS) { rpc_srv_t *srv; - 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); - 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)); + 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); return 0; } -int -rpcServerShutdown(rpc_func_t *call, int ic, array_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; +} +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, array_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); - srv->srv_blob.kill = 1; + rpc_freeBLOBCli(cli); + srv->srv_blob.kill = 1; return 0; } -int -rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv) +static int +rpcBLOBServerVars(RPC_CALL_STDARGS) { rpc_srv_t *srv; rpc_blob_t *b; @@ -196,14 +188,11 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i 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); if (srv->srv_blob.kill) { - AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed"); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed"); return 1; } @@ -212,11 +201,11 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i len = i * sizeof str; if (!len) { - AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), ""); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), ""); return 0; } - if (!(val = malloc(len))) { + if (!(val = e_malloc(len))) { LOGERR; return -1; } else @@ -228,46 +217,43 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i strlcat(val, str, len); } - AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); - free(val); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } -int -rpcBLOBServerClients(rpc_func_t *call, int ic, array_t *iv) +static int +rpcBLOBServerClients(RPC_CALL_STDARGS) { rpc_srv_t *srv; - rpc_cli_t *cli; + rpc_cli_t *c; register int i; 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 (srv->srv_blob.kill) { - AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed"); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed"); return 1; } - len = io_arraySize(srv->srv_blob.clients) * STRSIZ; - if (!(val = malloc(len))) { + len = array_Size(srv->srv_blob.clients) * STRSIZ; + if (!(val = e_malloc(len))) { LOGERR; return -1; } else memset(val, 0, len); - for (i = 0; i < io_arraySize(srv->srv_clients); i++) { - cli = io_array(srv->srv_blob.clients, i, rpc_cli_t*); - if (!cli) + for (i = 0; i < array_Size(srv->srv_clients); i++) { + c = array(srv->srv_blob.clients, i, rpc_cli_t*); + if (!c) continue; - str = io_n2addr(&cli->cli_sa, &v); + str = e_n2addr(&c->cli_sa, &v); if (str) strlcat(val, (char*) str, len); else @@ -276,7 +262,73 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t AIT_FREE_VAL(&v); } - AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val); - free(val); + 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 +rpc_register_srvPing(rpc_srv_t * __restrict srv) +{ + if (!srv) + return -1; + + if (rpc_srv_registerCall(srv, CALL_SRVPING, rpcServerPing) < 1) + return -1; + + 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; + + 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; + + 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; }