--- libaitrpc/src/builtin.c	2012/05/16 13:52:59	1.7.2.4
+++ libaitrpc/src/builtin.c	2012/05/18 15:24:33	1.7.2.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.7.2.4 2012/05/16 13:52:59 misho Exp $
+* $Id: builtin.c,v 1.7.2.9 2012/05/18 15:24:33 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,21 +49,18 @@ SUCH DAMAGE.
 /* builtin RPC server functions */
 
 static int
-rpcServerClients(rpc_func_t *call, int ic, 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);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	srv = RPC_SRV_SERVER(cli);
 
 	len = io_arraySize(srv->srv_clients) * STRSIZ;
 	if (!(val = malloc(len))) {
@@ -73,11 +70,11 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv
 		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)
+		c = io_array(srv->srv_clients, i, rpc_cli_t*);
+		if (!c)
 			continue;
 
-		str = io_n2addr(&cli->cli_sa, &v);
+		str = io_n2addr(&c->cli_sa, &v);
 		if (str)
 			strlcat(val, (char*) str, len);
 		else
@@ -86,13 +83,14 @@ 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);
+	/* return values */
+	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
 	free(val);
 	return 0;
 }
 
 static int
-rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
+rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
 	rpc_srv_t *srv;
 	rpc_func_t *f;
@@ -100,11 +98,8 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
 	int len;
 	char *val, str[MAXPATHLEN];
 
-	RPC_CALLBACK_CHECK_INPUT(call);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	srv = RPC_SRV_SERVER(cli);
 
 	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
 		i++;
@@ -119,68 +114,63 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
 	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
 		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));
+			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_array(f->func_vars, 0, ait_val_t*), val);
+	/* return variables */
+	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
 	free(val);
 	return 0;
 }
 
 static int
-rpcServerSessions(rpc_func_t *call, int ic, 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);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	srv = RPC_SRV_SERVER(cli);
 
-	v = io_array(call->func_vars, 0, ait_val_t*);
-	AIT_SET_U8(v, srv->srv_session.sess_version);
-	v = io_array(call->func_vars, 1, ait_val_t*);
-	AIT_SET_U32(v, srv->srv_session.sess_program);
-	v = io_array(call->func_vars, 2, ait_val_t*);
-	AIT_SET_U8(v, srv->srv_session.sess_process);
-	v = io_array(call->func_vars, 3, ait_val_t*);
-	AIT_SET_I32(v, io_arraySize(srv->srv_clients));
+	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);
 
 	return 0;
 }
 
 static int
-rpcServerShutdown(rpc_func_t *call, int ic, array_t *iv)
+rpcServerShutdown(rpc_cli_t *cli, 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;
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	srv = RPC_SRV_SERVER(cli);
 
 	srv->srv_kill = 1;
 
 	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));
+	return 0;
+}
+
 /* ---------------------------------------------------- */
 
 static int
-rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv)
+rpcBLOBServerShutdown(rpc_cli_t *cli, 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;
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	srv = RPC_SRV_SERVER(cli);
 
 	srv->srv_blob.kill = 1;
 
@@ -188,7 +178,7 @@ rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_
 }
 
 static int
-rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv)
+rpcBLOBServerVars(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
 	rpc_srv_t *srv;
 	rpc_blob_t *b;
@@ -196,14 +186,11 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 	char *val, str[64];
 	int len;
 
-	RPC_CALLBACK_CHECK_INPUT(call);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	srv = RPC_SRV_SERVER(cli);
 
 	if (srv->srv_blob.kill) {
-		AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed");
+		AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed");
 		return 1;
 	}
 
@@ -212,7 +199,7 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 	len = i * sizeof str;
 
 	if (!len) {
-		AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "");
+		AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), "");
 		return 0;
 	}
 
@@ -228,30 +215,27 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 		strlcat(val, str, len);
 	}
 
-	AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val);
+	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
 	free(val);
 	return 0;
 }
 
 static int
-rpcBLOBServerClients(rpc_func_t *call, int ic, 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);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	srv = RPC_SRV_SERVER(cli);
 
 	if (srv->srv_blob.kill) {
-		AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), "BLOB Server is killed");
+		AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), "BLOB Server is killed");
 		return 1;
 	}
 
@@ -263,11 +247,11 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 		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)
+		c = io_array(srv->srv_blob.clients, i, rpc_cli_t*);
+		if (!c)
 			continue;
 
-		str = io_n2addr(&cli->cli_sa, &v);
+		str = io_n2addr(&c->cli_sa, &v);
 		if (str)
 			strlcat(val, (char*) str, len);
 		else
@@ -276,7 +260,7 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 		AIT_FREE_VAL(&v);
 	}
 
-	AIT_SET_STR(io_array(call->func_vars, 0, ait_val_t*), val);
+	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
 	free(val);
 	return 0;
 }
@@ -284,6 +268,24 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 /* ----------------------------------------------------------------- */
 
 /*
+ * 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)
+		return -1;
+
+	return 0;
+}
+
+/*
  * rpc_register_srvServices() - Register internal service functions
  *
  * @srv = RPC server instance
@@ -295,13 +297,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;
@@ -319,11 +321,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;