--- libaitrpc/src/srv.c	2011/08/29 22:37:06	1.4
+++ libaitrpc/src/srv.c	2011/08/29 23:26:56	1.4.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.4 2011/08/29 22:37:06 misho Exp $
+* $Id: srv.c,v 1.4.2.1 2011/08/29 23:26:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -51,7 +51,7 @@ rpc_srv_dispatchCall(void *arg)
 {
 	rpc_cli_t *c = arg;
 	rpc_srv_t *s;
-	rpc_val_t *vals = NULL, *v = NULL;
+	ait_val_t *vals = NULL, *v = NULL;
 	rpc_func_t *f = NULL;
 	struct tagRPCCall *rpc;
 	struct tagRPCRet *rrpc;
@@ -106,16 +106,16 @@ rpc_srv_dispatchCall(void *arg)
 			Limit = sizeof(struct tagRPCCall);
 		/* RPC is OK! Go decapsulate variables ... */
 		if (rpc->call_argc) {
-			v = (rpc_val_t*) (buf + Limit);
+			v = (ait_val_t*) (buf + Limit);
 			/* check RPC packet length */
-			if (rpc->call_argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
+			if (rpc->call_argc * sizeof(ait_val_t) > sizeof buf - Limit) {
 				rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n");
 				ret = -5;
 				goto makeReply;
 			} else
-				Limit += rpc->call_argc * sizeof(rpc_val_t);
+				Limit += rpc->call_argc * sizeof(ait_val_t);
 			/* RPC received variables types OK! */
-			data = (u_char*) v + rpc->call_argc * sizeof(rpc_val_t);
+			data = (u_char*) v + rpc->call_argc * sizeof(ait_val_t);
 			for (i = 0; i < rpc->call_argc; i++) {
 				switch (v[i].val_type) {
 					case buffer:
@@ -183,10 +183,10 @@ makeReply:
 		rrpc->ret_argc = argc;
 
 		if (argc && vals) {
-			v = (rpc_val_t*) (buf + Limit);
-			if (argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
+			v = (ait_val_t*) (buf + Limit);
+			if (argc * sizeof(ait_val_t) > sizeof buf - Limit) {
 				for (i = 0; i < argc; i++)
-					RPC_FREE_VAL(&vals[i]);
+					AIT_FREE_VAL(&vals[i]);
 				rpc_srv_freeVars(f);
 				vals = NULL;
 				argc = 0;
@@ -194,9 +194,9 @@ makeReply:
 				rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
 				goto makeReply;
 			} else
-				Limit += argc * sizeof(rpc_val_t);
-			memcpy(v, vals, argc * sizeof(rpc_val_t));
-			data = (u_char*) v + argc * sizeof(rpc_val_t);
+				Limit += argc * sizeof(ait_val_t);
+			memcpy(v, vals, argc * sizeof(ait_val_t));
+			data = (u_char*) v + argc * sizeof(ait_val_t);
 			for (ret = i = 0; i < argc; i++) {
 				switch (vals[i].val_type) {
 					case buffer:
@@ -240,7 +240,7 @@ makeReply:
 						break;
 				}
 
-				RPC_FREE_VAL(&vals[i]);
+				AIT_FREE_VAL(&vals[i]);
 			}
 			rpc_srv_freeVars(f);
 			vals = NULL;
@@ -850,7 +850,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
  */
 int
 rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
-		rpc_val_t * __restrict args)
+		ait_val_t * __restrict args)
 {
 	void *dl;
 	rpc_callback_t func;