--- libaitrpc/src/builtin.c 2012/05/15 23:28:20 1.7.2.1 +++ libaitrpc/src/builtin.c 2012/05/17 08:42:32 1.7.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.7.2.1 2012/05/15 23:28:20 misho Exp $ +* $Id: builtin.c,v 1.7.2.7 2012/05/17 08:42:32 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -48,8 +48,8 @@ SUCH DAMAGE. /* builtin RPC server functions */ -int -rpcServerClients(rpc_func_t *call, int ic, array_t *iv) +static int +rpcServerClients(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; rpc_cli_t *cli; @@ -60,10 +60,7 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv ait_val_t v; RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + srv = RPC_FUNC_SERVER(call); len = io_arraySize(srv->srv_clients) * STRSIZ; if (!(val = malloc(len))) { @@ -86,13 +83,13 @@ 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); + AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val); free(val); return 0; } -int -rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) +static int +rpcServerCalls(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; rpc_func_t *f; @@ -101,10 +98,7 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) char *val, str[MAXPATHLEN]; RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + srv = RPC_FUNC_SERVER(call); TAILQ_FOREACH(f, &srv->srv_funcs, func_node) i++; @@ -120,106 +114,94 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) 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)); + AIT_ADDR(&f->func_name), io_arraySize(RPC_FUNC_RETVARS(f))); strlcat(val, str, len); } - AIT_SET_STR(io_array(f->func_vars, 0, ait_val_t*), val); + AIT_SET_STR(io_getVars(RPC_FUNC_RETVARS(call), 0), val); free(val); return 0; } -int -rpcServerSessions(rpc_func_t *call, int ic, array_t *iv) +static int +rpcServerSessions(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; ait_val_t *v; RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + srv = RPC_FUNC_SERVER(call); - v = io_array(call->func_vars, 0, ait_val_t*); + v = io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*); AIT_SET_U8(v, srv->srv_session.sess_version); - v = io_array(call->func_vars, 1, ait_val_t*); + v = io_array(RPC_FUNC_RETVARS(call), 1, ait_val_t*); AIT_SET_U32(v, srv->srv_session.sess_program); - v = io_array(call->func_vars, 2, ait_val_t*); + v = io_array(RPC_FUNC_RETVARS(call), 2, ait_val_t*); AIT_SET_U8(v, srv->srv_session.sess_process); - v = io_array(call->func_vars, 3, ait_val_t*); + v = io_array(RPC_FUNC_RETVARS(call), 3, ait_val_t*); AIT_SET_I32(v, io_arraySize(srv->srv_clients)); return 0; } -int -rpcServerShutdown(rpc_func_t *call, int ic, array_t *iv) +static int +rpcServerShutdown(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + srv = RPC_FUNC_SERVER(call); - srv->srv_kill = kill; + srv->srv_kill = 1; return 0; } +static int +rpcServerPing(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +{ + AIT_SET_U16(io_getVars(RPC_FUNC_RETVARS(call), 0), ntohs(rpc->call_seq)); + return 0; +} + /* ---------------------------------------------------- */ -#if 0 -int -rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv) +static int +rpcBLOBServerShutdown(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + srv = RPC_FUNC_SERVER(call); - srv->srv_blob.state = kill; + srv->srv_blob.kill = 1; return 0; } -int -rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv) +static int +rpcBLOBServerVars(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; - array_t *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; + srv = RPC_FUNC_SERVER(call); - rpc_srv_getVars(call, &vals); - - if (srv->srv_blob.state == kill) { - AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is killed"); + if (srv->srv_blob.kill) { + AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), "BLOB Server is killed"); return 1; } - if (srv->srv_blob.state == disable) { - AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is disabled"); - return 1; - } - for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next); + TAILQ_FOREACH(b, &srv->srv_blob.blobs, blob_node) + i++; len = i * sizeof str; if (!len) { - AIT_SET_STR(io_array(vals, 0, ait_val_t*), ""); + AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), ""); return 0; } @@ -229,94 +211,124 @@ 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(%lu)=%p ", b->blob_var, (u_long) b->blob_len, b->blob_data); strlcat(val, str, len); } - AIT_SET_STR(io_array(vals, 0, ait_val_t*), val); + AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val); free(val); return 0; } -int -rpcBLOBServerState(rpc_func_t *call, int ic, array_t *iv) +static int +rpcBLOBServerClients(rpc_func_t *call, struct tagRPCCall *rpc, 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; - - srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*)); - 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]; + char *val; + ait_val_t v; RPC_CALLBACK_CHECK_INPUT(call); - if (!call->func_parent) - return -1; - else - srv = call->func_parent; + srv = RPC_FUNC_SERVER(call); - rpc_srv_getVars(call, &vals); - - if (srv->srv_blob.state == kill) { - AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is killed"); + if (srv->srv_blob.kill) { + AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), "BLOB Server is killed"); return 1; } - if (srv->srv_blob.state == disable) { - AIT_SET_STR(io_array(vals, 0, ait_val_t*), "BLOB Server is disabled"); - return 1; - } - len = srv->srv_numcli * STRSIZ; + 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; i < srv->srv_numcli; i++, cli++) { - if (!cli->cli_sa.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.sa_family) { - case AF_INET: - str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.sin_addr, wrk, sizeof wrk); - break; - case AF_INET6: - str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk); - break; - case AF_LOCAL: - str = cli->cli_sa.sun.sun_path; - break; - } + str = io_n2addr(&cli->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(io_array(vals, 0, ait_val_t*), val); + AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val); free(val); return 0; } -#endif + +/* ----------------------------------------------------------------- */ + +/* + * rpc_register_srvPing() - Register ping service function + * + * @srv = RPC server instance + * return: -1 error or 0 ok + */ +inline int +rpc_register_srvPing(rpc_srv_t * __restrict srv) +{ + if (!srv) + return -1; + + if (rpc_srv_registerCall(srv, CALL_SRVPING, rpcServerPing, 1) < 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, 0) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_SRVCLIENTS, rpcServerClients, 1) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_SRVSESSIONS, rpcServerSessions, 4) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_SRVCALLS, rpcServerCalls, 1) < 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, 0) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_BLOBCLIENTS, rpcBLOBServerClients, 1) < 1) + return -1; + if (rpc_srv_registerCall(srv, CALL_BLOBVARS, rpcBLOBServerVars, 1) < 1) + return -1; + + return 0; +}