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.9.2.7 and 1.9.2.15

version 1.9.2.7, 2012/05/16 16:36:10	version 1.9.2.15, 2012/05/17 22:57:42
Line 102 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,	Line 102 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
close(cli->cli_sock);	close(cli->cli_sock);
free(cli);	free(cli);
return NULL;	return NULL;
}	} else
	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) \| O_NONBLOCK);

return cli;	return cli;
}	}
Line 135 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)	Line 136 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
*	*
* @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)	* @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
* @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
Line 150 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne	Line 151 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
return NULL;	return NULL;
if (!Port)	if (!Port)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
if (!netBuf)	if (netBuf < RPC_MIN_BUFSIZ)
netBuf = BUFSIZ;	netBuf = BUFSIZ;
	else
	netBuf = io_align(netBuf, 1); /* align netBuf length */

#ifdef HAVE_SRANDOMDEV	#ifdef HAVE_SRANDOMDEV
srandomdev();	srandomdev();
Line 199 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne	Line 202 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
free(cli->cli_parent);	free(cli->cli_parent);
free(cli);	free(cli);
return NULL;	return NULL;
}	} else
	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) \| O_NONBLOCK);

return cli;	return cli;
}	}
Line 235 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)	Line 239 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
* @cli = RPC Client session	* @cli = RPC Client session
* @noreply = We not want RPC reply	* @noreply = We not want RPC reply
* @tag = Function tag for execution	* @tag = Function tag for execution
* @in_vars = IN RPC call array of rpc values	* @in_vars = IN RPC call array of rpc values, may be NULL
* @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals()	* @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with io_freeVars()
* return: -1 error or != -1 ok result	* return: -1 error or != -1 ok result
*/	*/
int	int
Line 262 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short	Line 266 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
rpc_addPktSession(&rpc->call_session, cli->cli_parent);	rpc_addPktSession(&rpc->call_session, cli->cli_parent);
rpc->call_argc = htons(io_arraySize(in_vars));	rpc->call_argc = htons(io_arraySize(in_vars));
rpc->call_tag = htons(tag);	rpc->call_tag = htons(tag);
	rpc->call_seq = htons(random() % USHRT_MAX);

/* set reply */	/* set reply */
rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY;	rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY;
Line 283 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short	Line 288 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
rpc->call_crc ^= rpc->call_crc;	rpc->call_crc ^= rpc->call_crc;
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));

	pfd.fd = cli->cli_sock;
	pfd.events = POLLOUT;
	do {
	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 \|\|
	pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
	if (ret) {
	if (errno == EAGAIN)
	continue;
	else
	LOGERR;
	} else
	rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server");
	return -1;
	}
	} while (0);
if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {	if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
LOGERR;	LOGERR;
return -1;	return -1;
Line 296 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short	Line 316 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
return 0;	return 0;

/* reply from RPC server */	/* reply from RPC server */
pfd.fd = cli->cli_sock;
pfd.events = POLLIN \| POLLPRI;	pfd.events = POLLIN \| POLLPRI;
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 \|\|	do {
pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 \|\|
if (ret)	pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
LOGERR;	if (ret) {
else	if (errno == EAGAIN)
rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server");	continue;
	else
return -1;	LOGERR;
}	} else
	rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server");
	return -1;
	}
	} while (0);
memset(buf, 0, AIT_LEN(&cli->cli_buf));	memset(buf, 0, AIT_LEN(&cli->cli_buf));
if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) {	if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) {
if (ret)	if (ret)
Line 348 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short	Line 371 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
}	}

/* RPC is OK! Go de-marshaling variables ... */	/* RPC is OK! Go de-marshaling variables ... */
if (ntohs(rpc->call_argc)) {	if (out_vars && ntohs(rpc->call_argc)) {
*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen,	*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen,
ntohs(rpc->call_argc), 0);	ntohs(rpc->call_argc), 0);
if (!*out_vars) {	if (!*out_vars) {
	rpc_SetErr(io_GetErrno(), "%s", io_GetError());
return -1;	return -1;
}	}
}	}

ret = ntohl(rpc->call_rep.ret);	ret = ntohl(rpc->call_rep.ret);
	return ret;
	}

	/*
	* rpc_cli_ping() - Ping RPC server
	*
	* @cli = connected client
	* return: -1 error or !=-1 ping seq id
	*/
	inline int
	rpc_cli_ping(rpc_cli_t *cli)
	{
	int ret = 0;
	array_t *arr = NULL;

	if (!cli)
	return -1;

	if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr))
	return -1;
	else
	ret = AIT_GET_U16(io_getVars(arr, 0));
	io_freeVars(&arr);

return ret;	return ret;
}	}

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

Removed from v.1.9.2.7
changed lines
	Added in v.1.9.2.15