--- libaitrpc/inc/aitrpc.h 2012/03/14 15:08:03 1.5.2.7 +++ libaitrpc/inc/aitrpc.h 2012/05/14 08:39:05 1.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.5.2.7 2012/03/14 15:08:03 misho Exp $ +* $Id: aitrpc.h,v 1.8 2012/05/14 08:39:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -140,6 +140,8 @@ typedef struct tagRPCFunc { struct tagRPCCall { rpc_sess_t call_session; + uint16_t call_len; + uint16_t call_tag; uint32_t call_hash; uint16_t call_argc; @@ -166,6 +168,7 @@ struct tagBLOBHdr { uint32_t hdr_len; uint32_t hdr_ret; uint16_t hdr_crc; + uint8_t hdr_pad; } __packed; /* Network RPC client & server elements */ @@ -175,6 +178,8 @@ typedef struct { int cli_sock; // socket fd pthread_t cli_tid; // TID of thread + cmd_type_t cli_kill; + void *cli_parent; // pointer to parent rpc_srv_t for server or to rpc_sess_t for client int cli_netbuf; // size of network buffer size } rpc_cli_t; @@ -200,7 +205,6 @@ typedef struct { rpc_func_t *srv_funcs; // registered functions list - pthread_mutex_t srv_mtx; cmd_type_t srv_kill; struct { @@ -211,8 +215,6 @@ typedef struct { rpc_cli_t *clients; // connected blob client sockets rpc_blob_t *blobs; // registered blob variables list - - pthread_mutex_t mtx; } srv_blob; } rpc_srv_t; @@ -540,13 +542,14 @@ void rpc_cli_closeClient(rpc_cli_t * __restrict cli); * rpc_cli_execCall() - Execute RPC call * * @cli = RPC Client session + * @noreply = We not want RPC reply * @csModule = Module name, if NULL self binary * @csFunc = Function name for execute * @in_vars = IN RPC call array of rpc values * @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 rpc_cli_execCall(rpc_cli_t *cli, int noreply, const char *csModule, const char *csFunc, array_t * __restrict in_vars, array_t ** __restrict out_vars);