--- libaitrpc/inc/aitrpc.h 2010/07/07 15:18:22 1.1.1.1.2.17 +++ libaitrpc/inc/aitrpc.h 2010/07/08 12:29:38 1.1.1.1.2.21 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.1.1.1.2.17 2010/07/07 15:18:22 misho Exp $ +* $Id: aitrpc.h,v 1.1.1.1.2.21 2010/07/08 12:29:38 misho Exp $ * *************************************************************************/ #ifndef __AITRPC_H @@ -153,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; \ @@ -219,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 */ @@ -337,14 +337,6 @@ 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 @@ -476,6 +468,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 @@ -508,6 +507,22 @@ int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_v * 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 */