--- libaitrpc/example/tsrv.c	2012/03/29 01:34:16	1.7
+++ libaitrpc/example/tsrv.c	2012/05/19 00:29:49	1.8
@@ -1,16 +1,16 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <aitrpc.h>
+#include "rc.h"
 
 
-
-int aaa(rpc_func_t *f, int in, 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! %s\n", __func__, __LINE__, AIT_GET_STR(&f->func_name));
+	printf("%s(%d): Piuk! aaaaaa\n", __func__, __LINE__);
 
 	/*
 	b = rpc_srv_registerBLOB(f->func_parent, BUFSIZ);
@@ -29,48 +29,41 @@ int aaa(rpc_func_t *f, int in, array_t *iv)
 	return 0;
 }
 
-int BBB(rpc_func_t *f, int in, array_t *iv)
+int BBB(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
 	ait_val_t *v;
 	rpc_blob_t *b;
-	array_t *arr;
+	rpc_srv_t *s;
 
-	RPC_CALLBACK_CHECK_INPUT(f);
+	RPC_CALLBACK_CHECK_INPUT(cli);
+	s = RPC_SRV_SERVER(cli);
 
-	printf("%s(%d): Piuk! %s  %d %s %X\n", __func__, __LINE__, AIT_GET_STR(&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! %s  %d %s %X\n", __func__, __LINE__, AIT_GET_STR(&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*)));
 
 
-	rpc_srv_getVars(f, &arr);
-	v = io_array(arr, 0, ait_val_t*);
-	AIT_SET_BUF(v, "00!oo", 6);
-	v = io_array(arr, 1, ait_val_t*);
-	AIT_SET_I8(v, 65);
-	v = io_array(arr, 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(arr, 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);
@@ -80,37 +73,36 @@ int BBB(rpc_func_t *f, int in, array_t *iv)
 	return 33;
 }
 
-int xxx(rpc_func_t *f, int in, array_t *iv)
+int xxx(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
-	array_t *arr;
 	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! %s --- %s\n", __func__, __LINE__, AIT_GET_STR(&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*)));
 
-	rpc_srv_getVars(f, &arr);
-	v = io_array(arr, 0, ait_val_t*);
+	v = io_getVars(&RPC_RETVARS(cli), 0);
 	AIT_SET_DATA(v, "00!oo", 6);
-	io_arraySet(arr, 0, v);
-	v = io_array(arr, 1, ait_val_t*);
-	AIT_SET_I8(v, 65);
+	io_arraySet(RPC_RETVARS(cli), 0, v);
+	AIT_SET_I8(io_getVars(&RPC_RETVARS(cli), 1), 65);
 	return 111;
 }
 
-io_enableDEBUG = 7;
+int xYz(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
+{
+	return 0;
+}
 
+
 int main()
 {
 	rpc_srv_t *srv;
 	rpc_func_t *f;
 	int ret;
 
-	srv = rpc_srv_initServer(100, 2, 1, 1024 * 10, AF_INET, "0.0.0.0", 11111);
-//	srv = rpc_srv_initServer(100, 2, 1, AF_LOCAL, "0.0.0.0", 11111);
+	srv = rpc_srv_initServer(100, 2, 2, 1024 * 10, "0.0.0.0", 11111);
+//	srv = rpc_srv_initServer(100, 2, 1, 1024 * 10, "0.0.0.0", 11111);
 	if (!srv) {
 		printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError());
 		return 1;
@@ -121,35 +113,21 @@ int main()
 		return 1;
 	}
 
-	rpc_srv_registerCall(srv, NULL, "aaa", 0);
-	rpc_srv_registerCall(srv, NULL, "BBB", 4);
-	rpc_srv_registerCall(srv, NULL, "dummy", 1);
-	rpc_srv_registerCall(srv, NULL, "xYz", 2);
-	rpc_srv_registerCall(srv, NULL, "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);
 
-	/* dump register functions */
-	/*
-	for (f = srv->srv_funcs; f; f = f->func_next)
-		printf("0.func::name=%s args=%d\n", AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars));
-		*/
+	rpc_srv_unregisterCall(srv, 4);
 
-	rpc_srv_unregisterCall(srv, NULL, "dummy");
+	rpc_register_srvServices(srv);
+	rpc_register_blobServices(srv);
 
-	/* dump register functions */
-	/*
-	for (f = srv->srv_funcs; f; f = f->func_next)
-		printf("1.func::name=%s args=%d\n", AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars));
-		*/
+	rpc_srv_execBLOBServer(srv);
+	rpc_srv_loopServer(srv);
 
-//	if (!fork()) {
-/////////		setsid();
-
-		rpc_srv_loopServer(srv);
-////		rpc_srv_execServer(srv, &ret);
-//	}
-
 	rpc_srv_endBLOBServer(srv);
 	rpc_srv_endServer(&srv);
-
 	return 0;
 }