--- libaitrpc/src/builtin.c 2011/05/02 23:07:55 1.1.1.1.2.9 +++ libaitrpc/src/builtin.c 2011/08/29 23:26:56 1.3.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: builtin.c,v 1.1.1.1.2.9 2011/05/02 23:07:55 misho Exp $ +* $Id: builtin.c,v 1.3.2.1 2011/08/29 23:26:56 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -49,16 +49,17 @@ 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, ait_val_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + ait_val_t *v, *vals; 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) @@ -66,36 +67,43 @@ rpcServerClients(rpc_func_t *call, int ic, rpc_val_t * else srv = call->func_parent; - if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) + 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++) { 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, ait_val_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + ait_val_t *v, *vals; rpc_func_t *f; register int i; char str[MAXPATHLEN]; @@ -107,14 +115,14 @@ rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv srv = call->func_parent; for (i = 0, f = srv->srv_funcs; f; i++, f = f->func_next); - if (!(vals = rpc_srv_retValsCall(call, i))) + if (!(vals = rpc_srv_returnVars(call, i))) return -1; for (f = srv->srv_funcs, v = vals; 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); + AIT_SET_STR(v++, str); } } @@ -122,10 +130,10 @@ 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, ait_val_t *iv) { rpc_srv_t *srv; - rpc_val_t *vals; + ait_val_t *vals; RPC_CALLBACK_CHECK_INPUT(call); if (!call->func_parent) @@ -133,19 +141,19 @@ rpcServerSessions(rpc_func_t *call, int ic, rpc_val_t else srv = call->func_parent; - if (!(vals = rpc_srv_retValsCall(call, 4))) + 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); + AIT_SET_U8(&vals[0], srv->srv_session.sess_version); + AIT_SET_U32(&vals[1], srv->srv_session.sess_program); + AIT_SET_U32(&vals[2], srv->srv_session.sess_process); + AIT_SET_I32(&vals[3], srv->srv_numcli); return 0; } int -rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcServerShutdown(rpc_func_t *call, int ic, ait_val_t *iv) { rpc_srv_t *srv; @@ -156,7 +164,7 @@ rpcServerShutdown(rpc_func_t *call, int ic, rpc_val_t srv = call->func_parent; pthread_mutex_lock(&srv->srv_mtx); - rpc_Kill = 1; + srv->srv_kill = kill; pthread_mutex_unlock(&srv->srv_mtx); return 0; @@ -165,7 +173,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, ait_val_t *iv) { rpc_srv_t *srv; @@ -176,17 +184,17 @@ rpcBLOBServerShutdown(rpc_func_t *call, int ic, rpc_va srv = call->func_parent; pthread_mutex_lock(&srv->srv_blob.mtx); - blob_Kill = 1; + srv->srv_blob.state = kill; pthread_mutex_unlock(&srv->srv_blob.mtx); return 0; } int -rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerVars(rpc_func_t *call, int ic, ait_val_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + ait_val_t *v, *vals; rpc_blob_t *b; register int i; @@ -198,20 +206,20 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t pthread_mutex_lock(&srv->srv_blob.mtx); for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next); - if (!(vals = rpc_srv_retValsCall(call, i))) { + if (!(vals = rpc_srv_returnVars(call, i))) { pthread_mutex_unlock(&srv->srv_blob.mtx); return 0; } for (b = srv->srv_blob.blobs, v = vals; b; b = b->blob_next) - RPC_SET_U32(v++, b->blob_var); + 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, ait_val_t *iv) { rpc_srv_t *srv; @@ -224,21 +232,22 @@ rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t if (iv[0].val_type != i32) return -1; - srv->srv_blob.state = RPC_GET_I32(&iv[0]); + srv->srv_blob.state = AIT_GET_I32(&iv[0]); return 0; } int -rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val_t *iv) +rpcBLOBServerClients(rpc_func_t *call, int ic, ait_val_t *iv) { rpc_srv_t *srv; - rpc_val_t *v, *vals; + ait_val_t *v, *vals; 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) @@ -246,26 +255,33 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val else srv = call->func_parent; - if (!(vals = rpc_srv_retValsCall(call, srv->srv_numcli))) + 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++) { 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;