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.1.1.1.2.2 and 1.2.2.2

version 1.1.1.1.2.2, 2010/06/18 15:47:33	version 1.2.2.2, 2011/07/14 02:36:57
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $Id$
*	*
*************************************************************************/	**************************************************************************
	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 <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
	by Michael Pounov <misho@elwix.org>. 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 <misho@elwix.org>
	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.
	*/
#include "global.h"	#include "global.h"


/*	/*
	* rpc_cli_openBLOBClient() Connect to BLOB Server
	* @rpccli = RPC Client session
	* @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, u_short Port)
	{
	rpc_cli_t *cli = NULL;
	struct sockaddr_in sin;
	struct sockaddr_in6 sin6;

	if (!rpccli \|\| (rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6)) {
	rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n");
	return NULL;
	}
	if (!Port)
	Port = RPC_DEFPORT + 1;

	cli = malloc(sizeof(rpc_cli_t));
	if (!cli) {
	LOGERR;
	return NULL;
	} else
	memcpy(cli, rpccli, sizeof(rpc_cli_t));

	if (rpccli->cli_sa.sa_family == AF_INET) {
	memcpy(&sin, &rpccli->cli_sa, sizeof sin);
	sin.sin_port = htons(Port);
	memcpy(&cli->cli_sa, &sin, sizeof(struct sockaddr));
	} else {
	memcpy(&sin6, &rpccli->cli_sa, sizeof sin6);
	sin6.sin6_port = htons(Port);
	memcpy(&cli->cli_sa, &sin6, sizeof(struct sockaddr));
	}

	cli->cli_sock = socket(cli->cli_sa.sa_family, SOCK_STREAM, 0);
	if (cli->cli_sock == -1) {
	LOGERR;
	free(cli);
	return NULL;
	}
	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
	LOGERR;
	free(cli);
	return NULL;
	}

	return cli;
	}

	/*
	* rpc_cli_closeBLOBClient() Close connection to BLOB server and free resources
	* @cli = BLOB Client session
	* return: none
	*/
	void
	rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli)
	{
	if (!cli) {
	rpc_SetErr(EINVAL, "Error:: Can`t close connection because parameter is null!\n");
	return;
	}

	shutdown(cli->cli_sock, SHUT_RDWR);
	close(cli->cli_sock);

	free(cli);
	cli = NULL;
	}

	// --------------------------------------------------------------

	/*
* 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
Line 140 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 251 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
fd_set fds;	fd_set fds;
u_char buf[BUFSIZ], str[MAXPATHLEN + UCHAR_MAX + 1], *data;	u_char buf[BUFSIZ], str[MAXPATHLEN + UCHAR_MAX + 1], *data;
struct tagRPCCall rpc = (struct tagRPCCall) buf;	struct tagRPCCall rpc = (struct tagRPCCall) buf;
struct tagRPCRet *rrpc;	struct tagRPCRet *rrpc = NULL;
int ret = 0, Limit = 0;	int ret = 0, Limit = 0;
register int i;	register int i;
rpc_val_t *v;	rpc_val_t *v;
Line 165 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 276 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
Limit = sizeof(struct tagRPCCall);	Limit = sizeof(struct tagRPCCall);
if (in_argc) {	if (in_argc) {
v = (rpc_val_t*) (buf + sizeof(struct tagRPCCall));	v = (rpc_val_t*) (buf + sizeof(struct tagRPCCall));
	if (in_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
	rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
	return -7;
	} else
	Limit += in_argc * sizeof(rpc_val_t);
memcpy(v, in_vals, in_argc * sizeof(rpc_val_t));	memcpy(v, in_vals, in_argc * sizeof(rpc_val_t));
Limit += in_argc * sizeof(rpc_val_t);
data = (u_char) v + in_argc sizeof(rpc_val_t);	data = (u_char) v + in_argc sizeof(rpc_val_t);
for (i = 0; i < in_argc; i++) {	for (i = 0; i < in_argc; i++) {
switch (in_vals[i].val_type) {	switch (in_vals[i].val_type) {
Line 182 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 297 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
Limit += in_vals[i].val_len;	Limit += in_vals[i].val_len;
break;	break;
case string:	case string:
if (Limit + in_vals[i].val_len + 1 > BUFSIZ) {	if (Limit + in_vals[i].val_len > BUFSIZ) {
ret = -7;	ret = -7;
break;	break;
}	}
Line 192 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 307 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
data += in_vals[i].val_len;	data += in_vals[i].val_len;
Limit += in_vals[i].val_len;	Limit += in_vals[i].val_len;
break;	break;
case array:
if (Limit + in_vals[i].val_len > BUFSIZ) {
ret = -7;
break;
}

memcpy(data, in_vals[i].val.array, in_vals[i].val_len);
v[i].val.array = (int8_t*) ((void) data - (void*) v);
data += in_vals[i].val_len;
Limit += in_vals[i].val_len;
break;
default:	default:
break;	break;
}	}
Line 217 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 321 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
return -1;	return -1;
}	}
if (ret != Limit) {	if (ret != Limit) {
rpc_SetErr(EBADMSG, "Error:: in send RPC request, should be send %d bytes, really is %d\n",	rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, really is %d\n",
Limit, ret);	Limit, ret);
return -9;	return -9;
}	}
Line 235 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 339 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
LOGERR;	LOGERR;
return -3;	return -3;
}	}
if (!ret) // receive EOF	if (!ret) /* receive EOF! */
return 0;	return 0;
if (ret < sizeof(struct tagRPCCall)) {	if (ret < sizeof(struct tagRPCRet)) {
rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n");	rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n");
return -4;	return -4;
} else	}
rrpc = (struct tagRPCRet*) buf;	rrpc = (struct tagRPCRet*) buf;
// check RPC packet session info	/* check RPC packet session info */
if (memcmp(&rrpc->ret_session, cli->cli_parent, sizeof rrpc->ret_session)) {	if (memcmp(&rrpc->ret_session, cli->cli_parent, sizeof rrpc->ret_session)) {
rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n");	rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n");
return -5;	return -5;
}	} else
	Limit = sizeof(struct tagRPCRet);
if (rrpc->ret_retcode < 0 && rrpc->ret_errno) {	if (rrpc->ret_retcode < 0 && rrpc->ret_errno) {
rpc_SetErr(rrpc->ret_errno, "Error::Server side: %s\n", strerror(rrpc->ret_errno));	rpc_SetErr(rrpc->ret_errno, "Error::Server side: %d %s\n",
	rrpc->ret_retcode, strerror(rrpc->ret_errno));
return -6;	return -6;
}	}
// RPC is OK! Go decapsulate variables ...	if (rrpc->ret_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
	rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too big ...\n");
	return -7;
	} else
	Limit += rrpc->ret_argc * sizeof(rpc_val_t);
	/* RPC is OK! Go decapsulate variables ... */
if (rrpc->ret_argc) {	if (rrpc->ret_argc) {
*out_argc = rrpc->ret_argc;	*out_argc = rrpc->ret_argc;
*out_vals = calloc(rrpc->ret_argc, sizeof(rpc_val_t));	*out_vals = calloc(rrpc->ret_argc, sizeof(rpc_val_t));
Line 260 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 371 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
*out_argc = 0;	*out_argc = 0;
return -1;	return -1;
} else	} else
Limit = rrpc->ret_argc * sizeof(rpc_val_t);	memcpy(*out_vals, buf + sizeof(struct tagRPCRet), Limit - sizeof(struct tagRPCRet));
memcpy(*out_vals, buf + sizeof(struct tagRPCRet), Limit);	/* RPC received variables types OK! */
// RPC received variables types OK!	data = (u_char*) buf + Limit;
data = (u_char*) buf + sizeof(struct tagRPCRet) + Limit;
for (i = 0; i < rrpc->ret_argc; i++)	for (i = 0; i < rrpc->ret_argc; i++)
switch ((*out_vals)[i].val_type) {	switch ((*out_vals)[i].val_type) {
case buffer:	case buffer:
	if ((*out_vals)[i].val_len > BUFSIZ - Limit) {
	rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
	free(*out_vals);
	*out_vals = NULL;
	*out_argc = 0;
	return -7;
	} else
	Limit += (*out_vals)[i].val_len;

(out_vals)[i].val.buffer = malloc((out_vals)[i].val_len);	(out_vals)[i].val.buffer = malloc((out_vals)[i].val_len);
if (!(*out_vals)[i].val.buffer) {	if (!(*out_vals)[i].val.buffer) {
rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");	rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");
Line 279 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 398 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
data += (*out_vals)[i].val_len;	data += (*out_vals)[i].val_len;
break;	break;
case string:	case string:
(out_vals)[i].val.string = (int8_t) strdup((char*) data);	if ((*out_vals)[i].val_len > BUFSIZ - Limit) {
if (!(*out_vals)[i].val.string) {	rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");
free(*out_vals);	free(*out_vals);
*out_vals = NULL;	*out_vals = NULL;
*out_argc = 0;	*out_argc = 0;
return -1;	return -7;
}	} else
data += (*out_vals)[i].val_len + 1;	Limit += (*out_vals)[i].val_len;
break;
case array:	(out_vals)[i].val.string = malloc((out_vals)[i].val_len);
(out_vals)[i].val.array = malloc((out_vals)[i].val_len);	if (!(*out_vals)[i].val.string) {
if (!(*out_vals)[i].val.array) {
rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");	rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");
free(*out_vals);	free(*out_vals);
*out_vals = NULL;	*out_vals = NULL;
*out_argc = 0;	*out_argc = 0;
return -1;	return -1;
} else	} else
memcpy((out_vals)[i].val.array, data, (out_vals)[i].val_len);	memcpy((out_vals)[i].val.string, data, (out_vals)[i].val_len);
data += (*out_vals)[i].val_len;	data += (*out_vals)[i].val_len;
break;	break;
default:	default:

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

Removed from v.1.1.1.1.2.2
changed lines
	Added in v.1.2.2.2