--- libaitrpc/src/cli.c 2012/11/13 09:22:10 1.12 +++ libaitrpc/src/cli.c 2012/11/19 21:50:26 1.13 @@ -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.13 2012/11/19 21:50:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -57,6 +57,7 @@ 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"); @@ -89,6 +90,7 @@ 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); @@ -97,6 +99,18 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, io_free(cli); return NULL; } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { + LOGERR; + close(cli->cli_sock); + io_free(cli); + return NULL; + } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { + LOGERR; + close(cli->cli_sock); + 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); @@ -139,10 +153,12 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) * @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_int ProgID, u_char ProcID, int netBuf, const char *csHost, + u_short Port, int proto) { rpc_cli_t *cli = NULL; io_sockaddr_t sa = IO_SOCKADDR_INIT; @@ -151,6 +167,8 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne return NULL; if (!Port) Port = RPC_DEFPORT; + if (!proto) + proto = SOCK_STREAM; if (netBuf < RPC_MIN_BUFSIZ) netBuf = BUFSIZ; else @@ -183,29 +201,41 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne ((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID; } + cli->cli_id = proto; memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); AIT_SET_BUF2(&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); + io_free(cli->cli_parent); + io_free(cli); + return NULL; } /* @@ -220,7 +250,8 @@ 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); @@ -252,6 +283,8 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short uint16_t crc; u_char *buf; struct pollfd pfd; + io_sockaddr_t sa; + socklen_t salen; if (!cli) { rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); @@ -261,6 +294,8 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short if (out_vars) *out_vars = NULL; + memset(&sa, 0, sizeof sa); + /* prepare RPC call */ rpc = (struct tagRPCCall*) buf; rpc_addPktSession(&rpc->call_session, cli->cli_parent); @@ -299,7 +334,12 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short return -1; } do { - if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { + if (cli->cli_id == SOCK_STREAM) + ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL); + else + ret = sendto(cli->cli_sock, buf, wlen, MSG_NOSIGNAL, + &cli->cli_sa.sa, cli->cli_sa.sa.sa_len); + if (ret == -1) { if (errno == EAGAIN) continue; LOGERR; @@ -320,20 +360,25 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short do { if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (ret) + if (ret) { LOGERR; - else { + } 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 (cli->cli_id == SOCK_STREAM) + ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0); + else + ret = recvfrom(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0, + &sa.sa, &salen); + if (ret < 1) { if (ret) { if (errno == EAGAIN) continue; @@ -341,6 +386,14 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short LOGERR; } return -1; + } + + if (cli->cli_id == SOCK_DGRAM) { + /* check for response from known address */ + if (io_addrcmp(&cli->cli_sa, &sa, 42)) { + rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); + continue; + } } } while (0); if (ret < sizeof(struct tagRPCCall)) {