--- libaitrpc/src/builtin.c 2012/11/13 09:21:27 1.9.2.1 +++ libaitrpc/src/builtin.c 2013/09/05 00:27:10 1.16.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.9.2.1 2012/11/13 09:21:27 misho Exp $ +* $Id: builtin.c,v 1.16.4.1 2013/09/05 00:27:10 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 @@ -62,19 +62,19 @@ rpcServerClients(rpc_cli_t *cli, struct tagRPCCall *rp RPC_CALLBACK_CHECK_INPUT(cli); srv = RPC_SRV_SERVER(cli); - len = io_arraySize(srv->srv_clients) * STRSIZ; - if (!(val = io_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++) { - c = io_array(srv->srv_clients, i, rpc_cli_t*); + 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(&c->cli_sa, &v); + str = e_n2addr(&c->cli_sa, &v); if (str) strlcat(val, (char*) str, len); else @@ -84,8 +84,8 @@ rpcServerClients(rpc_cli_t *cli, struct tagRPCCall *rp } /* return values */ - AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val); - io_free(val); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } @@ -105,7 +105,7 @@ rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc, i++; len = i * STRSIZ; - if (!(val = io_malloc(len))) { + if (!(val = e_malloc(len))) { LOGERR; return -1; } else @@ -120,8 +120,8 @@ rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc, } /* return variables */ - AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val); - io_free(val); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } @@ -133,10 +133,9 @@ rpcServerSessions(rpc_cli_t *cli, struct tagRPCCall *r RPC_CALLBACK_CHECK_INPUT(cli); srv = RPC_SRV_SERVER(cli); - AIT_SET_I32(io_getVars(&RPC_RETVARS(cli), 3), io_arraySize(srv->srv_clients)); - AIT_SET_U8(io_getVars(&RPC_RETVARS(cli), 0), srv->srv_session.sess_version); - AIT_SET_U32(io_getVars(&RPC_RETVARS(cli), 1), srv->srv_session.sess_program); - AIT_SET_U8(io_getVars(&RPC_RETVARS(cli), 2), srv->srv_session.sess_process); + 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; } @@ -148,17 +147,20 @@ rpcServerShutdown(rpc_cli_t *cli, struct tagRPCCall *r RPC_CALLBACK_CHECK_INPUT(cli); srv = RPC_SRV_SERVER(cli); + + rpc_freeCli(cli); srv->srv_kill = 1; - + if (srv->srv_blob.tid) + pthread_kill(srv->srv_blob.tid, SIGFBLOB); return 0; } static int rpcServerPing(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv) { - if (rpc->call_req.flags == RPC_REPLY) - AIT_SET_U16(io_getVars(&RPC_RETVARS(cli), 0), ntohs(rpc->call_seq)); + if (ntohl((u_long) rpc->call_req.flags) == RPC_REPLY) + AIT_SET_U16(ait_getVars(&RPC_RETVARS(cli), 0), random() % USHRT_MAX); return 0; } @@ -172,8 +174,9 @@ rpcBLOBServerShutdown(rpc_cli_t *cli, struct tagRPCCal 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; } @@ -190,7 +193,7 @@ rpcBLOBServerVars(rpc_cli_t *cli, struct tagRPCCall *r srv = RPC_SRV_SERVER(cli); if (srv->srv_blob.kill) { - AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed"); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed"); return 1; } @@ -199,11 +202,11 @@ rpcBLOBServerVars(rpc_cli_t *cli, struct tagRPCCall *r len = i * sizeof str; if (!len) { - AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), ""); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), ""); return 0; } - if (!(val = io_malloc(len))) { + if (!(val = e_malloc(len))) { LOGERR; return -1; } else @@ -215,8 +218,8 @@ rpcBLOBServerVars(rpc_cli_t *cli, struct tagRPCCall *r strlcat(val, str, len); } - AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val); - io_free(val); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } @@ -235,23 +238,23 @@ rpcBLOBServerClients(rpc_cli_t *cli, struct tagRPCCall srv = RPC_SRV_SERVER(cli); if (srv->srv_blob.kill) { - AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), "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 = io_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++) { - c = io_array(srv->srv_blob.clients, i, rpc_cli_t*); + 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(&c->cli_sa, &v); + str = e_n2addr(&c->cli_sa, &v); if (str) strlcat(val, (char*) str, len); else @@ -260,8 +263,8 @@ rpcBLOBServerClients(rpc_cli_t *cli, struct tagRPCCall AIT_FREE_VAL(&v); } - AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val); - io_free(val); + AIT_SET_STR(ait_getVars(&RPC_RETVARS(cli), 0), val); + e_free(val); return 0; } @@ -273,7 +276,7 @@ rpcBLOBServerClients(rpc_cli_t *cli, struct tagRPCCall * @srv = RPC server instance * return: -1 error or 0 ok */ -inline int +int rpc_register_srvPing(rpc_srv_t * __restrict srv) { if (!srv)