--- libaitrpc/inc/aitrpc.h 2012/05/15 20:49:46 1.8.2.3 +++ libaitrpc/inc/aitrpc.h 2012/05/15 22:47:10 1.8.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.8.2.3 2012/05/15 20:49:46 misho Exp $ +* $Id: aitrpc.h,v 1.8.2.4 2012/05/15 22:47:10 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -143,7 +143,7 @@ struct tagRPCCall { uint16_t call_tag; uint16_t call_argc; ait_val_t call_argv[0]; -} __packed; /* size == 24 bytes */ +} __packed; /* size == 24 bytes */ /* Network BLOB packet - Header */ @@ -335,35 +335,25 @@ int rpc_srv_loopBLOB(rpc_srv_t * __restrict srv); * 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 return function arguments, use for restriction case! - * return: -1 error or 0 register ok + * @tag = Function tag + * @funcaddr = Function address + * @args = Number of return function arguments + * return: -1 error, 0 already registered tag or 1 register ok */ -int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, - unsigned short args); +int rpc_srv_registerCall(rpc_srv_t * __restrict srv, unsigned short tag, + void *funcaddr, unsigned short args); /* * rpc_srv_unregisterCall() - Unregister call from RPC server * * @srv = RPC Server instance - * @csModule = Module name, if NULL self binary - * @csFunc = Function name + * @tag = Function tag * return: -1 error, 0 not found call, 1 unregister ok */ -int rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc); +int rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, unsigned short tag); /* - * rpc_srv_getFunc() - Get registered call from RPC server by Name + * rpc_srv_getCall() - Get registered call from RPC server * * @srv = RPC Server instance - * @csModule = Module name, if NULL self binary - * @csFunc = Function name - * return: NULL not found call, !=NULL return call - */ -rpc_func_t *rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc); -/* - * rpc_srv_getCall() - Get registered call from RPC server - * - * @srv = RPC Server instance * @tag = tag for function * return: NULL not found call, !=NULL return call */ @@ -381,16 +371,6 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str /* - * rpc_srv_getVars() - Get variables array for RPC call - * - * @call = RPC function call - * @vars = Returned variables array, may be NULL - * return: -1 error, !=-1 Number of returned variables - */ -inline int rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars); - - -/* * rpc_srv_blobCreate() - Create map blob to memory region and return object * * @srv = RPC Server instance @@ -502,17 +482,6 @@ int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va */ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data); - - -/* - * rpc_calcHashes() - Calculate hashes for RPC call - * - * @func = function - * @csModule = Module name, if NULL self binary - * @csFunc = Function name - * return: -1 error or 0 ok - */ -int rpc_calcHashes(rpc_func_t * __restrict func, const char *csModule, const char *csFunc); /* RPC Client side functions */