--- libaitrpc/inc/aitrpc.h 2010/06/28 17:10:39 1.1.1.1.2.14 +++ libaitrpc/inc/aitrpc.h 2010/07/08 07:32:53 1.1.1.1.2.19 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.1.1.1.2.14 2010/06/28 17:10:39 misho Exp $ +* $Id: aitrpc.h,v 1.1.1.1.2.19 2010/07/08 07:32:53 misho Exp $ * *************************************************************************/ #ifndef __AITRPC_H @@ -61,7 +61,7 @@ typedef struct { union { uint8_t *buffer; int8_t *string; - void *blob; + uint32_t blob; size_t size; off_t offset; time_t datetime; @@ -110,7 +110,9 @@ typedef struct { val->val_type = string; val->val_len = strlen(v) + 1; \ } } while (0) #define RPC_SET_BLOB(vl, v, l) do { rpc_val_t *val = (vl); assert(val); val->val_type = blob; \ - val->val.blob = (void*) v; val->val_len = l; } while (0) + val->val.blob = v; val->val_len = l; } while (0) +#define RPC_SET_BLOB2(vl, b) do { rpc_val_t *val = (vl); assert(val); assert(b); val->val_type = blob; \ + val->val.blob = b->blob_var; val->val_len = b->blob_len; } while (0) #define RPC_SET_SIZE(vl, v) do { rpc_val_t *val = (vl); assert(val); val->val_type = size; val->val.size = v; \ val->val_len = sizeof(size_t); } while (0) #define RPC_SET_OFF(vl, v) do { rpc_val_t *val = (vl); assert(val); val->val_type = offset; val->val.offset = v; \ @@ -151,7 +153,7 @@ typedef struct { } while (0) -#define RPC_CALLBACK_CHK_NUM_ARGS(f, n) do { \ +#define RPC_CALLBACK_CHK_RETARGS(f, n) do { \ if (f->func_args != n) { \ rpc_SetErr(22, "Error:: different number of arguments!\n"); \ return -1; \ @@ -217,8 +219,8 @@ struct tagBLOBHdr { rpc_sess_t hdr_session; uint8_t hdr_cmd; uint32_t hdr_var; - uint32_t hdr_seq; uint32_t hdr_len; + uint32_t hdr_ret; } __packed; /* Network RPC client & server elements */ @@ -347,7 +349,7 @@ inline rpc_blob_t *rpc_srv_getBLOB(rpc_srv_t * __restr * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name - * @args = Number of function arguments + * @args = Number of return function arguments, use for restriction case! * return: -1 error or 0 register ok */ int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, @@ -464,7 +466,7 @@ inline int rpc_srv_blobFree(rpc_srv_t * __restrict srv * rpc_srv_registerBLOB() Register new BLOB to server * @srv = RPC Server instance * @len = BLOB length - * return: -1 error or 0 register ok + * return: NULL error or new registered BLOB */ rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len); /* @@ -503,7 +505,7 @@ int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_v * @cli = Client instance * @var = BLOB variable * @data = BLOB data, must be free after use! - * return: -1 error, 0 ok, >0 unreceived data from server, may be error? + * return: -1 error, 0 ok, 1 remote error */ int rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data);