--- libaitrpc/src/cli.c 2012/05/16 16:36:10 1.9.2.7 +++ libaitrpc/src/cli.c 2012/05/28 08:02:00 1.10.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.9.2.7 2012/05/16 16:36:10 misho Exp $ +* $Id: cli.c,v 1.10.2.1 2012/05/28 08:02:00 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -63,7 +63,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, return NULL; } - cli = malloc(sizeof(rpc_cli_t)); + cli = io_malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; return NULL; @@ -94,15 +94,16 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); if (cli->cli_sock == -1) { LOGERR; - free(cli); + io_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); - free(cli); + io_free(cli); return NULL; - } + } else + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; } @@ -124,7 +125,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) AIT_FREE_VAL(&(*cli)->cli_buf); - free(*cli); + io_free(*cli); *cli = NULL; } @@ -135,7 +136,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) * * @ProgID = ProgramID for RPC session request * @ProcID = ProcessID for RPC session request - * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) + * @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 * return: NULL == error or !=NULL connection to RPC server established @@ -150,8 +151,10 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne return NULL; if (!Port) Port = RPC_DEFPORT; - if (!netBuf) + if (netBuf < RPC_MIN_BUFSIZ) netBuf = BUFSIZ; + else + netBuf = io_align(netBuf, 1); /* align netBuf length */ #ifdef HAVE_SRANDOMDEV srandomdev(); @@ -161,7 +164,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne srandom((time(&tim) ^ getpid())); #endif - cli = malloc(sizeof(rpc_cli_t)); + cli = io_malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; return NULL; @@ -169,10 +172,10 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne memset(cli, 0, sizeof(rpc_cli_t)); /* build session */ - cli->cli_parent = malloc(sizeof(rpc_sess_t)); + cli->cli_parent = io_malloc(sizeof(rpc_sess_t)); if (!cli->cli_parent) { LOGERR; - free(cli); + io_free(cli); return NULL; } else { ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; @@ -188,18 +191,19 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne if (cli->cli_sock == -1) { LOGERR; AIT_FREE_VAL(&cli->cli_buf); - free(cli->cli_parent); - free(cli); + io_free(cli->cli_parent); + io_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); + io_free(cli->cli_parent); + io_free(cli); return NULL; - } + } else + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; } @@ -222,9 +226,9 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) AIT_FREE_VAL(&(*cli)->cli_buf); if ((*cli)->cli_parent) - free((*cli)->cli_parent); + io_free((*cli)->cli_parent); - free(*cli); + io_free(*cli); *cli = NULL; } @@ -235,8 +239,8 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) * @cli = RPC Client session * @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() + * @in_vars = IN RPC call array of rpc values, may be NULL + * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with io_freeVars() * return: -1 error or != -1 ok result */ int @@ -262,6 +266,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short rpc_addPktSession(&rpc->call_session, cli->cli_parent); rpc->call_argc = htons(io_arraySize(in_vars)); rpc->call_tag = htons(tag); + rpc->call_seq = htons(random() % USHRT_MAX); /* set reply */ rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; @@ -283,45 +288,70 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 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; - 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 (noreply) /* we not want reply */ - return 0; - - /* reply from RPC server */ pfd.fd = cli->cli_sock; - pfd.events = POLLIN | POLLPRI; - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || + 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, no answer from RPC server"); - + rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server"); return -1; } - memset(buf, 0, AIT_LEN(&cli->cli_buf)); - if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { - if (ret) + do { + if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { + if (errno == EAGAIN) + continue; LOGERR; - return -1; - } + return -1; + } else if (ret != wlen) { + rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " + "really sended %d bytes", wlen, ret); + return -1; + } + } while (0); + + if (noreply) /* we not want reply */ + return 0; + + wlen = 0; + /* reply from RPC server */ + 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 (wlen++ < 7) + continue; + else + rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); + } + return -1; + } + } while (0); + do { + memset(buf, 0, AIT_LEN(&cli->cli_buf)); + if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { + if (ret) { + if (errno == EAGAIN) + continue; + else + LOGERR; + } + return -1; + } + } while (0); if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); + rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); return -1; } /* calculate CRC */ crc = ntohs(rpc->call_crc); rpc->call_crc ^= rpc->call_crc; - if (crc != crcFletcher16((u_short*) buf, ret / 2)) { + if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); return -1; } @@ -348,14 +378,39 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short } /* RPC is OK! Go de-marshaling variables ... */ - if (ntohs(rpc->call_argc)) { + if (out_vars && ntohs(rpc->call_argc)) { *out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, ntohs(rpc->call_argc), 0); if (!*out_vars) { + rpc_SetErr(io_GetErrno(), "%s", io_GetError()); return -1; } } ret = ntohl(rpc->call_rep.ret); + return ret; +} + +/* + * rpc_cli_ping() - Ping RPC server + * + * @cli = connected client + * return: -1 error or !=-1 ping seq id + */ +inline int +rpc_cli_ping(rpc_cli_t *cli) +{ + int ret = 0; + array_t *arr = NULL; + + if (!cli) + return -1; + + if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr)) + return -1; + else + ret = AIT_GET_U16(io_array(arr, 0, ait_val_t*)); + io_freeVars(&arr); + return ret; }