--- libaitrpc/inc/aitrpc.h 2012/03/13 17:21:52 1.5.2.5 +++ libaitrpc/inc/aitrpc.h 2012/05/15 20:49:46 1.8.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.5.2.5 2012/03/13 17:21:52 misho Exp $ +* $Id: aitrpc.h,v 1.8.2.3 2012/05/15 20:49:46 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -57,11 +57,12 @@ SUCH DAMAGE. #include #endif #include +#include #include #include -#define RPC_VERSION 3 +#define RPC_VERSION 4 #define RPC_DEFPORT 2611 /* RPC call request flags */ @@ -86,7 +87,7 @@ SUCH DAMAGE. typedef enum { disable, enable, running, kill, /* for blob.state */ - ok, error, /* for blob reply */ + ok, error, no, /* for blob reply */ get, set, unset /* for blob request */ } cmd_type_t; @@ -113,36 +114,21 @@ typedef enum { typedef struct { uint8_t sess_version; - uint8_t sess_timeout; uint32_t sess_program; - uint32_t sess_process; -} __packed rpc_sess_t; + uint8_t sess_process; +} __packed rpc_sess_t; /* size == 6 bytes */ /* Server managment RPC functions ... */ -/* RPC function registration element! */ -typedef struct tagRPCFunc { - uint16_t func_tag; - uint32_t func_hash; - ait_val_t func_file; - ait_val_t func_name; - - array_t *func_vars; - - void *func_parent; - struct tagRPCFunc *func_next; -} rpc_func_t; - - /* Network RPC packet - Client request */ struct tagRPCCall { rpc_sess_t call_session; - uint16_t call_tag; - uint32_t call_hash; - uint16_t call_argc; + uint16_t call_seq; + uint16_t call_len; + uint16_t call_crc; union { struct { @@ -154,8 +140,10 @@ struct tagRPCCall { } call_rep; }; - uint16_t call_crc; -} __packed; + uint16_t call_tag; + uint16_t call_argc; + ait_val_t call_argv[0]; +} __packed; /* size == 24 bytes */ /* Network BLOB packet - Header */ @@ -165,17 +153,30 @@ struct tagBLOBHdr { uint32_t hdr_var; uint32_t hdr_len; uint32_t hdr_ret; + uint16_t hdr_crc; + uint8_t hdr_pad; } __packed; /* Network RPC client & server elements */ +/* RPC function registration element! */ +typedef struct tagRPCFunc { + ait_val_t func_name; + + array_t *func_vars; + + void *func_parent; + TAILQ_ENTRY(tagRPCFunc) func_node; +} rpc_func_t; + + typedef struct { - io_sockaddr_t cli_sa; // host info - int cli_sock; // socket fd - pthread_t cli_tid; // TID of thread + int cli_id; /* slot id */ + int cli_sock; /* socket fd */ + io_sockaddr_t cli_sa; /* host address */ + ait_val_t cli_buf; /* network buffer */ - 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 + void *cli_parent; /* pointer to parent rpc_srv_t for server or to rpc_sess_t for client */ } rpc_cli_t; @@ -190,17 +191,16 @@ typedef struct tagBLOB { } rpc_blob_t; typedef struct { - rpc_sess_t srv_session; // RPC session registration info - int srv_numcli; // maximum concurent client connections - int srv_netbuf; // size of network buffer size + rpc_sess_t srv_session; /* RPC session registration info */ + int srv_netbuf; /* size of network buffer */ - rpc_cli_t srv_server; // RPC server socket - rpc_cli_t *srv_clients; // connected rpc client sockets + sched_root_task_t *srv_root; /* RPC server scheduler */ + intptr_t srv_kill; /* Scheduler condition variable */ - rpc_func_t *srv_funcs; // registered functions list + rpc_cli_t srv_server; /* RPC server socket */ + array_t *srv_clients; /* connected rpc client sockets */ - pthread_mutex_t srv_mtx; - cmd_type_t srv_kill; + TAILQ_HEAD(, tagRPCFunc) srv_funcs; /* RPC functions list */ struct { cmd_type_t state; // BLOB server state: ==0 disable | !=0 enable @@ -210,9 +210,7 @@ typedef struct { rpc_cli_t *clients; // connected blob client sockets rpc_blob_t *blobs; // registered blob variables list - - pthread_mutex_t mtx; - } srv_blob; + } srv_blob; } rpc_srv_t; @@ -238,21 +236,28 @@ inline const char *rpc_GetError(); /* - * rpc_chkPktSession() - Check session in RPC packet + * rpc_chkPktSession() - Check RPC session * * @p = packet session * @s = active session - * return: -1 error or 0 ok + * return: -1, 1, 2, 3 are errors or 0 ok */ inline int rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s); /* - * rpc_addPktSession() - Add session into RPC packet + * rpc_addPktSession() - Prepare session into network format * * @p = packet session - * @s = active session + * @s = host session * return: -1 error or 0 ok */ inline int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s); +/* + * rpc_register_srvServices() - Register internal service functions + * + * @srv = RPC server instance + * return: -1 error or 0 ok + */ +int rpc_register_srvServices(rpc_srv_t * __restrict srv); /* RPC Server side functions */ @@ -264,13 +269,13 @@ inline int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t * @regProcID = ProcessID for authentication & recognition * @concurentClients = Concurent clients at same time to this server * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) - * @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, - int netBuf, u_short family, const char *csHost, u_short Port); +rpc_srv_t *rpc_srv_initServer(unsigned int regProgID, unsigned char regProcID, + int concurentClients, int netBuf, + const char *csHost, unsigned short Port); /* * rpc_srv_endServer() - Destroy RPC server, close all opened sockets and free resources * @@ -360,10 +365,9 @@ rpc_func_t *rpc_srv_getFunc(rpc_srv_t * __restrict srv * * @srv = RPC Server instance * @tag = tag for function - * @hash = hash for function * return: NULL not found call, !=NULL return call */ -inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag, uint32_t hash); +inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag); /* * rpc_srv_execCall() - Execute registered call from RPC server * @@ -496,10 +500,21 @@ int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va * @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, ait_val_t * __restrict var, void ** __restrict data); +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 */ /* @@ -508,13 +523,15 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, * @ProgID = ProgramID for RPC session request * @ProcID = ProcessID for RPC session request * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) + * @Timeout = RPC timeout in seconds, if =0 set default RPC timeout * @family = Family socket type, AF_INET or AF_INET6 * @csHost = Host name or IP address for bind server * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL connection to RPC server established */ -rpc_cli_t *rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, - u_short family, const char *csHost, u_short Port); +rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned int ProcID, int netBuf, + unsigned char Timeout, unsigned short family, + const char *csHost, unsigned short Port); /* * rpc_cli_closeClient() - Close connection to RPC server and free resources * @@ -526,13 +543,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);