--- libaitrpc/example/tcli.c 2011/08/19 13:41:17 1.2.4.5 +++ libaitrpc/example/tcli.c 2011/08/30 07:56:40 1.3.2.1 @@ -2,14 +2,14 @@ #include #include -//rpc_val_t valz[3]; +//ait_val_t valz[3]; int main() { rpc_cli_t *cli, *cli2; int c, i, ret; - rpc_val_t tval, valz[3], *v = NULL; + ait_val_t tval, valz[3], *v = NULL; char *mem, *blob43 = malloc(512); cli = rpc_cli_openClient(100, 2, AF_INET, "127.0.0.1", 11111); @@ -27,17 +27,17 @@ int main() memset(blob43, 0, 512); strlcpy(blob43, "aaaaaaaaaaaaaaa cddddddddddddddd zzzzzzzzzzzzzzzzzzzzz !!!!\n\n\n675675676...\n", 512); - RPC_SET_I32(&(valz[0]), 12345678); - RPC_SET_STR(&(valz[1]), "gniah_blah SHMINK!"); - RPC_SET_BLOB(&(valz[2]), 0, 512); + AIT_SET_I32(&(valz[0]), 12345678); + AIT_SET_STR(&(valz[1]), "gniah_blah SHMINK!"); + AIT_SET_BLOB(&(valz[2]), 0, 512); if (rpc_cli_sendBLOB(cli2, &valz[2], blob43) == -1) { printf("!!!!! blob error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); return 2; } else - printf("Get BLOB = %x\n", RPC_GET_BLOB(&valz[2])); + printf("Get BLOB = %x\n", AIT_GET_BLOB(&valz[2])); /* test case for unknown blob ... - RPC_SET_BLOB(&tval, 0x554C1BC7, BUFSIZ); + AIT_SET_BLOB(&tval, 0x554C1BC7, BUFSIZ); printf("test not found blob=%d\n", rpc_cli_getBLOB(cli2, &tval, (void**) &mem)); if (mem) free(mem); @@ -51,28 +51,28 @@ int main() printf("ret=%d\n", ret); if (c && v) { printf("ret_val0:: %p %s len=%d type=%d\n", - &v[0], RPC_GET_BUF(&v[0]), RPC_LEN_VAL(&v[0]), RPC_TYPE_VAL(&v[0])); + &v[0], AIT_GET_BUF(&v[0]), AIT_LEN(&v[0]), AIT_TYPE(&v[0])); printf("ret_val1:: %d len=%d type=%d\n", - RPC_GET_I8(&v[1]), RPC_LEN_VAL(&v[1]), RPC_TYPE_VAL(&v[1])); + AIT_GET_I8(&v[1]), AIT_LEN(&v[1]), AIT_TYPE(&v[1])); printf("ret_val2:: is_empty? %d %s len=%d type=%d\n", - RPC_EMPTY_VAL(&v[2]), RPC_GET_STR(&v[2]), RPC_LEN_VAL(&v[2]), RPC_TYPE_VAL(&v[2])); - printf("ret_val3:: %X %d\n", RPC_GET_BLOB(&v[3]), RPC_LEN_VAL(&v[3])); + AIT_ISEMPTY(&v[2]), AIT_GET_STR(&v[2]), AIT_LEN(&v[2]), AIT_TYPE(&v[2])); + printf("ret_val3:: %X %d\n", AIT_GET_BLOB(&v[3]), AIT_LEN(&v[3])); // printf("test found blob=%d\n", rpc_cli_getBLOB(cli2, &v[3], (void**) &mem)); printf("+++++++++ test found blob=%d\n", rpc_cli_recvBLOB(cli2, &v[3], (void**) &mem)); if (mem) { printf("+++++++ BLOB=%s", mem); free(mem); } - RPC_FREE_VAL(&v[0]); - RPC_FREE_VAL(&v[1]); - RPC_FREE_VAL(&v[2]); - RPC_FREE_VAL(&v[3]); + AIT_FREE_VAL(&v[0]); + AIT_FREE_VAL(&v[1]); + AIT_FREE_VAL(&v[2]); + AIT_FREE_VAL(&v[3]); rpc_cli_freeVals(c, v); } } - RPC_FREE_VAL(&valz[0]); - RPC_FREE_VAL(&valz[1]); - RPC_FREE_VAL(&valz[2]); + AIT_FREE_VAL(&valz[0]); + AIT_FREE_VAL(&valz[1]); + AIT_FREE_VAL(&valz[2]); free(blob43); if (rpc_cli_execCall(cli, NULL, "aaa", 0, NULL, &c, &v) < 0) { @@ -86,7 +86,7 @@ int main() } printf("return=%d registeredClient\n", c); for (i = 0; i < c; i++) - printf("registeredClient(%d)=%s\n", i, RPC_GET_STR(&v[i])); + printf("registeredClient(%d)=%s\n", i, AIT_GET_STR(&v[i])); rpc_cli_freeVals(c, v); if (rpc_cli_execCall(cli, NULL, CALL_BLOBCLIENTS, 0, NULL, &c, &v) < 0) { printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); @@ -94,7 +94,7 @@ int main() } printf("return=%d registeredBLOBClient\n", c); for (i = 0; i < c; i++) - printf("registeredBLOBClient(%d)=%s\n", i, RPC_GET_STR(&*v)); + printf("registeredBLOBClient(%d)=%s\n", i, AIT_GET_STR(&*v)); rpc_cli_freeVals(c, v); if (rpc_cli_execCall(cli, NULL, CALL_BLOBVARS, 0, NULL, &c, &v) < 0) { @@ -102,22 +102,22 @@ int main() return 5; } for (i = 0; i < c; i++) - printf("registeredBLOBVars(%d)=%0X\n", i, RPC_GET_U32(&v[i])); + printf("registeredBLOBVars(%d)=%0X\n", i, AIT_GET_U32(&v[i])); rpc_cli_freeVals(c, v); if (rpc_cli_execCall(cli, NULL, CALL_SRVCALLS, 0, NULL, &c, &v) < 0) { printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); return 5; } for (i = 0; i < c; i++) - printf("registeredCall(%d)=%s\n", i, RPC_GET_STR(&v[i])); + printf("registeredCall(%d)=%s\n", i, AIT_GET_STR(&v[i])); rpc_cli_freeVals(c, v); if (rpc_cli_execCall(cli, NULL, CALL_SRVSESSIONS, 0, NULL, &c, &v) < 0) { printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); return 6; } printf("c=%d v=%p\n", c, v); - printf("session(%d:%d:%d) clients=%d\n", (uint8_t) RPC_GET_U8(&v[0]), (uint32_t) RPC_GET_U32(&v[1]), - RPC_GET_U32(&v[2]), RPC_GET_I32(&v[3])); + printf("session(%d:%d:%d) clients=%d\n", (uint8_t) AIT_GET_U8(&v[0]), (uint32_t) AIT_GET_U32(&v[1]), + AIT_GET_U32(&v[2]), AIT_GET_I32(&v[3])); rpc_cli_freeVals(c, v); rpc_cli_execCall(cli, NULL, CALL_SRVSHUTDOWN, 0, NULL, 0, NULL);