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.20.4.1 and 1.28.2.1

version 1.20.4.1, 2013/12/15 16:09:54	version 1.28.2.1, 2024/03/19 15:17:16
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013	Copyright 2004 - 2024
by Michael Pounov <misho@elwix.org>. All rights reserved.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 71 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,	Line 71 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
} else	} else
memcpy(cli, rpccli, sizeof(rpc_cli_t));	memcpy(cli, rpccli, sizeof(rpc_cli_t));

memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(sockaddr_t));	memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof cli->cli_sa);
switch (cli->cli_sa.sa.sa_family) {	switch (cli->cli_sa.sa.sa_family) {
case AF_INET:	case AF_INET:
cli->cli_sa.sin.sin_port =	cli->cli_sa.sin.sin_port =
Line 111 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,	Line 111 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
e_free(cli);	e_free(cli);
return NULL;	return NULL;
}	}
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {	if (connect(cli->cli_sock, &cli->cli_sa.sa, e_addrlen(&cli->cli_sa)) == -1) {
LOGERR;	LOGERR;
close(cli->cli_sock);	close(cli->cli_sock);
e_free(cli);	e_free(cli);
Line 158 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)	Line 158 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
rpc_cli_t *	rpc_cli_t *
rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto)	rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto)
{	{
	int n = 1;
rpc_cli_t *cli = NULL;	rpc_cli_t *cli = NULL;
sockaddr_t sa = E_SOCKADDR_INIT;	sockaddr_t sa = E_SOCKADDR_INIT;
	socklen_t salen;

if (!e_gethostbyname(csHost, Port, &sa))	if (proto < 0 \|\| proto > SOCK_RAW) {
	rpc_SetErr(EINVAL, "Invalid parameters can`t open RPC client");
return NULL;	return NULL;
if (!Port)	}

	srandom(time(NULL) ^ getpid());

	if (!Port && proto < SOCK_RAW)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
	if (!(salen = e_gethostbyname(csHost, Port, &sa)))
	return NULL;
if (!proto)	if (!proto)
proto = SOCK_STREAM;	proto = SOCK_STREAM;
if (netBuf < RPC_MIN_BUFSIZ)	if (netBuf < RPC_MIN_BUFSIZ)
Line 195 rpc_cli_openClient(u_char InstID, int netBuf, const ch	Line 204 rpc_cli_openClient(u_char InstID, int netBuf, const ch
AIT_SET_BUFSIZ(&cli->cli_buf, 0, netBuf);	AIT_SET_BUFSIZ(&cli->cli_buf, 0, netBuf);

/* connect to RPC server */	/* connect to RPC server */
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0);	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id,
	cli->cli_id == SOCK_RAW ? IPPROTO_ERPC : 0);
if (cli->cli_sock == -1) {	if (cli->cli_sock == -1) {
LOGERR;	LOGERR;
goto err;	goto err;
Line 210 rpc_cli_openClient(u_char InstID, int netBuf, const ch	Line 220 rpc_cli_openClient(u_char InstID, int netBuf, const ch
LOGERR;	LOGERR;
goto err;	goto err;
}	}
if (cli->cli_id == SOCK_STREAM)	if (cli->cli_id == SOCK_STREAM) {
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {	setsockopt(cli->cli_sock, IPPROTO_TCP, TCP_NODELAY, &n, sizeof n);
	if (connect(cli->cli_sock, &cli->cli_sa.sa, salen) == -1) {
LOGERR;	LOGERR;
goto err;	goto err;
}	}
	}
	if (cli->cli_id == SOCK_DGRAM) {
	sockaddr_t sa2;

	if (!(salen = e_gethostbyname(csHost, 0, &sa2)))
	goto err;
	if (bind(cli->cli_sock, &sa2.sa, salen) == -1) {
	LOGERR;
	goto err;
	}
	}

fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) \| O_NONBLOCK);	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) \| O_NONBLOCK);
return cli;	return cli;
err:	err:
Line 228 err:	Line 250 err:
}	}

/*	/*
	* 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)
	{
	int netBuf;

	if (!cli)
	return -1;
	else
	netBuf = AIT_LEN(&cli->cli_buf);

	if (cli->cli_id == SOCK_STREAM)
	shutdown(cli->cli_sock, SHUT_RDWR);
	if (cli->cli_id == SOCK_DGRAM && cli->cli_sa.sa.sa_family == AF_LOCAL) {
	sockaddr_t sa2 = E_SOCKADDR_INIT;
	socklen_t salen = sizeof sa2;

	#ifndef __linux__
	sa2.sa.sa_len = salen;
	#endif
	if (!getsockname(cli->cli_sock, &sa2.sa, &salen))
	unlink(sa2.sun.sun_path);
	}
	close(cli->cli_sock);

	srandom(time(NULL) ^ getpid());

	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0);
	if (cli->cli_sock == -1) {
	LOGERR;
	return -1;
	}
	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF,
	&netBuf, sizeof netBuf) == -1) {
	LOGERR;
	close(cli->cli_sock);
	return -1;
	}
	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF,
	&netBuf, sizeof netBuf) == -1) {
	LOGERR;
	close(cli->cli_sock);
	return -1;
	}
	if (cli->cli_id == SOCK_STREAM)
	if (connect(cli->cli_sock, &cli->cli_sa.sa, e_addrlen(&cli->cli_sa)) == -1) {
	LOGERR;
	close(cli->cli_sock);
	return -1;
	}

	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) \| O_NONBLOCK);
	return 0;
	}

	/*
* rpc_cli_closeClient() - Close connection to RPC server and free resources	* rpc_cli_closeClient() - Close connection to RPC server and free resources
*	*
* @cli = RPC Client session	* @cli = RPC Client session
Line 236 err:	Line 318 err:
void	void
rpc_cli_closeClient(rpc_cli_t ** __restrict cli)	rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
{	{
if (!cli \|\| !*cli)	if (!cli \|\| !cli \|\| (cli)->cli_id == SOCK_BPF)
return;	return;

if ((*cli)->cli_id == SOCK_STREAM)	if ((*cli)->cli_id == SOCK_STREAM)
shutdown((*cli)->cli_sock, SHUT_RDWR);	shutdown((*cli)->cli_sock, SHUT_RDWR);
	if ((cli)->cli_id == SOCK_DGRAM && (cli)->cli_sa.sa.sa_family == AF_LOCAL) {
	sockaddr_t sa2 = E_SOCKADDR_INIT;
	socklen_t salen = sizeof sa2;

	#ifndef __linux__
	sa2.sa.sa_len = salen;
	#endif
	if (!getsockname((*cli)->cli_sock, &sa2.sa, &salen))
	unlink(sa2.sun.sun_path);
	}
close((*cli)->cli_sock);	close((*cli)->cli_sock);

AIT_FREE_VAL(&(*cli)->cli_buf);	AIT_FREE_VAL(&(*cli)->cli_buf);
Line 265 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)	Line 357 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
int	int
rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len)	rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len)
{	{
u_char *buf;

if (!pkt) {	if (!pkt) {
rpc_SetErr(EINVAL, "Invalid argument(s)!");	rpc_SetErr(EINVAL, "Invalid argument(s)!");
return -1;	return -1;
} else	}
buf = AIT_GET_BUF(pkt);

return rpc_Write(sock, type, MSG_NOSIGNAL, sa, buf, len);	return rpc_Write(sock, type, MSG_NOSIGNAL, sa, pkt, len);
}	}

/*	/*
Line 283 rpc_pkt_Send(int sock, int type, sockaddr_t * __restri	Line 372 rpc_pkt_Send(int sock, int type, sockaddr_t * __restri
* @type = Type of socket	* @type = Type of socket
* @sa = Server address	* @sa = Server address
* @pkt = RPC packet	* @pkt = RPC packet
	* @seq = Signed packet with seq.no
* return: -1 error, 0 EOF or >0 received bytes	* return: -1 error, 0 EOF or >0 received bytes
*/	*/
int	int
rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt)	rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int seq)
{	{
int ret, estlen = 0, blen = sizeof(struct tagRPCCall);	int ret;
u_char *buf;
struct tagRPCCall *rpc;	struct tagRPCCall *rpc;

if (!pkt) {	if (!pkt) {
rpc_SetErr(EINVAL, "Invalid argument(s)!");	rpc_SetErr(EINVAL, "Invalid argument(s)!");
return -1;	return -1;
} else {
buf = AIT_GET_BUF(pkt);
rpc = (struct tagRPCCall*) buf;
}	}

/* reply from RPC server */	/* reply from RPC server */
do {	do {
if (type == SOCK_STREAM)	if (type == SOCK_STREAM \|\| type == SOCK_EXT)
ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen);	ret = rpc_Read(sock, type, 0, NULL, pkt);
else	else
ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen);	ret = rpc_Read(sock, type, 0, sa, pkt);
if (ret < 1)
return ret;

/* check for response from known address */	if (ret > 0) {
if (!estlen) {	rpc = (struct tagRPCCall*) AIT_GET_BUF(pkt);
/* 1st read for RPC header */	if (ret < ntohl(rpc->call_len))
if (ret < sizeof(struct tagRPCCall)) {	continue;
rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
return -1;
}

/* calc estimated length */	/* check for loop request */
estlen = ntohl(rpc->call_len);	if (!(rpc->call_io & RPC_ACK))
if (estlen > AIT_LEN(pkt))	continue;
AIT_RE_BUF(pkt, estlen);	/* check for signed request */
buf = AIT_GET_BUF(pkt);	if (seq != ntohl(rpc->call_seq))
rpc = (struct tagRPCCall*) buf;	continue;
blen = estlen;
continue;
}	}
	} while (ret < 0);

/* compiler optimize loop if while(0) and stop working 'continue' on some platforms */
break;
} while (42);

if (ret < sizeof(struct tagRPCCall) \|\| estlen != ret) {
rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n",
estlen, ret);
return -1;
}

return ret;	return ret;
}	}

Line 347 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res	Line 417 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
* @sess = RPC session info	* @sess = RPC session info
* @tag = Function tag for execution	* @tag = Function tag for execution
* @vars = Function argument array of values, may be NULL	* @vars = Function argument array of values, may be NULL
* @noreply = We not want RPC reply	* @noreply = >0 We not want RPC reply, -1 IPC request with reply
* @nocrc = Without CRC calculation	* @nocrc = Without CRC calculation
	* @seq = Sign packet with seq.no
* return: -1 error or != -1 prepared bytes into packet	* return: -1 error or != -1 prepared bytes into packet
*/	*/
int	int
rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag,	rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag,
array_t * __restrict vars, int noreply, int nocrc)	array_t * __restrict vars, int noreply, int nocrc, int seq)
{	{
struct tagRPCCall *rpc;	struct tagRPCCall *rpc;
int ret = 0, estlen, len = sizeof(struct tagRPCCall);	int ret = 0, estlen, len = sizeof(struct tagRPCCall);
Line 366 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t	Line 437 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t

/* calc estimated length */	/* calc estimated length */
estlen = ait_resideVars(vars) + len;	estlen = ait_resideVars(vars) + len;
if (estlen > AIT_LEN(pkt))	if (estlen > AIT_LEN(pkt)) {
AIT_RE_BUF(pkt, estlen);	rpc_SetErr(EMSGSIZE, "Message too long");
	return -1;
	}
buf = AIT_GET_BUF(pkt);	buf = AIT_GET_BUF(pkt);

/* prepare RPC call */	/* prepare RPC call */
Line 377 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t	Line 450 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
if (!vars)	if (!vars)
rpc->call_argc = 0;	rpc->call_argc = 0;
else	else
rpc->call_argc = htons(array_Size(vars));	rpc->call_argc = (u_char) array_Size(vars);

/* set reply */	/* set reply */
rpc->call_req.flags = (uint64_t) htonl(noreply ? RPC_NOREPLY : RPC_REPLY);	rpc->call_req.flags = (uint64_t) htonl((noreply > 0) ? RPC_NOREPLY : RPC_REPLY);

if (array_Size(vars)) {	if (array_Size(vars)) {
/* marshaling variables */	/* marshaling variables */
Line 394 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t	Line 467 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t

/* total packet length */	/* total packet length */
rpc->call_len = htonl(len);	rpc->call_len = htonl(len);
	rpc->call_io = (noreply == -1) ? RPC_IPC : RPC_REQ;

	/* sign packet */
	rpc->call_seq = htonl(seq);

if (!nocrc) {	if (!nocrc) {
/* calculate CRC */	/* calculate CRC */
rpc->call_crc ^= rpc->call_crc;	rpc->call_crc ^= rpc->call_crc;
Line 408 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t	Line 485 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
* rpc_pkt_Replay() - Decode RPC Replay packet	* rpc_pkt_Replay() - Decode RPC Replay packet
*	*
* @pkt = Packet buffer	* @pkt = Packet buffer
* @sess = RPC session info	* @sess = RPC session info, if =NULL don't check session
* @tag = Function tag	* @tag = Function tag, if =CALL_TAG_MAX don't check tag
* @vars = Function argument array of values, may be NULL	* @vars = Function argument array of values, may be NULL
* @nocrc = Without CRC calculation	* @nocrc = Without CRC calculation
* return: -1 error or != -1 return value from function	* return: -1 error or != -1 return value from function
Line 423 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t	Line 500 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
u_char *buf;	u_char *buf;
uint16_t crc;	uint16_t crc;

if (!pkt \|\| !sess) {	if (!pkt) {
rpc_SetErr(EINVAL, "Invalid argument(s)!");	rpc_SetErr(EINVAL, "Invalid argument(s)!");
return -1;	return -1;
} else	} else
Line 441 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t	Line 518 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
}	}

/* check RPC packet session info */	/* check RPC packet session info */
if (rpc_chkPktSession(&rpc->call_session, sess)) {	if (sess && rpc_chkPktSession(&rpc->call_session, sess)) {
rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");	rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
return -1;	return -1;
}	}
if (ntohs(rpc->call_tag) != tag) {	if (tag != CALL_TAG_MAX && ntohs(rpc->call_tag) != tag) {
rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply");	rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply");
return -1;	return -1;
}	}
Line 455 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t	Line 532 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
strerror(ntohl(rpc->call_rep.eno)));	strerror(ntohl(rpc->call_rep.eno)));
return -1;	return -1;
}	}
len = ntohs(rpc->call_argc) * sizeof(ait_val_t);	len = rpc->call_argc * sizeof(ait_val_t);
if (len > AIT_LEN(pkt) - sizeof(struct tagRPCCall)) {	if (len > AIT_LEN(pkt) - sizeof(struct tagRPCCall)) {
rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ...");	rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ...");
return -1;	return -1;
Line 466 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t	Line 543 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
}	}

/* RPC is OK! Go de-marshaling variables ... */	/* RPC is OK! Go de-marshaling variables ... */
if (vars && ntohs(rpc->call_argc)) {	if (vars && rpc->call_argc) {
#ifdef CLI_RES_ZCOPY	#ifdef CLI_RES_ZCOPY
*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len,	*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len,
ntohs(rpc->call_argc), 42);	rpc->call_argc, 42);
#else	#else
*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len,	*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len,
ntohs(rpc->call_argc), 0);	rpc->call_argc, 0);
#endif	#endif
if (!*vars) {	if (!*vars) {
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());	rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
Line 487 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t	Line 564 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
* rpc_cli_execCall() - Execute RPC call	* rpc_cli_execCall() - Execute RPC call
*	*
* @cli = RPC Client session	* @cli = RPC Client session
* @noreply = We not want RPC reply	* @noreply = >0 We not want RPC reply, -1 IPC request with reply
* @tag = Function tag for execution	* @tag = Function tag for execution
* @in_vars = IN function argument array of values, may be NULL	* @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()	* @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars()
Line 498 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short	Line 575 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
array_t * __restrict in_vars, array_t ** __restrict out_vars)	array_t * __restrict in_vars, array_t ** __restrict out_vars)
{	{
int type = 0, wlen;	int type = 0, wlen;
u_char *buf;	u_int seq = 0;

if (!cli) {	if (!cli) {
rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");	rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
return -1;	return -1;
} else {	} else {
if (cli->cli_id == SOCK_STREAM)	if (cli->cli_id == SOCK_STREAM \|\| cli->cli_id == SOCK_EXT)
type = cli->cli_id;	type = cli->cli_id;
buf = AIT_GET_BUF(&cli->cli_buf);	else
	seq = random(); /* sign package */
}	}
if (out_vars)	if (out_vars)
*out_vars = NULL;	*out_vars = NULL;

if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type)) == -1)	if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag,
	in_vars, noreply, type, seq)) == -1)
return -1;	return -1;

if ((wlen = rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen)) == -1)	if ((wlen = rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa,
	&cli->cli_buf, wlen)) == -1)
return -1;	return -1;
if (!wlen) /* closed rpc connection */	if (!wlen) /* closed rpc connection */
return 1;	return 1;

if (noreply) /* we not want reply */	if (noreply > 0) /* we not want reply */
return 0;	return 0;

if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf)) == -1)	if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa,
	&cli->cli_buf, seq)) == -1)
return -1;	return -1;
if (!wlen) /* closed rpc connection */	if (!wlen) { /* closed rpc connection */
return 1;	rpc_SetErr(ECONNRESET, "Closed connection");
	return -1;
	}

if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1)	if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag,
	out_vars, type)) == -1)
return -1;	return -1;

return 0;	return wlen;
}	}

/*	/*
Line 571 rpc_cli_ping(rpc_cli_t *cli)	Line 655 rpc_cli_ping(rpc_cli_t *cli)
rpc_cli_freeCall(&arr);	rpc_cli_freeCall(&arr);

return ret;	return ret;
	}


	/*
	* 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)
	{
	#ifndef __linux__
	rpc_cli_t *cli = NULL;
	sockaddr_t sa = E_SOCKADDR_INIT, sal = E_SOCKADDR_INIT;
	char szIface[64], szStr[STRSIZ];
	register int i;
	struct ifreq ifr;
	int n = 1;
	struct bpf_insn insns[] = {
	BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12),
	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, RPC_DEFPORT, 0, 1),
	BPF_STMT(BPF_RET + BPF_K, -1),
	BPF_STMT(BPF_RET + BPF_K, 0),
	};
	struct bpf_program fcode = {
	.bf_len = sizeof(insns) / sizeof(struct bpf_insn),
	.bf_insns = insns
	};

	if (!csHost \|\| !e_getlinkbyname(csHost, &sa))
	return NULL;
	if (!csIface) {
	if (e_get1stiface(szIface, sizeof szIface))
	return NULL;
	} else
	strlcpy(szIface, csIface, sizeof szIface);
	if (!e_getifacebyname(szIface, &sal))
	return NULL;

	cli = e_malloc(sizeof(rpc_cli_t));
	if (!cli) {
	LOGERR;
	return NULL;
	} else
	memset(cli, 0, sizeof(rpc_cli_t));

	/* build session */
	cli->cli_parent = e_malloc(sizeof(rpc_sess_t));
	if (!cli->cli_parent) {
	LOGERR;
	e_free(cli);
	return NULL;
	} else {
	((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
	((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID;
	}

	cli->cli_id = SOCK_BPF;
	memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa);

	/* connect to RPC server */
	for (i = 0; i < 10; i++) {
	memset(szStr, 0, sizeof szStr);
	snprintf(szStr, sizeof szStr, "/dev/bpf%d", i);
	cli->cli_sock = open(szStr, O_RDWR);
	if (cli->cli_sock > STDERR_FILENO)
	break;
	}
	if (cli->cli_sock < 3) {
	LOGERR;
	e_free(cli->cli_parent);
	e_free(cli);
	return NULL;
	}

	if (ioctl(cli->cli_sock, BIOCIMMEDIATE, &n) == -1) {
	LOGERR;
	goto err;
	}
	if (ioctl(cli->cli_sock, BIOCSETF, &fcode) == -1) {
	LOGERR;
	goto err;
	}
	n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2);
	if (ioctl(cli->cli_sock, BIOCSBLEN, &n) == -1) {
	LOGERR;
	goto err;
	} else
	AIT_SET_BUFSIZ(&cli->cli_buf, 0, n);

	memset(&ifr, 0, sizeof ifr);
	strlcpy(ifr.ifr_name, szIface, sizeof ifr.ifr_name);
	if (ioctl(cli->cli_sock, BIOCSETIF, &ifr) == -1) {
	LOGERR;
	goto err;
	} else
	fcntl(cli->cli_sock, F_SETFL,
	fcntl(cli->cli_sock, F_GETFL) \| O_NONBLOCK);

	return cli;
	err:
	AIT_FREE_VAL(&cli->cli_buf);
	if (cli->cli_sock > 2)
	close(cli->cli_sock);
	e_free(cli->cli_parent);
	e_free(cli);
	#else
	rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!");
	#endif
	return NULL;
	}

	/*
	* 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)
	{
	if (!cli \|\| !cli \|\| (cli)->cli_id != SOCK_BPF)
	return;

	close((*cli)->cli_sock);

	AIT_FREE_VAL(&(*cli)->cli_buf);

	if ((*cli)->cli_parent)
	e_free((*cli)->cli_parent);

	e_free(*cli);
	*cli = NULL;
	}

	/*
	* rpc_cli_openClientExt() - Connect to pipe RPC Server
	*
	* @InstID = InstID for RPC session request
	* @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
	* @fd = File descriptor
	* return: NULL == error or !=NULL connection to RPC server established
	*/
	rpc_cli_t *
	rpc_cli_openClientExt(u_char InstID, int netBuf, int fd)
	{
	rpc_cli_t *cli = NULL;
	int n;

	cli = e_malloc(sizeof(rpc_cli_t));
	if (!cli) {
	LOGERR;
	return NULL;
	} else
	memset(cli, 0, sizeof(rpc_cli_t));

	/* build session */
	cli->cli_parent = e_malloc(sizeof(rpc_sess_t));
	if (!cli->cli_parent) {
	LOGERR;
	e_free(cli);
	return NULL;
	} else {
	((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
	((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID;
	}

	cli->cli_id = SOCK_EXT;
	cli->cli_sock = fd;

	n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2);
	AIT_SET_BUFSIZ(&cli->cli_buf, 0, n);

	fcntl(cli->cli_sock, F_SETFL,
	fcntl(cli->cli_sock, F_GETFL) \| O_NONBLOCK);

	return cli;
	}

	/*
	* rpc_cli_closeClientExt() - Close pipe connection to RPC server and free resources
	*
	* @cli = RPC Client session
	* return: none
	*/
	void
	rpc_cli_closeClientExt(rpc_cli_t ** __restrict cli)
	{
	if (!cli \|\| !cli \|\| (cli)->cli_id != SOCK_EXT)
	return;

	AIT_FREE_VAL(&(*cli)->cli_buf);

	if ((*cli)->cli_parent)
	e_free((*cli)->cli_parent);

	e_free(*cli);
	*cli = NULL;
}	}

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

Removed from v.1.20.4.1
changed lines
	Added in v.1.28.2.1