--- libaitrpc/example/tsrv.c 2011/08/18 22:24:07 1.2.4.2 +++ libaitrpc/example/tsrv.c 2011/08/30 07:56:40 1.3.2.1 @@ -3,7 +3,8 @@ #include -int aaa(rpc_func_t *f, int in, rpc_val_t *iv) + +int aaa(rpc_func_t *f, int in, ait_val_t *iv) { rpc_blob_t *b; @@ -28,39 +29,39 @@ int aaa(rpc_func_t *f, int in, rpc_val_t *iv) return 0; } -int BBB(rpc_func_t *f, int in, rpc_val_t *iv) +int BBB(rpc_func_t *f, int in, ait_val_t *iv) { - rpc_val_t *v; + ait_val_t *v; rpc_blob_t *b; RPC_CALLBACK_CHECK_INPUT(f); printf("%s(%d): Piuk! %s %d %s %X\n", __func__, __LINE__, f->func_name, - RPC_GET_I32(&iv[0]), RPC_GET_STR(&iv[1]), RPC_GET_BLOB(&iv[2])); + AIT_GET_I32(&iv[0]), AIT_GET_STR(&iv[1]), AIT_GET_BLOB(&iv[2])); // input blob object - if (!(b = rpc_srv_getBLOB(f->func_parent, RPC_GET_BLOB(&iv[2])))) + if (!(b = rpc_srv_getBLOB(f->func_parent, AIT_GET_BLOB(&iv[2])))) return -1; if (rpc_srv_blobMap(f->func_parent, b) == -1) { rpc_srv_blobFree(f->func_parent, b); return -1; } printf("VAR=%X(%d):: %s\n", b->blob_var, b->blob_len, b->blob_data); - rpc_srv_unregisterBLOB(f->func_parent, RPC_GET_BLOB(&iv[2])); + rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(&iv[2])); - rpc_srv_declValsCall(f, 4); - rpc_srv_getValsCall(f, &v); - RPC_SET_BUF(&v[0], "00!oo", 6); - RPC_SET_I8(&v[1], 65); - RPC_SET_STR(&v[2], "Oho boho i cheburashka"); + rpc_srv_allocVars(f, 4); + rpc_srv_getVars(f, &v); + AIT_SET_BUF(&v[0], "00!oo", 6); + AIT_SET_I8(&v[1], 65); + AIT_SET_STR(&v[2], "Oho boho i cheburashka"); // return blob object b = rpc_srv_registerBLOB(f->func_parent, 128); if (!b) return -1; else - RPC_SET_BLOB2(&v[3], b); + AIT_SET_BLOB2(&v[3], b); if (rpc_srv_blobMap(f->func_parent, b) == -1) { rpc_srv_blobFree(f->func_parent, b); @@ -82,18 +83,17 @@ int main() pthread_t tid[2]; int ret; - srv = rpc_srv_initServer(100, 2, 1, SOCK_STREAM, AF_INET, "0.0.0.0", 11111); + srv = rpc_srv_initServer(100, 2, 1, AF_INET, "0.0.0.0", 11111); +// srv = rpc_srv_initServer(100, 2, 1, AF_LOCAL, "0.0.0.0", 11111); if (!srv) { printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); return 1; } - /* - if (rpc_srv_initBLOBServer(srv, SOCK_STREAM, 0, "/tmp")) { + if (rpc_srv_initBLOBServer(srv, 0, "/tmp")) { printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); return 1; } - */ /* dump register functions for (f = srv->srv_funcs; f; f = f->func_next) @@ -114,7 +114,7 @@ int main() rpc_srv_execServer(srv); } -// rpc_srv_endBLOBServer(srv); + rpc_srv_endBLOBServer(srv); rpc_srv_endServer(srv); return 0; }