--- libaitrpc/inc/aitrpc.h 2010/06/28 15:18:43 1.1.1.1.2.12 +++ libaitrpc/inc/aitrpc.h 2011/03/15 15:46:58 1.1.1.1.2.22 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.1.1.1.2.12 2010/06/28 15:18:43 misho Exp $ +* $Id: aitrpc.h,v 1.1.1.1.2.22 2011/03/15 15:46:58 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,15 +153,16 @@ typedef struct { } while (0) -#define RPC_CALLBACK_CHK_NUM_ARGS(f, n) do { \ - if (f->func_args != n) { \ - rpc_SetErr(22, "Error:: different number of arguments!\n"); \ +#define RPC_CALLBACK_CHECK_INPUT(x) do { \ + if (!x) { \ + rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \ return -1; \ } \ } while (0) -#define RPC_CALLBACK_CHECK_INPUT(f) do { \ - if (!f) { \ - rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \ +#define RPC_CALLBACK_CHK_ARGS(f, n) do { \ + RPC_CALLBACK_CHECK_INPUT(f); \ + if (f && f->func_args != n) { \ + rpc_SetErr(22, "Error:: different number of arguments!\n"); \ return -1; \ } \ } while (0) @@ -217,8 +220,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 */ @@ -335,19 +338,11 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) int rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv); /* - * rpc_srv_getBLOB() Get registered BLOB - * @srv = RPC Server instance - * @var = hash for variable - * return: NULL not found, !=NULL return blob var - */ -inline rpc_blob_t *rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t var); - -/* * rpc_srv_registerCall() Register call to RPC server * @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 +459,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); /* @@ -474,6 +469,13 @@ rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restric * return: -1 error, 0 not found call, 1 unregister ok */ int rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uint32_t var); +/* + * rpc_srv_getBLOB() Get registered BLOB + * @srv = RPC Server instance + * @var = hash for variable + * return: NULL not found, !=NULL return blob var + */ +inline rpc_blob_t *rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t var); /* * rpc_srv_sendBLOB() Send mapped BLOB to client @@ -490,7 +492,40 @@ int rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_b */ int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob); +/* + * rpc_cli_sendBLOB() Send BLOB to server + * @cli = Client instance + * @var = BLOB variable + * @data = BLOB data + * return: -1 error, 0 ok, 1 remote error + */ +int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void * __restrict data); +/* + * rpc_cli_recvBLOB() Receive BLOB from server + * @cli = Client instance + * @var = BLOB variable + * @data = BLOB data, must be free after use! + * return: -1 error, 0 ok, 1 remote error + */ +int rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data); +/* + * rpc_cli_delBLOB() Delete BLOB from server + * @cli = Client instance + * @var = BLOB variable + * return: -1 error, 0 ok, 1 remote error + */ +int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var); +/* + * rpc_cli_getBLOB() Receive BLOB from server and Delete after that. + * @cli = Client instance + * @var = BLOB variable + * @data = BLOB data, must be free after use! + * return: -1 error, 0 ok, >0 remote error + */ +inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data); + + /* RPC Client side functions */ /* @@ -530,6 +565,21 @@ int rpc_cli_execCall(rpc_cli_t *cli, const char *csMod * return: none */ inline void rpc_cli_freeVals(int args, rpc_val_t *vals); + + +/* + * rpc_cli_openBLOBClient() Connect to BLOB Server + * @rpccli = RPC Client session + * @Port = Port for bind server, if Port == 0 default port is selected + * return: NULL == error or !=NULL connection to BLOB server established + */ +rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port); +/* + * rpc_cli_closeBLOBClient() Close connection to BLOB server and free resources + * @cli = BLOB Client session + * return: none + */ +void rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli); #endif