--- libaitrpc/src/builtin.c	2011/08/29 22:37:06	1.3
+++ libaitrpc/src/builtin.c	2011/08/30 11:13:29	1.3.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.3 2011/08/29 22:37:06 misho Exp $
+* $Id: builtin.c,v 1.3.2.2 2011/08/30 11:13:29 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,10 +49,10 @@ 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 = NULL;
@@ -72,7 +72,7 @@ rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
 
 	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;
 		}
 
@@ -91,19 +91,19 @@ rpcServerClients(rpc_func_t *call, int ic, rpc_val_t *
 				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];
@@ -122,7 +122,7 @@ rpcServerCalls(rpc_func_t *call, int ic, rpc_val_t *iv
 		if (*f->func_name) {
 			memset(str, 0, sizeof str);
 			snprintf(str, sizeof str, "/%s/%s()", f->func_file, f->func_name);
-			RPC_SET_STR(v++, str);
+			AIT_SET_STR(v++, str);
 		}
 	}
 
@@ -130,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)
@@ -144,16 +144,16 @@ 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);
+	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;
 
@@ -173,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;
 
@@ -191,10 +191,10 @@ 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, 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;
 
@@ -212,14 +212,14 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t 
 	}
 
 	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;
 
@@ -229,18 +229,18 @@ rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t
 	else
 		srv = call->func_parent;
 
-	if (iv[0].val_type != i32)
+	if (AIT_TYPE(&iv[0]) != 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 = NULL;
@@ -260,7 +260,7 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
 
 	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;
 		}
 
@@ -279,9 +279,9 @@ rpcBLOBServerClients(rpc_func_t *call, int ic, rpc_val
 				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;