--- libaitrpc/src/cli.c 2012/05/16 13:17:51 1.9.2.4 +++ libaitrpc/src/cli.c 2012/05/16 16:36:10 1.9.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.9.2.4 2012/05/16 13:17:51 misho Exp $ +* $Id: cli.c,v 1.9.2.7 2012/05/16 16:36:10 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -88,6 +88,8 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, return NULL; } + AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf); + /* connect to BLOB server */ cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); if (cli->cli_sock == -1) { @@ -134,14 +136,12 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) * @ProgID = ProgramID for RPC session request * @ProcID = ProcessID for RPC session request * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) - * @family = Family socket type, AF_INET or AF_INET6 * @csHost = Host name or IP address for bind server * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL connection to RPC server established */ rpc_cli_t * -rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, - u_short family, const char *csHost, u_short Port) +rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port) { rpc_cli_t *cli = NULL; io_sockaddr_t sa; @@ -336,7 +336,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply"); return -1; } - if (ntohl(rpc->call_rep.ret) < 0 && ntohl(rpc->call_rep.eno)) { + if (ntohl(rpc->call_rep.eno) && ntohl(rpc->call_rep.ret) == -1) { rpc_SetErr(ntohl(rpc->call_rep.eno), "Server side: retcode=%d #%d %s", ntohl(rpc->call_rep.ret), ntohl(rpc->call_rep.eno), strerror(ntohl(rpc->call_rep.eno)));