--- libaitrpc/inc/aitrpc.h 2013/11/22 13:41:33 1.21 +++ libaitrpc/inc/aitrpc.h 2015/01/15 20:27:49 1.25.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.21 2013/11/22 13:41:33 misho Exp $ +* $Id: aitrpc.h,v 1.25.2.1 2015/01/15 20:27:49 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 @@ -65,6 +65,19 @@ SUCH DAMAGE. #define RPC_VERSION 7 #define RPC_DEFPORT 2611 +/* Additional ELWIX RPC supporting protocols */ +#ifndef SOCK_STREAM +#define SOCK_STREAM 1 /* stream socket */ +#endif +#ifndef SOCK_DGRAM +#define SOCK_DGRAM 2 /* datagram socket */ +#endif +#ifndef SOCK_RAW +#define SOCK_RAW 3 /* raw-protocol interface */ +#endif +#define SOCK_BPF 4 /* ethernet interface */ +#define SOCK_PIPE 5 /* bi-directional pipe interface */ + /* RPC call request flags */ #define RPC_REPLY 0x0 @@ -247,7 +260,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 +287,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 +300,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); @@ -356,16 +373,18 @@ void rpc_srv_endServer(rpc_srv_t ** __restrict psrv); * return: -1 error or 0 ok, infinite loop ... */ int rpc_srv_loopServer(rpc_srv_t * __restrict srv); -#define rpc_srv_execServer(_srv, _sync) do { assert((_srv)); \ - if (!(_srv)->srv_kill) { \ - pthread_create(&(_srv)->srv_tid, NULL, (void*(*)(void*)) \ - rpc_srv_loopServer, (_srv)); \ - if ((_sync)) \ - pthread_join((_srv)->srv_tid, (void**) (_sync)); \ - else \ - pthread_detach((_srv)->srv_tid); \ - } } while (0) -#define rpc_srv_killServer(_srv) (assert((_srv)), (_srv)->srv_blob.kill = 1, (_srv)->srv_kill = 1) +#define rpc_srv_execServer(_srv, _sync) \ + do { assert((_srv)); \ + if (!(_srv)->srv_kill) { \ + pthread_create(&(_srv)->srv_tid, NULL, (void*(*)(void*)) \ + rpc_srv_loopServer, (_srv)); \ + if ((_sync)) \ + pthread_join((_srv)->srv_tid, (void**) (_sync)); \ + 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 @@ -390,16 +409,28 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) * return: -1 error or 0 ok, infinite loop ... */ int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv); -#define rpc_srv_execBLOBServer(_srv) do { assert((_srv)); \ - if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \ - pthread_create(&(_srv)->srv_blob.tid, NULL, \ - (void*(*)(void*)) \ - rpc_srv_loopBLOBServer, (_srv)); \ - pthread_detach((_srv)->srv_blob.tid); \ - } \ - } while (0) +#define rpc_srv_execBLOBServer(_srv) \ + do { assert((_srv)); \ + if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \ + pthread_create(&(_srv)->srv_blob.tid, NULL, \ + (void*(*)(void*)) rpc_srv_loopBLOBServer, (_srv)); \ + pthread_detach((_srv)->srv_blob.tid); \ + } \ + } 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); + +/* * rpc_srv_registerCall() - Register call to RPC server * * @srv = RPC Server instance @@ -570,6 +601,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 @@ -584,7 +622,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); @@ -595,7 +633,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); @@ -616,7 +654,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 @@ -632,7 +670,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); @@ -667,6 +705,26 @@ rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restri * return: none */ void rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli); + + +/* + * rpc_cli_openClient2() - Connect to layer2 RPC Server + * + * @InstID = InstID for RPC session request + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) + * @csIface = Interface name for bind client, if NULL first interface on host + * @csHost = Host ethernet address + * return: NULL == error or !=NULL connection to RPC server established + */ +rpc_cli_t *rpc_cli_openClient2(u_char InstID, int netBuf, + const char *csIface, const char *csHost); +/* + * rpc_cli_closeClient2() - Close layer2 connection to RPC server and free resources + * + * @cli = RPC Client session + * return: none + */ +void rpc_cli_closeClient2(rpc_cli_t ** __restrict cli); #endif