--- libaitrpc/src/cli.c 2013/08/21 15:28:15 1.16.6.1 +++ libaitrpc/src/cli.c 2013/12/15 16:27:09 1.20.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.16.6.1 2013/08/21 15:28:15 misho Exp $ +* $Id: cli.c,v 1.20.4.2 2013/12/15 16:27:09 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -71,13 +71,6 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, } else memcpy(cli, rpccli, sizeof(rpc_cli_t)); - cli->cli_buf = ait_allocVars(1); - if (!cli->cli_buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - e_free(cli); - return NULL; - } - memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(sockaddr_t)); switch (cli->cli_sa.sa.sa_family) { case AF_INET: @@ -96,8 +89,8 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, return NULL; } - AIT_COPY_VAL(array(cli->cli_buf, 0, ait_val_t*), array(rpccli->cli_buf, 0, ait_val_t*)); - n = AIT_LEN(array(cli->cli_buf, 0, ait_val_t*)); + AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf); + n = AIT_LEN(&cli->cli_buf); /* connect to BLOB server */ cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); @@ -144,7 +137,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) shutdown((*cli)->cli_sock, SHUT_RDWR); close((*cli)->cli_sock); - ait_freeVars(&(*cli)->cli_buf); + AIT_FREE_VAL(&(*cli)->cli_buf); e_free(*cli); *cli = NULL; @@ -179,14 +172,6 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch else netBuf = E_ALIGN(netBuf, 2); /* align netBuf length */ -#ifdef HAVE_SRANDOMDEV - srandomdev(); -#else - time_t tim; - - srandom((time(&tim) ^ getpid())); -#endif - cli = e_malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; @@ -205,17 +190,9 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch ((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; } - cli->cli_buf = ait_allocVars(2); - if (!cli->cli_buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - e_free(cli->cli_parent); - e_free(cli); - return NULL; - } else - AIT_SET_BUFSIZ(array(cli->cli_buf, 0, ait_val_t*), 0, netBuf); - cli->cli_id = proto; memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); + AIT_SET_BUFSIZ(&cli->cli_buf, 0, netBuf); /* connect to RPC server */ cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); @@ -242,7 +219,7 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; err: - ait_freeVars(&cli->cli_buf); + AIT_FREE_VAL(&cli->cli_buf); if (cli->cli_sock > 2) close(cli->cli_sock); e_free(cli->cli_parent); @@ -251,6 +228,27 @@ err: } /* + * rpc_cli_reconnectClient() - Reconnecting client to RPC server + * + * @cli = RPC Client session + * return: -1 error or 0 ok + */ +int +rpc_cli_reconnectClient(rpc_cli_t * __restrict cli) +{ + if (!cli) + return -1; + + if (cli->cli_id == SOCK_STREAM) + if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { + LOGERR; + return -1; + } + + return 0; +} + +/* * rpc_cli_closeClient() - Close connection to RPC server and free resources * * @cli = RPC Client session @@ -266,7 +264,7 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) shutdown((*cli)->cli_sock, SHUT_RDWR); close((*cli)->cli_sock); - ait_freeVars(&(*cli)->cli_buf); + AIT_FREE_VAL(&(*cli)->cli_buf); if ((*cli)->cli_parent) e_free((*cli)->cli_parent); @@ -283,13 +281,11 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) * @sa = Server address * @pkt = RPC packet * @len = Length of packet - * return: -1 error or !=-1 sended bytes + * return: -1 error, 0 EOF or >0 sended bytes */ int rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len) { - struct pollfd pfd; - int ret; u_char *buf; if (!pkt) { @@ -298,38 +294,7 @@ rpc_pkt_Send(int sock, int type, sockaddr_t * __restri } else buf = AIT_GET_BUF(pkt); - pfd.fd = sock; - pfd.events = POLLOUT; - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (ret) - LOGERR; - else - rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server"); - return -1; - } - do { - if (type == SOCK_STREAM) - ret = send(sock, buf, len, MSG_NOSIGNAL); - else if (sa) - ret = sendto(sock, buf, len, MSG_NOSIGNAL, &sa->sa, sa->sa.sa_len); - else { - rpc_SetErr(EINVAL, "Invalid argument(s)!"); - return -1; - } - if (ret == -1) { - if (errno == EAGAIN) - continue; - LOGERR; - return -1; - } else if (ret != len) { - rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " - "really sended %d bytes", len, ret); - return -1; - } - } while (0); - - return ret; + return rpc_Write(sock, type, MSG_NOSIGNAL, sa, buf, len); } /* @@ -339,70 +304,57 @@ rpc_pkt_Send(int sock, int type, sockaddr_t * __restri * @type = Type of socket * @sa = Server address * @pkt = RPC packet - * return: -1 error or !=-1 sended bytes + * return: -1 error, 0 EOF or >0 received bytes */ int rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt) { - struct pollfd pfd; - int ret, len = 0; + int ret, estlen = 0, blen = sizeof(struct tagRPCCall); u_char *buf; - sockaddr_t sa2; - socklen_t salen; + struct tagRPCCall *rpc; if (!pkt) { rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; - } else + } else { buf = AIT_GET_BUF(pkt); + rpc = (struct tagRPCCall*) buf; + } /* reply from RPC server */ - pfd.fd = sock; - pfd.events = POLLIN | POLLPRI; do { - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (ret) { - LOGERR; - } else { - if (len++ < 7) - continue; - else - rpc_SetErr(ETIMEDOUT, - "Timeout, no answer from RPC server"); + if (type == SOCK_STREAM) + ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen); + else + ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen); + if (ret < 1) + return ret; + + /* check for response from known address */ + if (!estlen) { + /* 1st read for RPC header */ + if (ret < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); + return -1; } - return -1; + /* calc estimated length */ + estlen = ntohl(rpc->call_len); + if (estlen > AIT_LEN(pkt)) + AIT_RE_BUF(pkt, estlen); + buf = AIT_GET_BUF(pkt); + rpc = (struct tagRPCCall*) buf; + blen = estlen; + continue; } - memset(buf, 0, AIT_LEN(pkt)); - if (type == SOCK_STREAM) - ret = recv(sock, buf, AIT_LEN(pkt), 0); - else { - memset(&sa2, 0, sizeof sa2); - salen = sa2.ss.ss_len = sizeof(sockaddr_t); - ret = recvfrom(sock, buf, AIT_LEN(pkt), 0, &sa2.sa, &salen); - } - if (ret < 1) { - if (ret) { - if (errno == EAGAIN) - continue; - else - LOGERR; - } - return -1; - } + /* compiler optimize loop if while(0) and stop working 'continue' on some platforms */ + break; + } while (42); - /* check for response from known address */ - if (type == SOCK_DGRAM) - if (e_addrcmp(sa, &sa2, 42)) { - rpc_SetErr(ERPCMISMATCH, - "Received RPC response from unknown address"); - continue; - } - } while (0); - if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); + if (ret < sizeof(struct tagRPCCall) || estlen != ret) { + rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", + estlen, ret); return -1; } @@ -425,15 +377,20 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t array_t * __restrict vars, int noreply, int nocrc) { struct tagRPCCall *rpc; - int ret = 0, len = sizeof(struct tagRPCCall); + int ret = 0, estlen, len = sizeof(struct tagRPCCall); u_char *buf; if (!pkt || !sess) { rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; - } else - buf = AIT_GET_BUF(pkt); + } + /* calc estimated length */ + estlen = ait_resideVars(vars) + len; + if (estlen > AIT_LEN(pkt)) + AIT_RE_BUF(pkt, estlen); + buf = AIT_GET_BUF(pkt); + /* prepare RPC call */ rpc = (struct tagRPCCall*) buf; rpc_addPktSession(&rpc->call_session, sess); @@ -444,7 +401,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t rpc->call_argc = htons(array_Size(vars)); /* set reply */ - rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; + rpc->call_req.flags = (uint64_t) htonl(noreply ? RPC_NOREPLY : RPC_REPLY); if (array_Size(vars)) { /* marshaling variables */ @@ -457,7 +414,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t } /* total packet length */ - rpc->call_len = htons(len); + rpc->call_len = htonl(len); if (!nocrc) { /* calculate CRC */ @@ -498,7 +455,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t /* calculate CRC */ crc = ntohs(rpc->call_crc); rpc->call_crc ^= rpc->call_crc; - if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) { + if (crc != crcFletcher16((u_short*) buf, ntohl(rpc->call_len) / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); return -1; } @@ -524,7 +481,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ..."); return -1; } - if (len > ntohs(rpc->call_len) - sizeof(struct tagRPCCall)) { + if (len > ntohl(rpc->call_len) - sizeof(struct tagRPCCall)) { rpc_SetErr(EMSGSIZE, "Reply RPC packet is too short ..."); return -1; } @@ -555,36 +512,43 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t * @tag = Function tag for execution * @in_vars = IN function argument array of values, may be NULL * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars() - * return: -1 error or != -1 ok result + * return: -1 error, 0 ok result or 1 closed rpc connection */ int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, array_t * __restrict in_vars, array_t ** __restrict out_vars) { int type = 0, wlen; + u_char *buf; if (!cli) { rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); return -1; + } else { + if (cli->cli_id == SOCK_STREAM) + type = cli->cli_id; + buf = AIT_GET_BUF(&cli->cli_buf); } - if (cli->cli_id == SOCK_STREAM) - type = cli->cli_id; if (out_vars) *out_vars = NULL; - if ((wlen = rpc_pkt_Request(rpc_getBufVar(cli), cli->cli_parent, tag, in_vars, noreply, type)) == -1) + if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type)) == -1) return -1; - if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli), wlen) == -1) + if ((wlen = rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen)) == -1) return -1; + if (!wlen) /* closed rpc connection */ + return 1; if (noreply) /* we not want reply */ return 0; - if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli)) == -1) + if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf)) == -1) return -1; + if (!wlen) /* closed rpc connection */ + return 1; - if ((wlen = rpc_pkt_Replay(rpc_getBufVar(cli), cli->cli_parent, tag, out_vars, type)) == -1) + if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1) return -1; return 0;