--- libaitrpc/src/cli.c 2012/05/14 15:22:22 1.9.2.1 +++ libaitrpc/src/cli.c 2012/05/15 16:06:13 1.9.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.9.2.1 2012/05/14 15:22:22 misho Exp $ +* $Id: cli.c,v 1.9.2.3 2012/05/15 16:06:13 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -60,9 +60,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, io_sockaddr_t sa; int n; - if (!rpccli || - (rpccli->cli_sa.sa.sa_family != AF_INET && rpccli->cli_sa.sa.sa_family != AF_INET6 && - rpccli->cli_sa.sa.sa_family != AF_LOCAL)) { + if (!rpccli) { rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server"); return NULL; } @@ -85,6 +83,9 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, case AF_LOCAL: strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); break; + default: + rpc_SetErr(EINVAL, "Invalid socket type %d", sa.sa.sa_family); + return NULL; } memcpy(&cli->cli_sa, &sa, sizeof sa); @@ -115,7 +116,6 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, return NULL; } - cli->cli_kill = enable; return cli; } @@ -132,7 +132,6 @@ rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli) rpc_SetErr(EINVAL, "Can`t close connection because parameter is null!"); return; } - cli->cli_kill = disable; shutdown(cli->cli_sock, SHUT_RDWR); close(cli->cli_sock);