--- libaitrpc/inc/aitrpc.h 2010/07/08 12:29:38 1.1.1.1.2.21 +++ libaitrpc/inc/aitrpc.h 2011/08/19 07:19:08 1.2.4.4 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.1.1.1.2.21 2010/07/08 12:29:38 misho Exp $ +* $Id: aitrpc.h,v 1.2.4.4 2011/08/19 07:19:08 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +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 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #ifndef __AITRPC_H #define __AITRPC_H @@ -15,7 +52,9 @@ #include #include #include +#if !defined(__NetBSD__) #include +#endif #include @@ -153,15 +192,16 @@ typedef struct { } while (0) -#define RPC_CALLBACK_CHK_RETARGS(f, n) do { \ - if (f->func_args != n) { \ - rpc_SetErr(22, "Error:: different number of arguments!\n"); \ +#define RPC_CALLBACK_CHECK_INPUT(x) do { \ + if (!x) { \ + rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \ return -1; \ } \ } while (0) -#define RPC_CALLBACK_CHECK_INPUT(f) do { \ - if (!f) { \ - rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \ +#define RPC_CALLBACK_CHK_ARGS(f, n) do { \ + RPC_CALLBACK_CHECK_INPUT(f); \ + if (f && f->func_args != n) { \ + rpc_SetErr(22, "Error:: different number of arguments!\n"); \ return -1; \ } \ } while (0) @@ -227,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 @@ -283,10 +324,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 */ @@ -296,13 +337,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 @@ -318,11 +360,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