--- libaitrpc/src/cli.c 2015/05/18 15:00:54 1.24.2.4 +++ libaitrpc/src/cli.c 2016/08/02 10:26:58 1.26.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.24.2.4 2015/05/18 15:00:54 misho Exp $ +* $Id: cli.c,v 1.26.4.2 2016/08/02 10:26:58 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 - 2015 +Copyright 2004 - 2016 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -111,7 +111,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, e_free(cli); return NULL; } - if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { + if (connect(cli->cli_sock, &cli->cli_sa.sa, sizeof cli->cli_sa.sa) == -1) { LOGERR; close(cli->cli_sock); e_free(cli); @@ -158,6 +158,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) rpc_cli_t * rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto) { + int n = 1; rpc_cli_t *cli = NULL; sockaddr_t sa = E_SOCKADDR_INIT; @@ -218,12 +219,24 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch 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) { + if (cli->cli_id == SOCK_STREAM) { + setsockopt(cli->cli_sock, IPPROTO_TCP, TCP_NODELAY, &n, sizeof n); + if (connect(cli->cli_sock, &cli->cli_sa.sa, sizeof cli->cli_sa.sa) == -1) { LOGERR; goto err; } + } + if (cli->cli_id == SOCK_DGRAM) { + sockaddr_t sa2; + if (!e_gethostbyname(csHost, 0, &sa2)) + goto err; + if (bind(cli->cli_sock, &sa2.sa, sizeof sa2.sa) == -1) { + LOGERR; + goto err; + } + } + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; err: @@ -251,6 +264,18 @@ rpc_cli_reconnectClient(rpc_cli_t * __restrict cli) else netBuf = AIT_LEN(&cli->cli_buf); + if (cli->cli_id == SOCK_STREAM) + shutdown(cli->cli_sock, SHUT_RDWR); + if (cli->cli_id == SOCK_DGRAM && cli->cli_sa.sa.sa_family == AF_LOCAL) { + sockaddr_t sa2 = E_SOCKADDR_INIT; + socklen_t salen = sizeof sa2; + +#ifndef __linux__ + sa2.sa.sa_len = salen; +#endif + if (!getsockname(cli->cli_sock, &sa2.sa, &salen)) + unlink(sa2.sun.sun_path); + } close(cli->cli_sock); srandom(time(NULL) ^ getpid()); @@ -273,7 +298,7 @@ rpc_cli_reconnectClient(rpc_cli_t * __restrict cli) return -1; } if (cli->cli_id == SOCK_STREAM) - if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { + if (connect(cli->cli_sock, &cli->cli_sa.sa, sizeof cli->cli_sa.sa) == -1) { LOGERR; close(cli->cli_sock); return -1; @@ -297,6 +322,16 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) if ((*cli)->cli_id == SOCK_STREAM) shutdown((*cli)->cli_sock, SHUT_RDWR); + if ((*cli)->cli_id == SOCK_DGRAM && (*cli)->cli_sa.sa.sa_family == AF_LOCAL) { + sockaddr_t sa2 = E_SOCKADDR_INIT; + socklen_t salen = sizeof sa2; + +#ifndef __linux__ + sa2.sa.sa_len = salen; +#endif + if (!getsockname((*cli)->cli_sock, &sa2.sa, &salen)) + unlink(sa2.sun.sun_path); + } close((*cli)->cli_sock); AIT_FREE_VAL(&(*cli)->cli_buf); @@ -359,6 +394,8 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res if (ret > 0) { rpc = (struct tagRPCCall*) AIT_GET_BUF(pkt); + if (ret < ntohl(rpc->call_len)) + continue; /* check for loop request */ if (!(rpc->call_io & RPC_ACK)) @@ -399,8 +436,10 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t /* calc estimated length */ estlen = ait_resideVars(vars) + len; - if (estlen > AIT_LEN(pkt)) - AIT_RE_BUF(pkt, estlen); + if (estlen > AIT_LEN(pkt)) { + rpc_SetErr(EMSGSIZE, "Message too long"); + return -1; + } buf = AIT_GET_BUF(pkt); /* prepare RPC call */ @@ -535,7 +574,6 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short array_t * __restrict in_vars, array_t ** __restrict out_vars) { int type = 0, wlen; - u_char *buf; u_int seq = 0; if (!cli) { @@ -546,15 +584,16 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short type = cli->cli_id; else seq = random(); /* sign package */ - 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, seq)) == -1) + if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, + in_vars, noreply, type, seq)) == -1) return -1; - if ((wlen = 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; @@ -562,12 +601,14 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short if (noreply) /* we not want reply */ return 0; - if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, seq)) == -1) + if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, + &cli->cli_buf, seq)) == -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) + if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, + out_vars, type)) == -1) return -1; return 0; @@ -626,6 +667,7 @@ rpc_cli_ping(rpc_cli_t *cli) rpc_cli_t * rpc_cli_openClient2(u_char InstID, int netBuf, const char *csIface, const char *csHost) { +#ifndef __linux__ rpc_cli_t *cli = NULL; sockaddr_t sa = E_SOCKADDR_INIT, sal = E_SOCKADDR_INIT; char szIface[64], szStr[STRSIZ]; @@ -720,6 +762,9 @@ err: close(cli->cli_sock); e_free(cli->cli_parent); e_free(cli); +#else + rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); +#endif return NULL; }