--- libaitrpc/src/builtin.c	2012/05/16 13:47:16	1.7.2.3
+++ libaitrpc/src/builtin.c	2012/05/17 08:42:32	1.7.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.7.2.3 2012/05/16 13:47:16 misho Exp $
+* $Id: builtin.c,v 1.7.2.7 2012/05/17 08:42:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -48,8 +48,8 @@ SUCH DAMAGE.
 
 /* builtin RPC server functions */
 
-int
-rpcServerClients(rpc_func_t *call, int ic, array_t *iv)
+static int
+rpcServerClients(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv)
 {
 	rpc_srv_t *srv;
 	rpc_cli_t *cli;
@@ -60,10 +60,7 @@ rpcServerClients(rpc_func_t *call, int ic, array_t *iv
 	ait_val_t v;
 
 	RPC_CALLBACK_CHECK_INPUT(call);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	srv = RPC_FUNC_SERVER(call);
 
 	len = io_arraySize(srv->srv_clients) * STRSIZ;
 	if (!(val = malloc(len))) {
@@ -86,13 +83,13 @@ 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);
+	AIT_SET_STR(io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val);
 	free(val);
 	return 0;
 }
 
-int
-rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
+static int
+rpcServerCalls(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv)
 {
 	rpc_srv_t *srv;
 	rpc_func_t *f;
@@ -101,10 +98,7 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
 	char *val, str[MAXPATHLEN];
 
 	RPC_CALLBACK_CHECK_INPUT(call);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	srv = RPC_FUNC_SERVER(call);
 
 	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
 		i++;
@@ -120,75 +114,73 @@ rpcServerCalls(rpc_func_t *call, int ic, array_t *iv)
 		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));
+					AIT_ADDR(&f->func_name), io_arraySize(RPC_FUNC_RETVARS(f)));
 			strlcat(val, str, len);
 		}
 
-	AIT_SET_STR(io_array(f->func_vars, 0, ait_val_t*), val);
+	AIT_SET_STR(io_getVars(RPC_FUNC_RETVARS(call), 0), val);
 	free(val);
 	return 0;
 }
 
-int
-rpcServerSessions(rpc_func_t *call, int ic, array_t *iv)
+static int
+rpcServerSessions(rpc_func_t *call, 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;
+	srv = RPC_FUNC_SERVER(call);
 
-	v = io_array(call->func_vars, 0, ait_val_t*);
+	v = io_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*);
 	AIT_SET_U8(v, srv->srv_session.sess_version);
-	v = io_array(call->func_vars, 1, ait_val_t*);
+	v = io_array(RPC_FUNC_RETVARS(call), 1, ait_val_t*);
 	AIT_SET_U32(v, srv->srv_session.sess_program);
-	v = io_array(call->func_vars, 2, ait_val_t*);
+	v = io_array(RPC_FUNC_RETVARS(call), 2, ait_val_t*);
 	AIT_SET_U8(v, srv->srv_session.sess_process);
-	v = io_array(call->func_vars, 3, ait_val_t*);
+	v = io_array(RPC_FUNC_RETVARS(call), 3, ait_val_t*);
 	AIT_SET_I32(v, io_arraySize(srv->srv_clients));
 
 	return 0;
 }
 
-int
-rpcServerShutdown(rpc_func_t *call, int ic, array_t *iv)
+static int
+rpcServerShutdown(rpc_func_t *call, 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;
+	srv = RPC_FUNC_SERVER(call);
 
 	srv->srv_kill = 1;
 
 	return 0;
 }
 
+static int
+rpcServerPing(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv)
+{
+	AIT_SET_U16(io_getVars(RPC_FUNC_RETVARS(call), 0), ntohs(rpc->call_seq));
+	return 0;
+}
+
 /* ---------------------------------------------------- */
 
-int
-rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_t *iv)
+static int
+rpcBLOBServerShutdown(rpc_func_t *call, 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;
+	srv = RPC_FUNC_SERVER(call);
 
 	srv->srv_blob.kill = 1;
 
 	return 0;
 }
 
-int
-rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *iv)
+static int
+rpcBLOBServerVars(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv)
 {
 	rpc_srv_t *srv;
 	rpc_blob_t *b;
@@ -197,13 +189,10 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, array_t *i
 	int len;
 
 	RPC_CALLBACK_CHECK_INPUT(call);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	srv = RPC_FUNC_SERVER(call);
 
 	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_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), "BLOB Server is killed");
 		return 1;
 	}
 
@@ -212,7 +201,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_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), "");
 		return 0;
 	}
 
@@ -228,13 +217,13 @@ 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_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val);
 	free(val);
 	return 0;
 }
 
-int
-rpcBLOBServerClients(rpc_func_t *call, int ic, array_t *iv)
+static int
+rpcBLOBServerClients(rpc_func_t *call, struct tagRPCCall *rpc, array_t *iv)
 {
 	rpc_srv_t *srv;
 	rpc_cli_t *cli;
@@ -245,13 +234,10 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
 	ait_val_t v;
 
 	RPC_CALLBACK_CHECK_INPUT(call);
-	if (!call->func_parent)
-		return -1;
-	else
-		srv = call->func_parent;
+	srv = RPC_FUNC_SERVER(call);
 
 	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_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), "BLOB Server is killed");
 		return 1;
 	}
 
@@ -276,7 +262,73 @@ 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_array(RPC_FUNC_RETVARS(call), 0, ait_val_t*), val);
 	free(val);
+	return 0;
+}
+
+/* ----------------------------------------------------------------- */
+
+/*
+ * 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) < 1)
+		return -1;
+
+	return 0;
+}
+
+/*
+ * rpc_register_srvServices() - Register internal service functions
+ *
+ * @srv = RPC server instance
+ * return: -1 error or 0 ok
+ */
+int
+rpc_register_srvServices(rpc_srv_t * __restrict srv)
+{
+	if (!srv)
+		return -1;
+
+	if (rpc_srv_registerCall(srv, CALL_SRVSHUTDOWN, rpcServerShutdown, 0) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_SRVCLIENTS, rpcServerClients, 1) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_SRVSESSIONS, rpcServerSessions, 4) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_SRVCALLS, rpcServerCalls, 1) < 1)
+		return -1;
+
+	return 0;
+}
+
+/*
+ * rpc_register_blobServices() - Register internal service functions
+ *
+ * @srv = RPC server instance
+ * return: -1 error or 0 ok
+ */
+int
+rpc_register_blobServices(rpc_srv_t * __restrict srv)
+{
+	if (!srv)
+		return -1;
+
+	if (rpc_srv_registerCall(srv, CALL_BLOBSHUTDOWN, rpcBLOBServerShutdown, 0) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_BLOBCLIENTS, rpcBLOBServerClients, 1) < 1)
+		return -1;
+	if (rpc_srv_registerCall(srv, CALL_BLOBVARS, rpcBLOBServerVars, 1) < 1)
+		return -1;
+
 	return 0;
 }