--- libaitrpc/inc/aitrpc.h 2011/08/19 09:20:46 1.2.4.7 +++ libaitrpc/inc/aitrpc.h 2011/08/19 12:51:50 1.2.4.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.2.4.7 2011/08/19 09:20:46 misho Exp $ +* $Id: aitrpc.h,v 1.2.4.8 2011/08/19 12:51:50 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -268,7 +268,6 @@ struct tagBLOBHdr { typedef struct { struct sockaddr cli_sa; // host info 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 @@ -338,14 +337,13 @@ inline const char *rpc_GetError(); * @regProgID = ProgramID for authentication & recognition * @regProcID = ProcessID for authentication & recognition * @concurentClients = Concurent clients at same time to this server - * @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, - int sockType, u_short family, const char *csHost, u_short Port); + 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 @@ -362,12 +360,11 @@ 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, int sockType, u_short Port, const char *diskDir); +int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir); /* * rpc_srv_endBLOBServer() Destroy BLOB server, close all opened sockets and free resources * @srv = RPC Server instance @@ -570,13 +567,12 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, * rpc_cli_openClient() Connect to RPC Server * @ProgID = ProgramID for RPC session request * @ProcID = ProcessID for RPC session request - * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW * @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 sockType, +rpc_cli_t *rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short family, const char *csHost, u_short Port); /* * rpc_cli_closeClient() Close connection to RPC server and free resources @@ -609,11 +605,10 @@ inline void rpc_cli_freeVals(int args, rpc_val_t *vals /* * rpc_cli_openBLOBClient() Connect to BLOB Server * @rpccli = RPC Client session - * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL connection to BLOB server established */ -rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, int sockType, u_short Port); +rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port); /* * rpc_cli_closeBLOBClient() Close connection to BLOB server and free resources * @cli = BLOB Client session