--- libaitrpc/src/builtin.c 2012/05/17 08:42:32 1.7.2.7 +++ libaitrpc/src/builtin.c 2013/03/07 23:10:50 1.12 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.7.2.7 2012/05/17 08:42:32 misho Exp $ +* $Id: builtin.c,v 1.12 2013/03/07 23:10:50 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,32 +49,32 @@ SUCH DAMAGE. /* builtin RPC server functions */ static int -rpcServerClients(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcServerClients(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { 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); - srv = RPC_FUNC_SERVER(call); + 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 @@ -83,13 +83,14 @@ rpcServerClients(rpc_func_t *call, struct tagRPCCall * AIT_FREE_VAL(&v); } - AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val); - free(val); + /* return values */ + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } static int -rpcServerCalls(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; rpc_func_t *f; @@ -97,90 +98,89 @@ rpcServerCalls(rpc_func_t *call, struct tagRPCCall *rp int len; char *val, str[MAXPATHLEN]; - RPC_CALLBACK_CHECK_INPUT(call); - srv = RPC_FUNC_SERVER(call); + 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(RPC_FUNC_RETVARS(f))); + 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_getVars(RPC_FUNC_RETVARS(call), 0), val); - free(val); + /* return variables */ + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } static int -rpcServerSessions(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcServerSessions(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; - ait_val_t *v; - RPC_CALLBACK_CHECK_INPUT(call); - srv = RPC_FUNC_SERVER(call); + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); - v = io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*); - AIT_SET_U8(v, srv->srv_session.sess_version); - v = io_array(RPC_FUNC_RETVARS(call), 1, ait_val_t*); - AIT_SET_U32(v, srv->srv_session.sess_program); - v = io_array(RPC_FUNC_RETVARS(call), 2, ait_val_t*); - AIT_SET_U8(v, srv->srv_session.sess_process); - v = io_array(RPC_FUNC_RETVARS(call), 3, ait_val_t*); - AIT_SET_I32(v, io_arraySize(srv->srv_clients)); + AIT_SET_I32(ait_getVars(&RPC_RETVARS(cli), 3), array_Size(srv->srv_clients)); + AIT_SET_U8(ait_getVars(&RPC_RETVARS(cli), 0), srv->srv_session.sess_version); + AIT_SET_U32(ait_getVars(&RPC_RETVARS(cli), 1), srv->srv_session.sess_program); + AIT_SET_U8(ait_getVars(&RPC_RETVARS(cli), 2), srv->srv_session.sess_process); return 0; } static int -rpcServerShutdown(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcServerShutdown(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; - RPC_CALLBACK_CHECK_INPUT(call); - srv = RPC_FUNC_SERVER(call); + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); + + rpc_freeCli(cli); srv->srv_kill = 1; - return 0; } static int -rpcServerPing(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcServerPing(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { - AIT_SET_U16(io_getVars(RPC_FUNC_RETVARS(call), 0), ntohs(rpc->call_seq)); + if (rpc->call_req.flags == RPC_REPLY) + AIT_SET_U16(ait_getVars(&RPC_RETVARS(cli), 0), ntohs(rpc->call_seq)); return 0; } /* ---------------------------------------------------- */ static int -rpcBLOBServerShutdown(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcBLOBServerShutdown(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; - RPC_CALLBACK_CHECK_INPUT(call); - srv = RPC_FUNC_SERVER(call); + 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; } static int -rpcBLOBServerVars(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcBLOBServerVars(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { rpc_srv_t *srv; rpc_blob_t *b; @@ -188,11 +188,11 @@ rpcBLOBServerVars(rpc_func_t *call, struct tagRPCCall char *val, str[64]; int len; - RPC_CALLBACK_CHECK_INPUT(call); - srv = RPC_FUNC_SERVER(call); + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); if (srv->srv_blob.kill) { - AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), "BLOB Server is killed"); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed"); return 1; } @@ -201,11 +201,11 @@ rpcBLOBServerVars(rpc_func_t *call, struct tagRPCCall len = i * sizeof str; if (!len) { - AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 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 @@ -217,43 +217,43 @@ rpcBLOBServerVars(rpc_func_t *call, struct tagRPCCall strlcat(val, str, len); } - AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val); - free(val); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } static int -rpcBLOBServerClients(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv) +rpcBLOBServerClients(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { 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); - srv = RPC_FUNC_SERVER(call); + RPC_CALLBACK_CHECK_INPUT(cli); + srv = RPC_SRV_SERVER(cli); if (srv->srv_blob.kill) { - AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 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 @@ -262,8 +262,8 @@ rpcBLOBServerClients(rpc_func_t *call, struct tagRPCCa AIT_FREE_VAL(&v); } - AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val); - free(val); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } @@ -281,7 +281,7 @@ rpc_register_srvPing(rpc_srv_t * __restrict srv) if (!srv) return -1; - if (rpc_srv_registerCall(srv, CALL_SRVPING, rpcServerPing, 1) < 1) + if (rpc_srv_registerCall(srv, CALL_SRVPING, rpcServerPing) < 1) return -1; return 0; @@ -299,13 +299,13 @@ rpc_register_srvServices(rpc_srv_t * __restrict srv) if (!srv) return -1; - if (rpc_srv_registerCall(srv, CALL_SRVSHUTDOWN, rpcServerShutdown, 0) < 1) + if (rpc_srv_registerCall(srv, CALL_SRVSHUTDOWN, rpcServerShutdown) < 1) return -1; - if (rpc_srv_registerCall(srv, CALL_SRVCLIENTS, rpcServerClients, 1) < 1) + if (rpc_srv_registerCall(srv, CALL_SRVCLIENTS, rpcServerClients) < 1) return -1; - if (rpc_srv_registerCall(srv, CALL_SRVSESSIONS, rpcServerSessions, 4) < 1) + if (rpc_srv_registerCall(srv, CALL_SRVSESSIONS, rpcServerSessions) < 1) return -1; - if (rpc_srv_registerCall(srv, CALL_SRVCALLS, rpcServerCalls, 1) < 1) + if (rpc_srv_registerCall(srv, CALL_SRVCALLS, rpcServerCalls) < 1) return -1; return 0; @@ -323,11 +323,11 @@ rpc_register_blobServices(rpc_srv_t * __restrict srv) if (!srv) return -1; - if (rpc_srv_registerCall(srv, CALL_BLOBSHUTDOWN, rpcBLOBServerShutdown, 0) < 1) + if (rpc_srv_registerCall(srv, CALL_BLOBSHUTDOWN, rpcBLOBServerShutdown) < 1) return -1; - if (rpc_srv_registerCall(srv, CALL_BLOBCLIENTS, rpcBLOBServerClients, 1) < 1) + if (rpc_srv_registerCall(srv, CALL_BLOBCLIENTS, rpcBLOBServerClients) < 1) return -1; - if (rpc_srv_registerCall(srv, CALL_BLOBVARS, rpcBLOBServerVars, 1) < 1) + if (rpc_srv_registerCall(srv, CALL_BLOBVARS, rpcBLOBServerVars) < 1) return -1; return 0;