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.4 and 1.5.2.1

version 1.4.2.4, 2011/08/31 17:11:58	version 1.5.2.1, 2011/09/07 08:56:32
Line 105 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,	Line 105 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
LOGERR;	LOGERR;
close(cli->cli_sock);	close(cli->cli_sock);
free(cli->cli_parent);
free(cli);	free(cli);
return NULL;	return NULL;
}	}
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
LOGERR;	LOGERR;
close(cli->cli_sock);	close(cli->cli_sock);
free(cli->cli_parent);
free(cli);	free(cli);
return NULL;	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);	free(cli);
return NULL;	return NULL;
}	}
Line 339 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 338 rpc_cli_execCall(rpc_cli_t cli, const char csModule,

/* prepare RPC call */	/* prepare RPC call */
rpc = (struct tagRPCCall*) buf;	rpc = (struct tagRPCCall*) buf;
memcpy(&rpc->call_session, cli->cli_parent, sizeof rpc->call_session);	rpc_addPktSession(&rpc->call_session, cli->cli_parent);
rpc->call_argc = in_vars ? io_arraySize(in_vars) : 0;	rpc->call_argc = in_vars ? io_arraySize(in_vars) : 0;
rpc->call_tag = crcFletcher16((u_short*) str, sizeof str / 2);	rpc->call_tag = crcFletcher16((u_short*) str, sizeof str / 2);
rpc->call_hash = hash_fnv((char*) str, sizeof str);	rpc->call_hash = hash_fnv((char*) str, sizeof str);
Line 349 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 348 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
/* marshaling variables */	/* marshaling variables */
ret = io_vals2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars);	ret = io_vals2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars);
if (ret == -1) {	if (ret == -1) {
rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");	rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
free(buf);	free(buf);
return -7;	return -7;
} else	} else
Line 362 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 361 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
return -1;	return -1;
}	}
if (ret != Limit) {	if (ret != Limit) {
rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, really is %d\n",	rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, really is %d\n",
Limit, ret);	Limit, ret);
free(buf);	free(buf);
return -9;	return -9;
Line 391 rpc_cli_execCall(rpc_cli_t cli, const char csModule,	Line 390 rpc_cli_execCall(rpc_cli_t cli, const char csModule,
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(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
free(buf);	free(buf);
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 (rpc_chkPktSession(&rrpc->ret_session, cli->cli_parent)) {
rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n");	rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n");
free(buf);	free(buf);
return -5;	return -5;
} else	} else
Limit = sizeof(struct tagRPCRet);	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: %d %s\n",	rpc_SetErr(rrpc->ret_errno, "Error::Server side: retcode=%d #%d %s\n",
rrpc->ret_retcode, strerror(rrpc->ret_errno));	rrpc->ret_retcode, rrpc->ret_errno, strerror(rrpc->ret_errno));
free(buf);	free(buf);
return -6;	return -6;
}	}

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

Removed from v.1.4.2.4
changed lines
	Added in v.1.5.2.1