--- libaitrpc/src/builtin.c 2011/08/19 08:24:13 1.2.4.2 +++ libaitrpc/src/builtin.c 2011/08/31 17:11:58 1.3.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.2.4.2 2011/08/19 08:24:13 misho Exp $ +* $Id: builtin.c,v 1.3.2.3 2011/08/31 17:11:58 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -49,16 +49,18 @@ SUCH DAMAGE. /* builtin RPC server functions */ int -rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerClients(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + array_t *vals; + ait_val_t *v; rpc_cli_t *cli; register int i; - const char *str; + const char *str = NULL; char wrk[INET6_ADDRSTRLEN]; struct sockaddr_in *s; struct sockaddr_in6 *s6; + struct sockaddr_un *su; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -69,33 +71,42 @@ rpcServerClients(rpc_func_t *call, int ic, rpc_val_t * if (!(vals = rpc_srv_returnVars(call, srv->srv_numcli))) return -1; - for (i = 0, cli = srv->srv_clients, v = vals; i < srv->srv_numcli; i++, cli++) { + for (i = 0, cli = srv->srv_clients; i < srv->srv_numcli; i++, cli++) { + v = io_array(vals, i, ait_val_t*); if (!cli->cli_sa.sa_family) { - RPC_SET_STR(v++, ""); + AIT_SET_STR(v, ""); 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); + switch (cli->cli_sa.sa_family) { + case AF_INET: + s = (struct sockaddr_in*) &cli->cli_sa; + str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); + break; + case AF_INET6: + s6 = (struct sockaddr_in6*) &cli->cli_sa; + str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); + break; + case AF_LOCAL: + su = (struct sockaddr_un*) &cli->cli_sa; + str = su->sun_path; + break; } if (str) - RPC_SET_STR(v++, (char*) str); + AIT_SET_STR(v, (char*) str); else - RPC_SET_STR(v++, "0.0.0.0"); + AIT_SET_STR(v, "0.0.0.0"); } return 0; } int -rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerCalls(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + array_t *vals; + ait_val_t *v; rpc_func_t *f; register int i; char str[MAXPATHLEN]; @@ -110,11 +121,12 @@ rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv if (!(vals = rpc_srv_returnVars(call, i))) return -1; - for (f = srv->srv_funcs, v = vals; f; f = f->func_next) { + for (f = srv->srv_funcs, i = 0; 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); + memset(str, 0, sizeof str); + snprintf(str, sizeof str, "/%s/%s()", f->func_file, f->func_name); + v = io_array(vals, i++, ait_val_t*); + AIT_SET_STR(v, str); } } @@ -122,10 +134,11 @@ rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv } int -rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerSessions(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *vals; + array_t *vals; + ait_val_t *v; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -136,16 +149,20 @@ rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t if (!(vals = rpc_srv_returnVars(call, 4))) return -1; - 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); + v = io_array(vals, 0, ait_val_t*); + AIT_SET_U8(v, srv->srv_session.sess_version); + v = io_array(vals, 1, ait_val_t*); + AIT_SET_U32(v, srv->srv_session.sess_program); + v = io_array(vals, 2, ait_val_t*); + AIT_SET_U32(v, srv->srv_session.sess_process); + v = io_array(vals, 3, ait_val_t*); + AIT_SET_I32(v, srv->srv_numcli); return 0; } int -rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerShutdown(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; @@ -165,7 +182,7 @@ rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t // ---------------------------------------------------- int -rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; @@ -183,10 +200,11 @@ rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_va } int -rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + array_t *vals; + ait_val_t *v; rpc_blob_t *b; register int i; @@ -203,15 +221,17 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t return 0; } - for (b = srv->srv_blob.blobs, v = vals; b; b = b->blob_next) - RPC_SET_U32(v++, b->blob_var); + for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) { + v = io_array(vals, i, ait_val_t*); + AIT_SET_U32(v, b->blob_var); + } pthread_mutex_unlock(&srv->srv_blob.mtx); return 0; } int -rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerState(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; @@ -221,24 +241,26 @@ rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t else srv = call->func_parent; - if (iv[0].val_type != i32) + if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32) return -1; - srv->srv_blob.state = RPC_GET_I32(&iv[0]); + srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*)); return 0; } int -rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerClients(rpc_func_t *call, int ic, array_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + array_t *vals; + ait_val_t *v; rpc_cli_t *cli; register int i; - const char *str; + const char *str = NULL; char wrk[INET6_ADDRSTRLEN]; struct sockaddr_in *s; struct sockaddr_in6 *s6; + struct sockaddr_un *su; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -249,23 +271,32 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val if (!(vals = rpc_srv_returnVars(call, srv->srv_numcli))) return -1; - for (i = 0, cli = srv->srv_blob.clients, v = vals; i < srv->srv_numcli; i++, cli++) { + for (i = 0, cli = srv->srv_blob.clients; i < srv->srv_numcli; i++, cli++) { + v = io_array(vals, i, ait_val_t*); + if (!cli->cli_sa.sa_family) { - RPC_SET_STR(v++, ""); + AIT_SET_STR(v, ""); 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); + switch (cli->cli_sa.sa_family) { + case AF_INET: + s = (struct sockaddr_in*) &cli->cli_sa; + str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk); + break; + case AF_INET6: + s6 = (struct sockaddr_in6*) &cli->cli_sa; + str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk); + break; + case AF_LOCAL: + su = (struct sockaddr_un*) &cli->cli_sa; + str = su->sun_path; + break; } if (str) - RPC_SET_STR(v++, (char*) str); + AIT_SET_STR(v, (char*) str); else - RPC_SET_STR(v++, "0.0.0.0"); + AIT_SET_STR(v, "0.0.0.0"); } return 0;