--- libaitrpc/src/cli.c 2015/01/21 21:17:05 1.24 +++ libaitrpc/src/cli.c 2015/07/02 22:28:15 1.26 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.24 2015/01/21 21:17:05 misho Exp $ +* $Id: cli.c,v 1.26 2015/07/02 22:28:15 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -158,13 +158,21 @@ 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; - if (!e_gethostbyname(csHost, Port, &sa)) + if (proto < 0 || proto > SOCK_RAW) { + rpc_SetErr(EINVAL, "Invalid parameters can`t open RPC client"); return NULL; - if (!Port) + } + + srandom(time(NULL) ^ getpid()); + + if (!Port && proto < SOCK_RAW) Port = RPC_DEFPORT; + if (!e_gethostbyname(csHost, Port, &sa)) + return NULL; if (!proto) proto = SOCK_STREAM; if (netBuf < RPC_MIN_BUFSIZ) @@ -195,7 +203,8 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch AIT_SET_BUFSIZ(&cli->cli_buf, 0, netBuf); /* connect to RPC server */ - cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); + cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, + cli->cli_id == SOCK_RAW ? IPPROTO_ERPC : 0); if (cli->cli_sock == -1) { LOGERR; goto err; @@ -210,12 +219,24 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch LOGERR; goto err; } - if (cli->cli_id == SOCK_STREAM) + 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, cli->cli_sa.sa.sa_len) == -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, sa2.sa.sa_len) == -1) { + LOGERR; + goto err; + } + } + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; err: @@ -243,8 +264,20 @@ 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; + + sa2.sa.sa_len = salen = sizeof sa2; + if (!getsockname(cli->cli_sock, &sa2.sa, &salen)) + unlink(sa2.sun.sun_path); + } close(cli->cli_sock); + srandom(time(NULL) ^ getpid()); + cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); if (cli->cli_sock == -1) { LOGERR; @@ -287,6 +320,14 @@ 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; + + sa2.sa.sa_len = salen = sizeof sa2; + if (!getsockname((*cli)->cli_sock, &sa2.sa, &salen)) + unlink(sa2.sun.sun_path); + } close((*cli)->cli_sock); AIT_FREE_VAL(&(*cli)->cli_buf); @@ -311,15 +352,12 @@ 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) { - 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); + return rpc_Write(sock, type, MSG_NOSIGNAL, sa, pkt, len); } /* @@ -329,78 +367,41 @@ rpc_pkt_Send(int sock, int type, sockaddr_t * __restri * @type = Type of socket * @sa = Server address * @pkt = RPC packet + * @seq = Signed packet with seq.no * return: -1 error, 0 EOF or >0 received bytes */ int -rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt) +rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int seq) { - int ret, estlen = 0, blen = sizeof(struct tagRPCCall); - u_char *buf; + int ret; struct tagRPCCall *rpc; if (!pkt) { rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; - } else { - buf = AIT_GET_BUF(pkt); - rpc = (struct tagRPCCall*) buf; } /* reply from RPC server */ do { - if (type == SOCK_STREAM) - ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen); - else if (type == SOCK_EXT) { - ret = rpc_Read(sock, type, 0, NULL, buf, blen); - if (estlen) /* hack for skip sanity checks */ - ret += sizeof(struct tagRPCCall); - } else if (type == SOCK_BPF) { - ret = rpc_Read(sock, type, 0, sa, AIT_GET_BUF(pkt), AIT_LEN(pkt)); - if (ret > 0) - estlen = ret; - } else - ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen); - if (ret < 1) - return ret; + if (type == SOCK_STREAM || type == SOCK_EXT) + ret = rpc_Read(sock, type, 0, NULL, pkt); + else + ret = rpc_Read(sock, type, 0, sa, pkt); - /* 1st read for RPC header */ - if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); - return -1; - } + if (ret > 0) { + rpc = (struct tagRPCCall*) AIT_GET_BUF(pkt); + if (ret < ntohl(rpc->call_len)) + continue; - /* check for loop request */ - if (!estlen && !(rpc->call_io & RPC_ACK)) - continue; - - /* check for response from known address */ - if (!estlen) { - /* calc estimated length */ - estlen = ntohl(rpc->call_len); - if (estlen > AIT_LEN(pkt)) - AIT_RE_BUF(pkt, estlen); - blen = estlen; - buf = AIT_GET_BUF(pkt); - - if (type == SOCK_EXT) { - blen -= sizeof(struct tagRPCCall); - buf += sizeof(struct tagRPCCall); - } - - rpc = (struct tagRPCCall*) buf; - continue; + /* check for loop request */ + if (!(rpc->call_io & RPC_ACK)) + continue; + /* check for signed request */ + if (seq != ntohl(rpc->call_seq)) + continue; } + } while (ret < 1); - /* compiler optimize loop if while(0) and stop working 'continue' on some platforms */ - break; - } while (42); - - if (estlen != ret) { - rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", - estlen, ret); - return -1; - } - return ret; } @@ -413,11 +414,12 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res * @vars = Function argument array of values, may be NULL * @noreply = We not want RPC reply * @nocrc = Without CRC calculation + * @seq = Sign packet with seq.no * 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, int nocrc) + array_t * __restrict vars, int noreply, int nocrc, int seq) { struct tagRPCCall *rpc; int ret = 0, estlen, len = sizeof(struct tagRPCCall); @@ -430,8 +432,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 */ @@ -460,6 +464,9 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t rpc->call_len = htonl(len); rpc->call_io = RPC_REQ; + /* sign packet */ + rpc->call_seq = htonl(seq); + if (!nocrc) { /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -474,7 +481,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * * @pkt = Packet buffer * @sess = RPC session info, if =NULL don't check session - * @tag = Function tag + * @tag = Function tag, if =CALL_TAG_MAX don't check tag * @vars = Function argument array of values, may be NULL * @nocrc = Without CRC calculation * return: -1 error or != -1 return value from function @@ -510,7 +517,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); return -1; } - if (ntohs(rpc->call_tag) != tag) { + if (tag != CALL_TAG_MAX && ntohs(rpc->call_tag) != tag) { rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply"); return -1; } @@ -564,6 +571,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short { int type = 0, wlen; u_char *buf; + u_int seq = 0; if (!cli) { rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); @@ -571,15 +579,19 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short } else { if (cli->cli_id == SOCK_STREAM || cli->cli_id == SOCK_EXT) 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)) == -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; @@ -587,12 +599,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)) == -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;