--- libaitrpc/inc/aitrpc.h 2013/09/05 00:27:09 1.19.2.1 +++ libaitrpc/inc/aitrpc.h 2014/11/17 23:51:26 1.24.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.19.2.1 2013/09/05 00:27:09 misho Exp $ +* $Id: aitrpc.h,v 1.24.2.3 2014/11/17 23:51:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -247,7 +247,11 @@ typedef struct { */ typedef int (*rpc_callback_t)(rpc_cli_t *, struct tagRPCCall *, array_t *); +#define RPC_CALL_DEFINE(x) int (x)(rpc_cli_t*, struct tagRPCCall*, array_t*) +#define RPC_CALL_ARGS(arg1, arg2, arg3) rpc_cli_t* arg1, struct tagRPCCall* arg2, array_t* arg3 +#define RPC_CALL_STDARGS RPC_CALL_ARGS(cli, rpc, iv) + /* ----------------------------------------------------------------------- */ /* Error support functions */ @@ -270,7 +274,7 @@ void rpc_SetErr(int eno, char *estr, ...); * @sa = check client address, if you use udp protocol * @buf = buffer * @blen = buffer length - * return: -1 error or >-1 readed bytes into buffer + * return: -1 error, 0 EOF or or >0 readed bytes into buffer */ ssize_t rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa, unsigned char * __restrict buf, size_t blen); @@ -283,7 +287,7 @@ ssize_t rpc_Read(int sock, int type, int flags, sockad * @sa = send to client address, if you use udp protocol * @buf = buffer * @blen = buffer length - * return: -1 error or >-1 written bytes into buffer + * return: -1 error, 0 EOF or >0 written bytes into buffer */ ssize_t rpc_Write(int sock, int type, int flags, sockaddr_t * __restrict sa, unsigned char * __restrict buf, size_t blen); @@ -365,6 +369,7 @@ int rpc_srv_loopServer(rpc_srv_t * __restrict srv); else \ pthread_detach((_srv)->srv_tid); \ } } while (0) +#define rpc_srv_killServer(_srv) (assert((_srv)), (_srv)->srv_blob.kill = 1, (_srv)->srv_kill = 1) /* * rpc_srv_initBLOBServer() - Init & create BLOB Server @@ -399,6 +404,26 @@ int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) } while (0) /* + * rpc_srv_initServer2() - Init & create layer2 RPC Server + * + * @InstID = Instance for authentication & recognition + * @concurentClients = Concurent clients at same time to this server + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) + * @csIface = Interface name for bind server, if NULL first interface on host + * return: NULL == error or !=NULL bind and created RPC server instance + */ +rpc_srv_t *rpc_srv_initServer2(u_char InstID, int concurentClients, int netBuf, + const char *csIface); +#define rpc_srv_endServer2(x) rpc_srv_endServer((x)) +/* + * rpc_srv_loopServer2() - Execute Main layer2 server loop and wait for clients requests + * + * @srv = RPC Server instance + * return: -1 error or 0 ok, infinite loop ... + */ +int rpc_srv_loopServer2(rpc_srv_t * __restrict srv); + +/* * rpc_srv_registerCall() - Register call to RPC server * * @srv = RPC Server instance @@ -569,6 +594,13 @@ int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_va rpc_cli_t *rpc_cli_openClient(unsigned char InstID, int netBuf, const char *csHost, unsigned short Port, int proto); /* + * rpc_cli_reconnectClient() - Reconnecting client to RPC server + * + * @cli = RPC Client session + * return: -1 error or 0 ok + */ +int rpc_cli_reconnectClient(rpc_cli_t * __restrict cli); +/* * rpc_cli_closeClient() - Close connection to RPC server and free resources * * @cli = RPC Client session @@ -583,7 +615,7 @@ void rpc_cli_closeClient(rpc_cli_t ** __restrict cli); * @sa = Server address * @pkt = RPC packet * @len = Length of packet - * return: -1 error or !=-1 sended bytes + * return: -1 error, 0 EOF or >0 sended bytes */ int rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len); @@ -594,7 +626,7 @@ int rpc_pkt_Send(int sock, int type, sockaddr_t * __re * @type = Type of socket * @sa = Server address * @pkt = RPC packet - * return: -1 error or !=-1 sended bytes + * return: -1 error, 0 EOF or >0 received bytes */ int rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt); @@ -615,7 +647,7 @@ int rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_se * rpc_pkt_Replay() - Decode RPC Replay packet * * @pkt = Packet buffer - * @sess = RPC session info + * @sess = RPC session info, if =NULL don't check session * @tag = Function tag * @vars = Function argument array of values, may be NULL * @nocrc = Without CRC calculation @@ -631,7 +663,7 @@ int rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_ses * @tag = Function tag for execution * @in_vars = IN function argument array of values, may be NULL * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars() - * return: -1 error or != -1 ok result + * return: -1 error, 0 ok result or 1 closed rpc connection */ int rpc_cli_execCall(rpc_cli_t *cli, int noreply, unsigned short tag, array_t * __restrict in_vars, array_t ** __restrict out_vars);