--- libaitrpc/src/cli.c 2012/11/13 09:22:10 1.12 +++ 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.12 2012/11/13 09:22:10 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 @@ -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, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -57,20 +57,21 @@ rpc_cli_t * rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port) { rpc_cli_t *cli = NULL; + int n; if (!rpccli) { rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server"); return NULL; } - cli = io_malloc(sizeof(rpc_cli_t)); + cli = e_malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; return NULL; } else memcpy(cli, rpccli, sizeof(rpc_cli_t)); - memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(io_sockaddr_t)); + memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(sockaddr_t)); switch (cli->cli_sa.sa.sa_family) { case AF_INET: cli->cli_sa.sin.sin_port = @@ -89,18 +90,31 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, } 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); if (cli->cli_sock == -1) { LOGERR; - io_free(cli); + e_free(cli); return NULL; } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { + LOGERR; + close(cli->cli_sock); + e_free(cli); + return NULL; + } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { + LOGERR; + close(cli->cli_sock); + e_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); - io_free(cli); + e_free(cli); return NULL; } else fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); @@ -125,7 +139,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) AIT_FREE_VAL(&(*cli)->cli_buf); - io_free(*cli); + e_free(*cli); *cli = NULL; } @@ -134,37 +148,31 @@ 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 + * @proto = Protocol, if == 0 choose SOCK_STREAM * 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) +rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto) { rpc_cli_t *cli = NULL; - io_sockaddr_t sa = IO_SOCKADDR_INIT; + sockaddr_t sa = E_SOCKADDR_INIT; - if (!io_gethostbyname(csHost, Port, &sa)) + if (!e_gethostbyname(csHost, Port, &sa)) return NULL; if (!Port) Port = RPC_DEFPORT; + if (!proto) + proto = SOCK_STREAM; if (netBuf < RPC_MIN_BUFSIZ) netBuf = BUFSIZ; else - netBuf = io_align(netBuf, 2); /* align netBuf length */ + netBuf = E_ALIGN(netBuf, 2); /* align netBuf length */ -#ifdef HAVE_SRANDOMDEV - srandomdev(); -#else - time_t tim; - - srandom((time(&tim) ^ getpid())); -#endif - - cli = io_malloc(sizeof(rpc_cli_t)); + cli = e_malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; return NULL; @@ -172,40 +180,51 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne memset(cli, 0, sizeof(rpc_cli_t)); /* build session */ - cli->cli_parent = io_malloc(sizeof(rpc_sess_t)); + cli->cli_parent = e_malloc(sizeof(rpc_sess_t)); if (!cli->cli_parent) { LOGERR; - io_free(cli); + e_free(cli); 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; memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); - AIT_SET_BUF2(&cli->cli_buf, 0, netBuf); + AIT_SET_BUFSIZ(&cli->cli_buf, 0, netBuf); /* connect to RPC server */ - cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); + cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); if (cli->cli_sock == -1) { LOGERR; - AIT_FREE_VAL(&cli->cli_buf); - io_free(cli->cli_parent); - io_free(cli); - return NULL; + goto err; } - if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, + &netBuf, sizeof netBuf) == -1) { LOGERR; - AIT_FREE_VAL(&cli->cli_buf); - close(cli->cli_sock); - 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); + goto err; + } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, + &netBuf, sizeof netBuf) == -1) { + LOGERR; + goto err; + } + if (cli->cli_id == SOCK_STREAM) + if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { + LOGERR; + goto err; + } + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; +err: + AIT_FREE_VAL(&cli->cli_buf); + if (cli->cli_sock > 2) + close(cli->cli_sock); + e_free(cli->cli_parent); + e_free(cli); + return NULL; } /* @@ -220,148 +239,212 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) if (!cli || !*cli) return; - shutdown((*cli)->cli_sock, SHUT_RDWR); + if ((*cli)->cli_id == SOCK_STREAM) + shutdown((*cli)->cli_sock, SHUT_RDWR); close((*cli)->cli_sock); AIT_FREE_VAL(&(*cli)->cli_buf); if ((*cli)->cli_parent) - io_free((*cli)->cli_parent); + e_free((*cli)->cli_parent); - io_free(*cli); + e_free(*cli); *cli = NULL; } +/* + * rpc_pkt_Send() - Send RPC packet + * + * @sock = Socket + * @type = Type of socket + * @sa = Server address + * @pkt = RPC packet + * @len = Length of packet + * return: -1 error or !=-1 sended bytes + */ +int +rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len) +{ + u_char *buf; + if (!pkt) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + return -1; + } else + buf = AIT_GET_BUF(pkt); + + return rpc_Write(sock, type, MSG_NOSIGNAL, sa, buf, len); +} + /* - * rpc_cli_execCall() - Execute RPC call + * rpc_pkt_Receive() - Receive RPC packet * - * @cli = RPC Client session - * @noreply = We not want RPC reply + * @sock = Socket + * @type = Type of socket + * @sa = Server address + * @pkt = RPC packet + * return: -1 error or !=-1 sended bytes + */ +int +rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt) +{ + int ret, estlen = 0, blen = sizeof(struct tagRPCCall); + u_char *buf; + struct tagRPCCall *rpc; + + if (!pkt) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + return -1; + } else + buf = AIT_GET_BUF(pkt); + + /* reply from RPC server */ + do { + if (type == SOCK_STREAM) + 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) { + LOGERR; + return -1; + } + + /* check for response from known address */ + 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; + } + + /* 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; + } + + return ret; +} + +/* + * rpc_pkt_Request() - Build RPC Request packet + * + * @pkt = Packet buffer + * @sess = RPC session info * @tag = Function tag for execution - * @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 + * @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_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, - array_t * __restrict in_vars, array_t ** __restrict out_vars) +rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag, + array_t * __restrict vars, int noreply, int nocrc) { struct tagRPCCall *rpc; - int ret = 0, wlen = sizeof(struct tagRPCCall); - uint16_t crc; + int ret = 0, estlen, len = sizeof(struct tagRPCCall); u_char *buf; - struct pollfd pfd; - if (!cli) { - rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); + if (!pkt || !sess) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; - } else - buf = AIT_GET_BUF(&cli->cli_buf); - if (out_vars) - *out_vars = NULL; + } + /* 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, cli->cli_parent); - rpc->call_argc = htons(io_arraySize(in_vars)); + 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 + rpc->call_argc = htons(array_Size(vars)); /* set reply */ rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; - if (io_arraySize(in_vars)) { + if (array_Size(vars)) { /* marshaling variables */ - ret = io_vars2buffer(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, in_vars); + ret = ait_vars2buffer(buf + len, AIT_LEN(pkt) - len, vars); if (ret == -1) { rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values"); return -1; } else - wlen += ret; + len += ret; } /* total packet length */ - rpc->call_len = htons(wlen); + rpc->call_len = htonl(len); - /* calculate CRC */ - rpc->call_crc ^= rpc->call_crc; - rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); - - pfd.fd = cli->cli_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; + if (!nocrc) { + /* calculate CRC */ + rpc->call_crc ^= rpc->call_crc; + rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2)); } - do { - if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { - if (errno == EAGAIN) - continue; - 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; - } - } while (0); - if (noreply) /* we not want reply */ - return 0; + return len; +} - 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"); - } +/* + * rpc_pkt_Replay() - Decode RPC Replay packet + * + * @pkt = Packet buffer + * @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, int nocrc) +{ + struct tagRPCCall *rpc; + int len; + u_char *buf; + uint16_t crc; + + if (!pkt || !sess) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + return -1; + } else + buf = AIT_GET_BUF(pkt); + + rpc = (struct tagRPCCall*) buf; + 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; } - } 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 %d bytes", ret); - return -1; } - /* 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; - } - /* check RPC packet session info */ - if (rpc_chkPktSession(&rpc->call_session, cli->cli_parent)) { + if (rpc_chkPktSession(&rpc->call_session, sess)) { rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); return -1; - } else - wlen = sizeof(struct tagRPCCall); + } if (ntohs(rpc->call_tag) != tag) { rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply"); return -1; @@ -372,43 +455,93 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short strerror(ntohl(rpc->call_rep.eno))); return -1; } - if (ntohs(rpc->call_argc) * sizeof(ait_val_t) > AIT_LEN(&cli->cli_buf) - wlen) { - rpc_SetErr(EMSGSIZE, "Reply RPC packet is too long ..."); + len = ntohs(rpc->call_argc) * sizeof(ait_val_t); + if (len > AIT_LEN(pkt) - sizeof(struct tagRPCCall)) { + rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ..."); return -1; } + if (len > ntohl(rpc->call_len) - sizeof(struct tagRPCCall)) { + rpc_SetErr(EMSGSIZE, "Reply RPC packet is too short ..."); + return -1; + } /* RPC is OK! Go de-marshaling variables ... */ - if (out_vars && ntohs(rpc->call_argc)) { + if (vars && ntohs(rpc->call_argc)) { #ifdef CLI_RES_ZCOPY - *out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, + *vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, ntohs(rpc->call_argc), 42); #else - *out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, + *vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, ntohs(rpc->call_argc), 0); #endif - if (!*out_vars) { - rpc_SetErr(io_GetErrno(), "%s", io_GetError()); + if (!*vars) { + rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); return -1; } } - ret = ntohl(rpc->call_rep.ret); - return ret; + return ntohl(rpc->call_rep.ret); } /* + * rpc_cli_execCall() - Execute RPC call + * + * @cli = RPC Client session + * @noreply = We not want RPC reply + * @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 + */ +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 (out_vars) + *out_vars = NULL; + + 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) + 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) + return -1; + + if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1) + return -1; + + return 0; +} + +/* * rpc_cli_freeCall() - Free resouce allocated by RPC call * * @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 - io_arrayDestroy(out_vars); + array_Destroy(out_vars); #else - io_freeVars(out_vars); + ait_freeVars(out_vars); #endif } @@ -418,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; @@ -430,7 +563,7 @@ rpc_cli_ping(rpc_cli_t *cli) 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*)); + ret = AIT_GET_U16(array(arr, 0, ait_val_t*)); rpc_cli_freeCall(&arr); return ret;