--- libaitrpc/inc/aitrpc.h 2011/08/30 11:13:29 1.3.2.3 +++ libaitrpc/inc/aitrpc.h 2011/08/31 17:11:58 1.3.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.3.2.3 2011/08/30 11:13:29 misho Exp $ +* $Id: aitrpc.h,v 1.3.2.4 2011/08/31 17:11:58 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -119,8 +119,8 @@ typedef struct tagRPCFunc { int8_t func_file[MAXPATHLEN]; int8_t func_name[UCHAR_MAX + 1]; - int8_t func_args; - ait_val_t *func_vars; + uint16_t func_args; + array_t *func_vars; void *func_parent; struct tagRPCFunc *func_next; @@ -133,7 +133,7 @@ struct tagRPCCall { rpc_sess_t call_session; uint16_t call_tag; uint32_t call_hash; - uint8_t call_argc; + uint16_t call_argc; } __packed; /* Network RPC packet - Server response */ @@ -144,7 +144,7 @@ struct tagRPCRet { uint32_t ret_hash; int32_t ret_retcode; int32_t ret_errno; - uint8_t ret_argc; + uint16_t ret_argc; } __packed; /* Network BLOB packet - Header */ @@ -213,7 +213,7 @@ typedef struct { * @arg3 = input array with values from RPC call execution request * return: -1 error or >-1 success execution */ -typedef int (*rpc_callback_t)(rpc_func_t *, int, ait_val_t *); +typedef int (*rpc_callback_t)(rpc_func_t *, int, array_t *); // ----------------------------------------------------------------------- @@ -284,7 +284,7 @@ int rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) * return: -1 error or 0 register ok */ int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, - unsigned char args); + unsigned short args); /* * rpc_srv_unregisterCall() Unregister call from RPC server * @srv = RPC Server instance @@ -313,11 +313,11 @@ inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restr * rpc_srv_execCall() Execute registered call from RPC server * @call = Register RPC call * @rpc = IN RPC call structure - * @args = IN RPC call array of rpc values + * @args = IN RPC calling arguments from RPC client * return: -1 error, !=-1 ok */ int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, - ait_val_t * __restrict args); + array_t * __restrict args); /* @@ -327,7 +327,7 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str * @varnum = Number of return variables * return: NULL error, !=NULL array with return values for RPC call with varnum items */ -inline ait_val_t *rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum); +inline array_t *rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum); /* * rpc_srv_allocVars() Allocate array for call variables, if already allocated memory for RPC call reallocate used space @@ -349,14 +349,14 @@ inline int rpc_srv_zeroVars(rpc_func_t * __restrict ca * @newvars = New allocated variables array, must be free after use * return: -1 error, !=-1 Returned number of copied RPC variables */ -inline int rpc_srv_copyVars(rpc_func_t * __restrict call, ait_val_t ** __restrict newvars); +inline int rpc_srv_copyVars(rpc_func_t * __restrict call, array_t ** __restrict newvars); /* * 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, ait_val_t ** __restrict vars); +inline int rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars); /* @@ -485,21 +485,24 @@ void rpc_cli_closeClient(rpc_cli_t * __restrict cli); * @cli = RPC Client session * @csModule = Module name, if NULL self binary * @csFunc = Function name for execute - * @in_argc = IN count of arguments * @in_vars = IN RPC call array of rpc values - * @out_argc = OUT returned count of arguments - * @out_vars = OUT returned array of rpc values, must be free after use (see rpc_cli_freeVals()) + * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals() * return: -1 error or != -1 ok result */ -int rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, int in_argc, - ait_val_t * __restrict in_vars, int *out_argc, ait_val_t ** __restrict out_vars); +int rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, + array_t * __restrict in_vars, array_t ** __restrict out_vars); /* * rpc_cli_freeVals() Free ait_val_t array returned from RPC call - * @args = Number of arguments in array - * @vars = Value elements + * @vars = Variable array * return: none */ -inline void rpc_cli_freeVals(int args, ait_val_t * __restrict vars); +inline void rpc_cli_freeVals(array_t ** __restrict vars); +/* + * rpc_cli_allocVals() Allocate ait_val_t array for RPC call + * @args = Number of arguments + * return: =NULL error or !=NULL allocated array + */ +inline array_t *rpc_cli_allocVals(unsigned short args); /*