libaitrpc/src/cli.c - diff

Return to cli.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/cli.c between versions 1.4.2.1 and 1.4.2.2

version 1.4.2.1, 2011/08/29 23:26:56	version 1.4.2.2, 2011/08/30 11:13:29
Line 60 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,	Line 60 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
struct sockaddr_in sin = (struct sockaddr_in) &sa;	struct sockaddr_in sin = (struct sockaddr_in) &sa;
struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;	struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;
struct sockaddr_un sun = (struct sockaddr_un) &sa;	struct sockaddr_un sun = (struct sockaddr_un) &sa;
	int n;

if (!rpccli \|\|	if (!rpccli \|\|
(rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6 &&	(rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6 &&
Line 100 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,	Line 101 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
free(cli);	free(cli);
return NULL;	return NULL;
}	}
	n = cli->cli_netbuf;
	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
	LOGERR;
	close(cli->cli_sock);
	free(cli->cli_parent);
	free(cli);
	return NULL;
	}
	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
	LOGERR;
	close(cli->cli_sock);
	free(cli->cli_parent);
	free(cli);
	return NULL;
	}
if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
LOGERR;	LOGERR;
free(cli);	free(cli);
Line 135 rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli)	Line 151 rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli)
* rpc_cli_openClient() Connect to RPC Server	* rpc_cli_openClient() Connect to RPC Server
* @ProgID = ProgramID for RPC session request	* @ProgID = ProgramID for RPC session request
* @ProcID = ProcessID for RPC session request	* @ProcID = ProcessID for RPC session request
	* @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
* @family = Family socket type, AF_INET or AF_INET6	* @family = Family socket type, AF_INET or AF_INET6
* @csHost = Host name or IP address for bind server	* @csHost = Host name or IP address for bind server
* @Port = Port for bind server, if Port == 0 default port is selected	* @Port = Port for bind server, if Port == 0 default port is selected
* return: NULL == error or !=NULL connection to RPC server established	* return: NULL == error or !=NULL connection to RPC server established
*/	*/
rpc_cli_t *	rpc_cli_t *
rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short family, const char *csHost, u_short Port)	rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, u_short family, const char *csHost, u_short Port)
{	{
rpc_cli_t *cli = NULL;	rpc_cli_t *cli = NULL;
struct hostent *host = NULL;	struct hostent *host = NULL;
Line 149 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short	Line 166 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
struct sockaddr_in sin = (struct sockaddr_in) &sa;	struct sockaddr_in sin = (struct sockaddr_in) &sa;
struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;	struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;
struct sockaddr_un sun = (struct sockaddr_un) &sa;	struct sockaddr_un sun = (struct sockaddr_un) &sa;
	int n;

if (!csHost \|\| (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {	if (!csHost \|\| (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n");	rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n");
Line 156 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short	Line 174 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
}	}
if (!Port)	if (!Port)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
	if (!netBuf)
	netBuf = BUFSIZ;
if (csHost && family != AF_LOCAL) {	if (csHost && family != AF_LOCAL) {
host = gethostbyname2(csHost, family);	host = gethostbyname2(csHost, family);
if (!host) {	if (!host) {
Line 194 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short	Line 214 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
return NULL;	return NULL;
} else	} else
memset(cli, 0, sizeof(rpc_cli_t));	memset(cli, 0, sizeof(rpc_cli_t));

	cli->cli_netbuf = netBuf;
cli->cli_parent = malloc(sizeof(rpc_sess_t));	cli->cli_parent = malloc(sizeof(rpc_sess_t));
if (!cli->cli_parent) {	if (!cli->cli_parent) {
LOGERR;	LOGERR;
Line 225 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short	Line 247 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
free(cli);	free(cli);
return NULL;	return NULL;
}	}
	n = cli->cli_netbuf;
	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
	LOGERR;
	close(cli->cli_sock);
	free(cli->cli_parent);
	free(cli);
	return NULL;
	}
	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
	LOGERR;
	close(cli->cli_sock);
	free(cli->cli_parent);
	free(cli);
	return NULL;
	}
if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
LOGERR;	LOGERR;
	close(cli->cli_sock);
free(cli->cli_parent);	free(cli->cli_parent);
free(cli);	free(cli);
return NULL;	return NULL;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.4.2.1
changed lines
	Added in v.1.4.2.2