--- libaitrpc/example/tsrv.c	2012/03/29 01:34:16	1.7
+++ libaitrpc/example/tsrv.c	2012/05/16 14:46:29	1.7.4.3
@@ -1,16 +1,17 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <aitrpc.h>
+#include "rc.h"
 
 
-
 int aaa(rpc_func_t *f, int in, array_t *iv)
 {
 	rpc_blob_t *b;
 
 	RPC_CALLBACK_CHECK_INPUT(f);
 
-	printf("%s(%d): Piuk! %s\n", __func__, __LINE__, AIT_GET_STR(&f->func_name));
+	printf("%s(%d): Piuk! %p(0x%x)\n", __func__, __LINE__, 
+			AIT_GET_PTR(&f->func_name), AIT_KEY(&f->func_name));
 
 	/*
 	b = rpc_srv_registerBLOB(f->func_parent, BUFSIZ);
@@ -33,14 +34,15 @@ int BBB(rpc_func_t *f, int in, array_t *iv)
 {
 	ait_val_t *v;
 	rpc_blob_t *b;
-	array_t *arr;
 
 	RPC_CALLBACK_CHECK_INPUT(f);
 
-	printf("%s(%d): Piuk! %s  %d %s %X\n", __func__, __LINE__, AIT_GET_STR(&f->func_name), 
+	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*)), 
 			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), 
+	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
@@ -55,12 +57,11 @@ int BBB(rpc_func_t *f, int in, array_t *iv)
 	rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));
 
 
-	rpc_srv_getVars(f, &arr);
-	v = io_array(arr, 0, ait_val_t*);
+	v = io_array(f->func_vars, 0, ait_val_t*);
 	AIT_SET_BUF(v, "00!oo", 6);
-	v = io_array(arr, 1, ait_val_t*);
+	v = io_array(f->func_vars, 1, ait_val_t*);
 	AIT_SET_I8(v, 65);
-	v = io_array(arr, 2, ait_val_t*);
+	v = io_array(f->func_vars, 2, ait_val_t*);
 	AIT_SET_STR(v, "Oho boho i cheburashka");
 
 	// return blob object
@@ -68,7 +69,7 @@ int BBB(rpc_func_t *f, int in, array_t *iv)
 	if (!b)
 		return -1;
 	else {
-		v = io_array(arr, 3, ait_val_t*);
+		v = io_array(f->func_vars, 3, ait_val_t*);
 		AIT_SET_BLOB2(v, b);
 	}
 
@@ -82,35 +83,39 @@ int BBB(rpc_func_t *f, int in, array_t *iv)
 
 int xxx(rpc_func_t *f, int in, array_t *iv)
 {
-	array_t *arr;
 	ait_val_t *v;
 
 	RPC_CALLBACK_CHECK_INPUT(f);
 
 	printf("iv_s=%d\n", io_arraySize(iv));
-	printf("%s(%d): Piuk! %s --- %s\n", __func__, __LINE__, AIT_GET_STR(&f->func_name), 
+	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);
 
-	rpc_srv_getVars(f, &arr);
-	v = io_array(arr, 0, ait_val_t*);
+	v = io_array(f->func_vars, 0, ait_val_t*);
 	AIT_SET_DATA(v, "00!oo", 6);
-	io_arraySet(arr, 0, v);
-	v = io_array(arr, 1, ait_val_t*);
+	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);
 	return 111;
 }
 
-io_enableDEBUG = 7;
+int xYz(rpc_func_t *f, int in, 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 +126,18 @@ 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, 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);
 
-	/* 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_srv_execBLOBServer(srv);
+	rpc_srv_loopServer(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));
-		*/
-
-//	if (!fork()) {
-/////////		setsid();
-
-		rpc_srv_loopServer(srv);
-////		rpc_srv_execServer(srv, &ret);
-//	}
-
 	rpc_srv_endBLOBServer(srv);
 	rpc_srv_endServer(&srv);
-
 	return 0;
 }