--- libaitrpc/example/tsrv.c	2012/05/17 09:32:51	1.7.4.5
+++ libaitrpc/example/tsrv.c	2012/05/18 15:24:33	1.7.4.6
@@ -4,14 +4,13 @@
 #include "rc.h"
 
 
-int aaa(rpc_func_t *f, struct tagRPCCall *rpc, array_t *iv)
+int aaa(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
-	rpc_blob_t *b;
+//	rpc_blob_t *b;
 
-	RPC_CALLBACK_CHECK_INPUT(f);
+	RPC_CALLBACK_CHECK_INPUT(cli);
 
-	printf("%s(%d): Piuk! %p(0x%x)\n", __func__, __LINE__, 
-			AIT_GET_PTR(&f->func_name), AIT_KEY(&f->func_name));
+	printf("%s(%d): Piuk! aaaaaa\n", __func__, __LINE__);
 
 	/*
 	b = rpc_srv_registerBLOB(f->func_parent, BUFSIZ);
@@ -30,48 +29,41 @@ int aaa(rpc_func_t *f, struct tagRPCCall *rpc, array_t
 	return 0;
 }
 
-int BBB(rpc_func_t *f, struct tagRPCCall *rpc, array_t *iv)
+int BBB(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
 	ait_val_t *v;
 	rpc_blob_t *b;
+	rpc_srv_t *s;
 
-	RPC_CALLBACK_CHECK_INPUT(f);
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	s = RPC_SRV_SERVER(cli);
 
-	printf("%s(%d): Piuk! %p(0x%x)  %d %s %X\n", __func__, __LINE__, 
-			AIT_GET_PTR(&f->func_name), AIT_KEY(&f->func_name), 
+	printf("%s(%d): Piuk! %d %s %X\n", __func__, __LINE__, 
 			AIT_GET_I32(io_array(iv, 0, ait_val_t*)), AIT_GET_STR(io_array(iv, 1, ait_val_t*)), 
 			AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));
-	printf("%s(%d): Piuk! %p(0x%x)  %d %s %X\n", __func__, __LINE__, 
-			AIT_GET_PTR(&f->func_name), AIT_KEY(&f->func_name), 
-			AIT_GET_I32(io_array(iv, 0, ait_val_t*)), AIT_GET_STR(io_array(iv, 1, ait_val_t*)));
 
 	// input blob object
-	if (!(b = rpc_srv_getBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)))))
+	if (!(b = rpc_srv_getBLOB(s, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)))))
 		return -1;
-	if (rpc_srv_blobMap(f->func_parent, b) == -1) {
-		rpc_srv_blobFree(f->func_parent, b);
+	if (rpc_srv_blobMap(s, b) == -1) {
+		rpc_srv_blobFree(s, b);
 		return -1;
 	}
 	printf("VAR=%X(%d):: %s\n", b->blob_var, b->blob_len, b->blob_data);
 	rpc_srv_blobUnmap(b);
-	rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));
+	rpc_srv_unregisterBLOB(s, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));
 
 
-	v = io_array(f->func_vars, 0, ait_val_t*);
-	AIT_SET_BUF(v, "00!oo", 6);
-	v = io_array(f->func_vars, 1, ait_val_t*);
-	AIT_SET_I8(v, 65);
-	v = io_array(f->func_vars, 2, ait_val_t*);
-	AIT_SET_STR(v, "Oho boho i cheburashka");
+	AIT_SET_BUF(io_getVars(&RPC_RETVARS(cli), 0), "00!oo", 6);
+	AIT_SET_I8(io_getVars(&RPC_RETVARS(cli), 1), 65);
+	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 2), "Oho boho i cheburashka");
 
 	// return blob object
-	b = rpc_srv_registerBLOB(f->func_parent, 128);
+	b = rpc_srv_registerBLOB(s, 128);
 	if (!b)
 		return -1;
-	else {
-		v = io_array(f->func_vars, 3, ait_val_t*);
-		AIT_SET_BLOB2(v, b);
-	}
+	else
+		AIT_SET_BLOB2(io_getVars(&RPC_RETVARS(cli), 3), b);
 
 	printf("data=%p blen=%d\n", b->blob_data, b->blob_len);
 	memset(b->blob_data, 0, b->blob_len);
@@ -81,28 +73,23 @@ int BBB(rpc_func_t *f, struct tagRPCCall *rpc, array_t
 	return 33;
 }
 
-int xxx(rpc_func_t *f, struct tagRPCCall *rpc, array_t *iv)
+int xxx(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
 	ait_val_t *v;
 
-	RPC_CALLBACK_CHECK_INPUT(f);
+	RPC_CALLBACK_CHECK_INPUT(cli);
 
 	printf("iv_s=%d\n", io_arraySize(iv));
-	printf("%s(%d): Piuk! %p(0x%x) --- %s\n", __func__, __LINE__, 
-			AIT_GET_PTR(&f->func_name), AIT_KEY(&f->func_name), 
-			AIT_GET_BUF(io_array(iv, 0, ait_val_t*)));
-	fflush(stdout);
+	printf("%s(%d): Piuk! --- %s\n", __func__, __LINE__, AIT_GET_BUF(io_array(iv, 0, ait_val_t*)));
 
-	v = io_array(f->func_vars, 0, ait_val_t*);
+	v = io_getVars(&RPC_RETVARS(cli), 0);
 	AIT_SET_DATA(v, "00!oo", 6);
-	io_arraySet(f->func_vars, 0, v);
-	v = io_array(f->func_vars, 1, ait_val_t*);
-	AIT_SET_I8(v, 65);
-	io_arraySet(f->func_vars, 1, v);
+	io_arraySet(RPC_RETVARS(cli), 0, v);
+	AIT_SET_I8(io_getVars(&RPC_RETVARS(cli), 1), 65);
 	return 111;
 }
 
-int xYz(rpc_func_t *f, struct tagRPCCall *rpc, array_t *iv)
+int xYz(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
 	return 0;
 }
@@ -126,11 +113,11 @@ int main()
 		return 1;
 	}
 
-	rpc_srv_registerCall(srv, RC_aaa, aaa, 0);
-	rpc_srv_registerCall(srv, RC_BBB, BBB, 4);
-	rpc_srv_registerCall(srv, 3, NULL, 1);
-	rpc_srv_registerCall(srv, RC_xYz, xYz, 2);
-	rpc_srv_registerCall(srv, RC_xxx, xxx, 2);
+	rpc_srv_registerCall(srv, RC_aaa, aaa);
+	rpc_srv_registerCall(srv, RC_BBB, BBB);
+	rpc_srv_registerCall(srv, 3, NULL);
+	rpc_srv_registerCall(srv, RC_xYz, xYz);
+	rpc_srv_registerCall(srv, RC_xxx, xxx);
 
 	rpc_srv_unregisterCall(srv, 4);