--- libaitrpc/inc/aitrpc.h 2011/05/02 23:12:08 1.2 +++ libaitrpc/inc/aitrpc.h 2011/08/19 08:24:13 1.2.4.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.2 2011/05/02 23:12:08 misho Exp $ +* $Id: aitrpc.h,v 1.2.4.6 2011/08/19 08:24:13 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -87,7 +87,7 @@ typedef enum { } rpc_type_t; typedef enum { - disable, enable, // for blob.state + disable, enable, kill, // for blob.state ok, error, // for blob reply get, set, unset // for blob request } cmd_type_t; @@ -226,7 +226,7 @@ typedef struct tagRPCFunc { int8_t func_name[UCHAR_MAX + 1]; int8_t func_args; - rpc_val_t *func_vals; + rpc_val_t *func_vars; void *func_parent; struct tagRPCFunc *func_next; @@ -267,7 +267,8 @@ struct tagBLOBHdr { typedef struct { struct sockaddr cli_sa; // host info - int cli_sock; // socket + int cli_sock; // socket fd + int cli_type; // socket type pthread_t cli_tid; // TID of thread void *cli_parent; // pointer to parent rpc_srv_t for server or to rpc_sess_t for client @@ -294,9 +295,10 @@ typedef struct { rpc_func_t *srv_funcs; // registered functions list pthread_mutex_t srv_mtx; + cmd_type_t srv_kill; struct { - int state; // BLOB server state: ==0 disable | !=0 enable + cmd_type_t state; // BLOB server state: ==0 disable | !=0 enable char dir[UCHAR_MAX + 1]; rpc_cli_t server; // BLOB server socket @@ -323,10 +325,10 @@ typedef int (*rpc_callback_t)(rpc_func_t *, int, rpc_v /* Error support functions */ -// cli_GetErrno() Get error code of last operation -inline int cli_GetErrno(); -// cli_GetError() Get error text of last operation -inline const char *cli_GetError(); +// rpc_GetErrno() Get error code of last operation +inline int rpc_GetErrno(); +// rpc_GetError() Get error text of last operation +inline const char *rpc_GetError(); /* RPC Server side functions */ @@ -336,13 +338,14 @@ inline const char *cli_GetError(); * @regProgID = ProgramID for authentication & recognition * @regProcID = ProcessID for authentication & recognition * @concurentClients = Concurent clients at same time to this server - * @family = Family socket type, AF_INET or AF_INET6 - * @csHost = Host name or IP address for bind server, if NULL any address + * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW + * @family = Family type, AF_INET, AF_INET6 or AF_LOCAL + * @csHost = Host name or address for bind server, if NULL any address * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL bind and created RPC server instance */ rpc_srv_t *rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, - u_short family, const char *csHost, u_short Port); + int sockType, u_short family, const char *csHost, u_short Port); /* * rpc_srv_endServer() Destroy RPC server, close all opened sockets and free resources * @srv = RPC Server instance @@ -358,11 +361,13 @@ int rpc_srv_execServer(rpc_srv_t * __restrict srv); /* * rpc_srv_initBLOBServer() Init & create BLOB Server + * @srv = RPC server instance + * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW * @Port = Port for bind server, if Port == 0 default port is selected * @diskDir = Disk place for BLOB file objects * return: -1 == error or 0 bind and created BLOB server instance */ -int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir); +int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int sockType, u_short Port, const char *diskDir); /* * rpc_srv_endBLOBServer() Destroy BLOB server, close all opened sockets and free resources * @srv = RPC Server instance @@ -422,48 +427,42 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str /* - * rpc_srv_retValsCall() Declare return variables for RPC call and zeroed values + * rpc_srv_returnVars() Init return variables for RPC call and zeroed values (for safe handling return values, use this!) * @call = RPC function call - * @return_vals = Number of return variables - * return: NULL error, !=NULL array with return values for RPC call with return_vals items + * @varnum = Number of return variables + * return: NULL error, !=NULL array with return values for RPC call with varnum items */ -inline rpc_val_t *rpc_srv_retValsCall(rpc_func_t * __restrict call, int return_vals); +inline rpc_val_t *rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum); /* - * rpc_srv_declValsCall() Declare return variables for RPC call, - if already allocated memory for RPC call return values - function reallocate used space with return_vals count elements + * rpc_srv_allocVars() Allocate array for call variables, + if already allocated memory for RPC call reallocate used space * @call = RPC function call - * @return_vals = Number of return variables - * return: -1 error, !=-1 ok + * @varnum = Number of variables, if ==0 free previous allocated variables + * return: -1 error, !=-1 return varnum value */ -inline int rpc_srv_declValsCall(rpc_func_t * __restrict call, int return_vals); +inline int rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum); +#define rpc_srv_freeVars(_call) (assert((_call)), rpc_srv_allocVars((_call), 0)) /* - * rpc_srv_freeValsCall() Free return variables for RPC call + * rpc_srv_zeroVars() Clean values from variables of RPC call * @call = RPC function call - * return: none + * return: -1 error, !=-1 Returned number of cleaned RPC variables */ -inline void rpc_srv_freeValsCall(rpc_func_t * __restrict call); +inline int rpc_srv_zeroVars(rpc_func_t * __restrict call); /* - * rpc_srv_copyValsCall() Copy return variables for RPC call to new variable + * rpc_srv_copyVars() Copy variables for RPC call to new variable array * @call = RPC function call - * @newvals = New allocated variables array, must be free after use + * @newvars = New allocated variables array, must be free after use * return: -1 error, !=-1 Returned number of copied RPC variables */ -inline int rpc_srv_copyValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvals); +inline int rpc_srv_copyVars(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvars); /* - * rpc_srv_zeroValsCall() Clean values from return variables of RPC call + * rpc_srv_getVars() Get variables array for RPC call * @call = RPC function call - * return: -1 error, !=-1 Returned number of cleaned RPC variables - */ -inline int rpc_srv_zeroValsCall(rpc_func_t * __restrict call); -/* - * rpc_srv_getValsCall() Get return variables for RPC call - * @call = RPC function call - * @vals = Returned variables, may be NULL + * @vars = Returned variables array, may be NULL * return: -1 error, !=-1 Number of returned variables */ -inline int rpc_srv_getValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict vals); +inline int rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_t ** __restrict vars); /*