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.6 and 1.3.2.2

version 1.1.1.1.2.6, 2010/07/12 08:46:41	version 1.3.2.2, 2011/08/19 12:51:50
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"


Line 19 rpc_cli_t *	Line 56 rpc_cli_t *
rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port)	rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port)
{	{
rpc_cli_t *cli = NULL;	rpc_cli_t *cli = NULL;
struct sockaddr_in sin;	struct sockaddr sa;
struct sockaddr_in6 sin6;	struct sockaddr_in sin = (struct sockaddr_in) &sa;
	struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;
	struct sockaddr_un sun = (struct sockaddr_un) &sa;

if (!rpccli \|\| (rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6)) {	if (!rpccli \|\|
	(rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6 &&
	rpccli->cli_sa.sa_family != AF_LOCAL)) {
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n");	rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n");
return NULL;	return NULL;
}	}
Line 36 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,	Line 77 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
} else	} else
memcpy(cli, rpccli, sizeof(rpc_cli_t));	memcpy(cli, rpccli, sizeof(rpc_cli_t));

if (rpccli->cli_sa.sa_family == AF_INET) {	memcpy(&sa, &rpccli->cli_sa, sizeof sa);
memcpy(&sin, &rpccli->cli_sa, sizeof sin);	switch (rpccli->cli_sa.sa_family) {
sin.sin_port = htons(Port);	case AF_INET:
memcpy(&cli->cli_sa, &sin, sizeof(struct sockaddr));	sin->sin_port = htons(Port);
} else {	memcpy(&cli->cli_sa, sin, sizeof(struct sockaddr));
memcpy(&sin6, &rpccli->cli_sa, sizeof sin6);	break;
sin6.sin6_port = htons(Port);	case AF_INET6:
memcpy(&cli->cli_sa, &sin6, sizeof(struct sockaddr));	sin6->sin6_port = htons(Port);
	memcpy(&cli->cli_sa, sin6, sizeof(struct sockaddr));
	break;
	case AF_LOCAL:
	strlcat(sun->sun_path, ".blob", sizeof sun->sun_path);
	memcpy(&cli->cli_sa, sun, sizeof(struct sockaddr));
	break;
}	}

	/* connect to BLOB server */
cli->cli_sock = socket(cli->cli_sa.sa_family, SOCK_STREAM, 0);	cli->cli_sock = socket(cli->cli_sa.sa_family, SOCK_STREAM, 0);
if (cli->cli_sock == -1) {	if (cli->cli_sock == -1) {
LOGERR;	LOGERR;
Line 97 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short	Line 145 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
{	{
rpc_cli_t *cli = NULL;	rpc_cli_t *cli = NULL;
struct hostent *host = NULL;	struct hostent *host = NULL;
struct sockaddr_in sin;	struct sockaddr sa;
struct sockaddr_in6 sin6;	struct sockaddr_in sin = (struct sockaddr_in) &sa;
	struct sockaddr_in6 sin6 = (struct sockaddr_in6) &sa;
	struct sockaddr_un sun = (struct sockaddr_un) &sa;

if (!csHost \|\| (family != AF_INET && family != AF_INET6)) {	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");
return NULL;	return NULL;
}	}
if (!Port)	if (!Port)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
if (csHost) {	if (csHost && family != AF_LOCAL) {
host = gethostbyname2(csHost, family);	host = gethostbyname2(csHost, family);
if (!host) {	if (!host) {
rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));	rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));
return NULL;	return NULL;
}	}
}	}
	memset(&sa, 0, sizeof sa);
	sa.sa_family = family;
switch (family) {	switch (family) {
case AF_INET:	case AF_INET:
memset(&sin, 0, sizeof sin);	sin->sin_len = sizeof(struct sockaddr_in);
sin.sin_len = sizeof sin;	sin->sin_port = htons(Port);
sin.sin_family = family;
sin.sin_port = htons(Port);
if (csHost)	if (csHost)
memcpy(&sin.sin_addr, host->h_addr, host->h_length);	memcpy(&sin->sin_addr, host->h_addr, host->h_length);
break;	break;
case AF_INET6:	case AF_INET6:
memset(&sin6, 0, sizeof sin6);	sin6->sin6_len = sizeof(struct sockaddr_in6);
sin6.sin6_len = sizeof sin6;	sin6->sin6_port = htons(Port);
sin6.sin6_family = family;
sin6.sin6_port = htons(Port);
if (csHost)	if (csHost)
memcpy(&sin6.sin6_addr, host->h_addr, host->h_length);	memcpy(&sin6->sin6_addr, host->h_addr, host->h_length);
break;	break;
	case AF_LOCAL:
	sun->sun_len = sizeof(struct sockaddr_un);
	if (csHost)
	strlcpy(sun->sun_path, csHost, sizeof sun->sun_path);
	break;
default:	default:
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");
return NULL;	return NULL;
Line 152 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short	Line 205 rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID;	((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID;
}	}

if (family == AF_INET)	switch (family) {
memcpy(&cli->cli_sa, &sin, sizeof cli->cli_sa);	case AF_INET:
else	memcpy(&cli->cli_sa, sin, sizeof cli->cli_sa);
memcpy(&cli->cli_sa, &sin6, sizeof cli->cli_sa);	break;
	case AF_INET6:
	memcpy(&cli->cli_sa, sin6, sizeof cli->cli_sa);
	break;
	case AF_LOCAL:
	memcpy(&cli->cli_sa, sun, sizeof cli->cli_sa);
	break;
	}

	/* connect to RPC server */
cli->cli_sock = socket(family, SOCK_STREAM, 0);	cli->cli_sock = socket(family, SOCK_STREAM, 0);
if (cli->cli_sock == -1) {	if (cli->cli_sock == -1) {
LOGERR;	LOGERR;
Line 214 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 276 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 239 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 301 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 256 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 322 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;
}	}

memcpy(data, in_vals[i].val.string, in_vals[i].val_len);	memcpy(data, in_vals[i].val.string, in_vals[i].val_len);
v[i].val.string = (int8_t) ((void) data - (void*) v);	v[i].val.string = (int8_t) ((void) data - (void*) v);
data += in_vals[i].val_len + 1;	data += in_vals[i].val_len;
Limit += in_vals[i].val_len + 1;	Limit += in_vals[i].val_len;
break;	break;
default:	default:
break;	break;
Line 280 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 346 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 298 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 364 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 tagRPCRet)) {	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	} 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;
Line 321 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 387 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
return -7;	return -7;
} else	} else
Limit += rrpc->ret_argc * sizeof(rpc_val_t);	Limit += rrpc->ret_argc * sizeof(rpc_val_t);
// RPC is OK! Go decapsulate variables ...	/* 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 331 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 397 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
return -1;	return -1;
} else	} else
memcpy(*out_vals, buf + sizeof(struct tagRPCRet), Limit - sizeof(struct tagRPCRet));	memcpy(*out_vals, buf + sizeof(struct tagRPCRet), Limit - sizeof(struct tagRPCRet));
// RPC received variables types OK!	/* RPC received variables types OK! */
data = (u_char*) buf + Limit;	data = (u_char*) buf + 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) {
Line 357 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 423 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:
if ((*out_vals)[i].val_len + 1 > BUFSIZ - Limit) {	if ((*out_vals)[i].val_len > BUFSIZ - Limit) {
rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");	rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
free(*out_vals);	free(*out_vals);
*out_vals = NULL;	*out_vals = NULL;
*out_argc = 0;	*out_argc = 0;
return -7;	return -7;
} else	} else
Limit += (*out_vals)[i].val_len + 1;	Limit += (*out_vals)[i].val_len;

(out_vals)[i].val.string = (int8_t) strdup((char*) data);	(out_vals)[i].val.string = malloc((out_vals)[i].val_len);
if (!(*out_vals)[i].val.string) {	if (!(*out_vals)[i].val.string) {
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
data += (*out_vals)[i].val_len + 1;	memcpy((out_vals)[i].val.string, data, (out_vals)[i].val_len);
	data += (*out_vals)[i].val_len;
break;	break;
default:	default:
break;	break;

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

Removed from v.1.1.1.1.2.6
changed lines
	Added in v.1.3.2.2