--- libaitrpc/src/cli.c 2013/08/22 15:31:09 1.17 +++ libaitrpc/src/cli.c 2013/12/15 23:01:02 1.21 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.17 2013/08/22 15:31:09 misho Exp $ +* $Id: cli.c,v 1.21 2013/12/15 23:01:02 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -228,6 +228,52 @@ 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) +{ + int netBuf; + + if (!cli) + return -1; + else + netBuf = AIT_LEN(&cli->cli_buf); + + close(cli->cli_sock); + + cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); + if (cli->cli_sock == -1) { + LOGERR; + return -1; + } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, + &netBuf, sizeof netBuf) == -1) { + LOGERR; + close(cli->cli_sock); + return -1; + } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, + &netBuf, sizeof netBuf) == -1) { + LOGERR; + close(cli->cli_sock); + 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; + close(cli->cli_sock); + return -1; + } + + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); + return 0; +} + +/* * rpc_cli_closeClient() - Close connection to RPC server and free resources * * @cli = RPC Client session @@ -260,13 +306,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) { @@ -275,38 +319,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); } /* @@ -316,97 +329,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, estlen, blen = sizeof(struct tagRPCCall), 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; - return -1; - } - -payload: - if (type == SOCK_STREAM) { - memset(buf, 0, blen); - ret = recv(sock, buf, blen, 0); - /* handling case for reply without payload */ - if (!ret && buf != AIT_GET_BUF(pkt)) - return (buf - AIT_GET_BUF(pkt)); - } else { - blen = AIT_LEN(pkt); - memset(buf, 0, blen); - memset(&sa2, 0, sizeof sa2); - salen = sa2.ss.ss_len = sizeof(sockaddr_t); - ret = recvfrom(sock, buf, blen, 0, &sa2.sa, &salen); - } - if (ret < 1) { - if (ret) { - if (errno == EAGAIN) - continue; - else - LOGERR; - } - return -1; - } - /* 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; - } - } else { + if (!estlen) { /* 1st read for RPC header */ - if (buf == AIT_GET_BUF(pkt)) { - if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); - return -1; - } + if (ret < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); + return -1; + } - /* calc estimated length */ - rpc = (struct tagRPCCall*) buf; - estlen = ntohl(rpc->call_len); - if (estlen > AIT_LEN(pkt)) - AIT_RE_BUF(pkt, estlen); - buf = AIT_GET_BUF(pkt) + blen; - blen = estlen - blen; - goto payload; - } else - ret += sizeof(struct tagRPCCall); + /* 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; } - } while (0); - if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); + /* compiler optimize loop if while(0) and stop working 'continue' on some platforms */ + break; + } while (42); + + if (ret < sizeof(struct tagRPCCall) || estlen != ret) { + rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", + estlen, ret); return -1; } @@ -453,7 +426,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 */ @@ -564,7 +537,7 @@ 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, @@ -587,14 +560,18 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 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, &cli->cli_buf, 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, &cli->cli_buf) == -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(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1) return -1;