--- libaitrpc/src/cli.c 2011/11/03 15:32:21 1.6 +++ 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.6 2011/11/03 15:32:21 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 @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,7 +47,8 @@ SUCH DAMAGE. /* - * rpc_cli_openBLOBClient() Connect to BLOB Server + * 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 @@ -56,13 +57,9 @@ rpc_cli_t * rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port) { rpc_cli_t *cli = NULL; - 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)) { - rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n"); + if (!rpccli) { + rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server"); return NULL; } @@ -73,20 +70,26 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, } else memcpy(cli, rpccli, sizeof(rpc_cli_t)); - memcpy(&sa, &rpccli->cli_sa, sizeof sa); - switch (sa.sa.sa_family) { + memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(io_sockaddr_t)); + switch (cli->cli_sa.sa.sa_family) { case AF_INET: - sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1); + cli->cli_sa.sin.sin_port = + htons(Port ? Port : ntohs(cli->cli_sa.sin.sin_port) + 1); break; case AF_INET6: - sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1); + cli->cli_sa.sin6.sin6_port = + htons(Port ? Port : ntohs(cli->cli_sa.sin6.sin6_port) + 1); break; case AF_LOCAL: - strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); + strlcat(cli->cli_sa.sun.sun_path, ".blob", sizeof cli->cli_sa.sun.sun_path); break; + default: + rpc_SetErr(EINVAL, "Invalid socket type %d", cli->cli_sa.sa.sa_family); + return NULL; } - memcpy(&cli->cli_sa, &sa, sizeof sa); + 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) { @@ -94,19 +97,6 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, free(cli); return NULL; } - n = cli->cli_netbuf; - if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { - LOGERR; - close(cli->cli_sock); - free(cli); - return NULL; - } - if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { - LOGERR; - close(cli->cli_sock); - free(cli); - return NULL; - } if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { LOGERR; close(cli->cli_sock); @@ -118,85 +108,59 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, } /* - * rpc_cli_closeBLOBClient() Close connection to BLOB server and free resources + * 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) +rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) { - if (!cli) { - rpc_SetErr(EINVAL, "Error:: Can`t close connection because parameter is null!\n"); + if (!cli || !*cli) return; - } - shutdown(cli->cli_sock, SHUT_RDWR); - close(cli->cli_sock); + shutdown((*cli)->cli_sock, SHUT_RDWR); + close((*cli)->cli_sock); - free(cli); - cli = NULL; + AIT_FREE_VAL(&(*cli)->cli_buf); + + free(*cli); + *cli = NULL; } -// -------------------------------------------------------------- +/* -------------------------------------------------------------- */ /* - * rpc_cli_openClient() Connect to RPC Server + * rpc_cli_openClient() - Connect to RPC Server + * * @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_int 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; - struct hostent *host = NULL; io_sockaddr_t sa; - int n; - if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { - rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n"); + if (!io_gethostbyname(csHost, Port, &sa)) return NULL; - } if (!Port) Port = RPC_DEFPORT; if (!netBuf) netBuf = BUFSIZ; - if (csHost && family != AF_LOCAL) { - host = gethostbyname2(csHost, family); - if (!host) { - rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno)); - return NULL; - } - } - memset(&sa, 0, sizeof sa); - sa.sa.sa_family = family; - switch (family) { - case AF_INET: - sa.sin.sin_len = sizeof(struct sockaddr_in); - sa.sin.sin_port = htons(Port); - if (csHost) - memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length); - break; - case AF_INET6: - sa.sin6.sin6_len = sizeof(struct sockaddr_in6); - sa.sin6.sin6_port = htons(Port); - if (csHost) - memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length); - break; - case AF_LOCAL: - sa.sun.sun_len = sizeof(struct sockaddr_un); - if (csHost) - strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path); - break; - default: - rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n"); - return NULL; - } +#ifdef HAVE_SRANDOMDEV + srandomdev(); +#else + time_t tim; + + srandom((time(&tim) ^ getpid())); +#endif + cli = malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; @@ -204,7 +168,7 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net } else memset(cli, 0, sizeof(rpc_cli_t)); - cli->cli_netbuf = netBuf; + /* build session */ cli->cli_parent = malloc(sizeof(rpc_sess_t)); if (!cli->cli_parent) { LOGERR; @@ -217,32 +181,20 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net } memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); + AIT_SET_BUF2(&cli->cli_buf, 0, netBuf); /* connect to RPC server */ - cli->cli_sock = socket(family, SOCK_STREAM, 0); + cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); if (cli->cli_sock == -1) { LOGERR; + AIT_FREE_VAL(&cli->cli_buf); free(cli->cli_parent); free(cli); return NULL; } - n = cli->cli_netbuf; - if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { - LOGERR; - close(cli->cli_sock); - free(cli->cli_parent); - free(cli); - return NULL; - } - if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { - LOGERR; - close(cli->cli_sock); - free(cli->cli_parent); - free(cli); - return NULL; - } if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { LOGERR; + AIT_FREE_VAL(&cli->cli_buf); close(cli->cli_sock); free(cli->cli_parent); free(cli); @@ -253,166 +205,157 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net } /* - * rpc_cli_closeClient() Close connection to RPC server and free resources + * rpc_cli_closeClient() - Close connection to RPC server and free resources + * * @cli = RPC Client session * return: none */ void -rpc_cli_closeClient(rpc_cli_t * __restrict cli) +rpc_cli_closeClient(rpc_cli_t ** __restrict cli) { - if (!cli) { - rpc_SetErr(EINVAL, "Error:: Can`t close connection because parameter is null!\n"); + if (!cli || !*cli) return; - } - shutdown(cli->cli_sock, SHUT_RDWR); - close(cli->cli_sock); + shutdown((*cli)->cli_sock, SHUT_RDWR); + close((*cli)->cli_sock); - if (cli->cli_parent) - free(cli->cli_parent); - free(cli); - cli = NULL; + AIT_FREE_VAL(&(*cli)->cli_buf); + + if ((*cli)->cli_parent) + free((*cli)->cli_parent); + + free(*cli); + *cli = NULL; } /* - * rpc_cli_execCall() Execute RPC call + * rpc_cli_execCall() - Execute RPC call + * * @cli = RPC Client session - * @csModule = Module name, if NULL self binary - * @csFunc = Function name for execute + * @noreply = We not want RPC reply + * @tag = Function tag for execution * @in_vars = IN RPC call array of rpc values * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals() * return: -1 error or != -1 ok result */ int -rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, +rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, array_t * __restrict in_vars, array_t ** __restrict out_vars) { - fd_set fds; - u_char *buf, str[MAXPATHLEN + UCHAR_MAX + 1]; struct tagRPCCall *rpc; - struct tagRPCRet *rrpc = NULL; - int ret = 0, Limit = 0; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; - uint16_t tag; - uint32_t hash; + int ret = 0, wlen = sizeof(struct tagRPCCall); + uint16_t crc; + u_char *buf; + struct pollfd pfd; - if (!cli || !csFunc) { - rpc_SetErr(EINVAL, "Error:: Can`t execute call because parameter is null or invalid!\n"); + if (!cli) { + rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); return -1; - } + } else + buf = AIT_GET_BUF(&cli->cli_buf); if (out_vars) *out_vars = NULL; - buf = malloc(cli->cli_netbuf); - if (!buf) { - LOGERR; - return -1; - } else - memset(buf, 0, cli->cli_netbuf); - - /* build RPC call string for hash */ - memset(str, 0, sizeof str); - if (csModule) - strlcpy((char*) str, csModule, sizeof str); - strlcat((char*) str, "__", sizeof str); - strlcat((char*) str, csFunc, sizeof str); - /* prepare RPC call */ rpc = (struct tagRPCCall*) buf; rpc_addPktSession(&rpc->call_session, cli->cli_parent); rpc->call_argc = htons(io_arraySize(in_vars)); - rpc->call_tag = tag = htons(crcFletcher16((u_short*) str, sizeof str / 2)); - rpc->call_hash = hash = htonl(hash_fnv((char*) str, sizeof str)); - Limit = sizeof(struct tagRPCCall); + rpc->call_tag = htons(tag); + /* set reply */ + rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; + if (io_arraySize(in_vars)) { /* marshaling variables */ - ret = io_vars2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars); + ret = io_vars2buffer(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, in_vars); if (ret == -1) { - rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n"); - free(buf); - return -7; + rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values"); + return -1; } else - Limit += ret; + wlen += ret; } - if ((ret = send(cli->cli_sock, buf, Limit, 0)) == -1) { + /* total packet length */ + rpc->call_len = htons(wlen); + + /* calculate CRC */ + rpc->call_crc ^= rpc->call_crc; + rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); + + if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { LOGERR; - free(buf); return -1; + } else if (ret != wlen) { + rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " + "really sended %d bytes", wlen, ret); + return -1; } - if (ret != Limit) { - rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, really is %d\n", - Limit, ret); - free(buf); - return -9; - } + if (noreply) /* we not want reply */ + return 0; + /* reply from RPC server */ - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - if ((ret = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) < 1) { + pfd.fd = cli->cli_sock; + pfd.events = POLLIN | POLLPRI; + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { if (ret) LOGERR; else - rpc_SetErr(ETIMEDOUT, "Error:: timeout, no return from RPC server?\n"); + rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); - free(buf); return -1; } - memset(buf, 0, cli->cli_netbuf); - if ((ret = recv(cli->cli_sock, buf, cli->cli_netbuf, 0)) == -1) { - LOGERR; - free(buf); - return -3; + memset(buf, 0, AIT_LEN(&cli->cli_buf)); + if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { + if (ret) + LOGERR; + return -1; } - if (!ret) { /* receive EOF! */ - free(buf); - return 0; + if (ret < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); + return -1; } - if (ret < sizeof(struct tagRPCRet)) { - rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); - free(buf); - return -4; - } else - rrpc = (struct tagRPCRet*) buf; + + /* calculate CRC */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) buf, ret / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); + return -1; + } + /* check RPC packet session info */ - if (rpc_chkPktSession(&rrpc->ret_session, cli->cli_parent)) { - rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); - free(buf); - return -5; + if (rpc_chkPktSession(&rpc->call_session, cli->cli_parent)) { + rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); + return -1; } else - Limit = sizeof(struct tagRPCRet); - if (rrpc->ret_tag != tag || rrpc->ret_hash != hash) { - rpc_SetErr(ERPCMISMATCH, "Error:: get wrong RPC reply ...\n"); - free(buf); - return -5; + wlen = sizeof(struct tagRPCCall); + if (ntohs(rpc->call_tag) != tag) { + rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply"); + return -1; } - if (ntohl(rrpc->ret_retcode) < 0 && ntohl(rrpc->ret_errno)) { - rpc_SetErr(ntohl(rrpc->ret_errno), "Error::Server side: retcode=%d #%d %s\n", - ntohl(rrpc->ret_retcode), ntohl(rrpc->ret_errno), - strerror(ntohl(rrpc->ret_errno))); - free(buf); - return -6; + 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))); + return -1; } - if (ntohs(rrpc->ret_argc) * sizeof(ait_val_t) > cli->cli_netbuf - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n"); - free(buf); - return -7; + if (ntohs(rpc->call_argc) * sizeof(ait_val_t) > AIT_LEN(&cli->cli_buf) - wlen) { + rpc_SetErr(EMSGSIZE, "Reply RPC packet is too long ..."); + return -1; } /* RPC is OK! Go de-marshaling variables ... */ - if (ntohs(rrpc->ret_argc)) { - *out_vars = io_buffer2vars(buf + Limit, cli->cli_netbuf - Limit, - ntohs(rrpc->ret_argc), 0); + if (ntohs(rpc->call_argc)) { + *out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, + ntohs(rpc->call_argc), 0); if (!*out_vars) { - free(buf); return -1; } } - ret = ntohl(rrpc->ret_retcode); - free(buf); + ret = ntohl(rpc->call_rep.ret); return ret; }