--- libaitrpc/src/cli.c 2013/03/07 23:10:50 1.14 +++ libaitrpc/src/cli.c 2013/08/23 13:53:15 1.18 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.14 2013/03/07 23:10:50 misho Exp $ +* $Id: cli.c,v 1.18 2013/08/23 13:53:15 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -148,8 +148,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) /* * rpc_cli_openClient() - Connect to RPC Server * - * @ProgID = ProgramID for RPC session request - * @ProcID = ProcessID for RPC session request + * @InstID = InstID for RPC session request * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) * @csHost = Host name or IP address for bind server * @Port = Port for bind server, if Port == 0 default port is selected @@ -157,8 +156,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) * return: NULL == error or !=NULL connection to RPC server established */ rpc_cli_t * -rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, - u_short Port, int proto) +rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto) { rpc_cli_t *cli = NULL; sockaddr_t sa = E_SOCKADDR_INIT; @@ -174,14 +172,6 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne 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; @@ -197,8 +187,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne return NULL; } else { ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; - ((rpc_sess_t*) cli->cli_parent)->sess_program = ProgID; - ((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID; + ((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; } cli->cli_id = proto; @@ -276,8 +265,6 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) 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) { @@ -286,38 +273,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); } /* @@ -332,11 +288,9 @@ rpc_pkt_Send(int sock, int type, sockaddr_t * __restri 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)!"); @@ -345,50 +299,39 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res buf = AIT_GET_BUF(pkt); /* 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"); - } - - return -1; - } - - 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); - } + ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen); + else + ret = rpc_Read(sock, type, 0, sa, buf, AIT_LEN(pkt)); if (ret < 1) { - if (ret) { - if (errno == EAGAIN) - continue; - else - LOGERR; - } + 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; + if (type == SOCK_STREAM && !estlen) { + /* 1st read for RPC header */ + if (ret < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); + return -1; } - } while (0); + + /* 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 = estlen; + rpc = (struct tagRPCCall*) buf; + continue; + } + + /* compiler optimize loop if while(0) and stop working 'continue' on some platforms */ + break; + } while (42); + if (ret < sizeof(struct tagRPCCall)) { rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); return -1; @@ -405,27 +348,32 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res * @tag = Function tag for execution * @vars = Function argument array of values, may be NULL * @noreply = We not want RPC reply + * @nocrc = Without CRC calculation * return: -1 error or != -1 prepared bytes into packet */ int rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag, - array_t * __restrict vars, int noreply) + 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); rpc->call_tag = htons(tag); - rpc->call_seq = htons(random() % USHRT_MAX); if (!vars) rpc->call_argc = 0; else @@ -445,11 +393,13 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t } /* total packet length */ - rpc->call_len = htons(len); + rpc->call_len = htonl(len); - /* calculate CRC */ - rpc->call_crc ^= rpc->call_crc; - rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2)); + if (!nocrc) { + /* calculate CRC */ + rpc->call_crc ^= rpc->call_crc; + rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2)); + } return len; } @@ -461,11 +411,12 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * @sess = RPC session info * @tag = Function tag * @vars = Function argument array of values, may be NULL + * @nocrc = Without CRC calculation * return: -1 error or != -1 return value from function */ int rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag, - array_t ** __restrict vars) + array_t ** __restrict vars, int nocrc) { struct tagRPCCall *rpc; int len; @@ -479,12 +430,14 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t buf = AIT_GET_BUF(pkt); rpc = (struct tagRPCCall*) buf; - /* calculate CRC */ - crc = ntohs(rpc->call_crc); - rpc->call_crc ^= rpc->call_crc; - if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) { - rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); - return -1; + if (!nocrc) { + /* calculate CRC */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) buf, ntohl(rpc->call_len) / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); + return -1; + } } /* check RPC packet session info */ @@ -507,7 +460,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; } @@ -544,18 +497,21 @@ int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, array_t * __restrict in_vars, array_t ** __restrict out_vars) { - int ret = 0, wlen; + 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 + } else { + if (cli->cli_id == SOCK_STREAM) + type = cli->cli_id; buf = AIT_GET_BUF(&cli->cli_buf); + } if (out_vars) *out_vars = NULL; - if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply)) == -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, &cli->cli_buf, wlen) == -1) @@ -567,10 +523,10 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf) == -1) return -1; - if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars)) == -1) + if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1) return -1; - return ret; + return 0; } /* @@ -579,7 +535,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short * @out_vars = Returned array with variables from RPC call * return: none */ -inline void +void rpc_cli_freeCall(array_t ** __restrict out_vars) { #ifdef CLI_RES_ZCOPY @@ -595,7 +551,7 @@ rpc_cli_freeCall(array_t ** __restrict out_vars) * @cli = connected client * return: -1 error or !=-1 ping seq id */ -inline int +int rpc_cli_ping(rpc_cli_t *cli) { int ret = 0;