--- libaitrpc/example/tsrv.c 2011/08/30 09:07:55 1.3.2.2 +++ libaitrpc/example/tsrv.c 2011/08/31 17:11:57 1.3.2.3 @@ -4,7 +4,7 @@ -int aaa(rpc_func_t *f, int in, ait_val_t *iv) +int aaa(rpc_func_t *f, int in, array_t *iv) { rpc_blob_t *b; @@ -29,39 +29,44 @@ int aaa(rpc_func_t *f, int in, ait_val_t *iv) return 0; } -int BBB(rpc_func_t *f, int in, ait_val_t *iv) +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__, f->func_name, - AIT_GET_I32(&iv[0]), AIT_GET_STR(&iv[1]), AIT_GET_BLOB(&iv[2])); + 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*))); // input blob object - if (!(b = rpc_srv_getBLOB(f->func_parent, AIT_GET_BLOB(&iv[2])))) + if (!(b = rpc_srv_getBLOB(f->func_parent, 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); return -1; } printf("VAR=%X(%d):: %s\n", b->blob_var, b->blob_len, b->blob_data); - rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(&iv[2])); + rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*))); 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"); + 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"); // return blob object b = rpc_srv_registerBLOB(f->func_parent, 128); if (!b) return -1; else - AIT_SET_BLOB2(&v[3], b); + AIT_SET_BLOB2(io_array(arr, 3, ait_val_t*), b); if (rpc_srv_blobMap(f->func_parent, b) == -1) { rpc_srv_blobFree(f->func_parent, b);