--- libaitrpc/src/cli.c 2015/01/15 01:42:37 1.23 +++ libaitrpc/src/cli.c 2024/03/20 17:32:31 1.29 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.23 2015/01/15 01:42:37 misho Exp $ +* $Id: cli.c,v 1.29 2024/03/20 17:32:31 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 - 2014 +Copyright 2004 - 2024 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -71,7 +71,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, } else memcpy(cli, rpccli, sizeof(rpc_cli_t)); - memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(sockaddr_t)); + memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof cli->cli_sa); switch (cli->cli_sa.sa.sa_family) { case AF_INET: cli->cli_sa.sin.sin_port = @@ -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, e_addrlen(&cli->cli_sa)) == -1) { LOGERR; close(cli->cli_sock); e_free(cli); @@ -158,13 +158,22 @@ 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; + socklen_t salen; - 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 (!(salen = e_gethostbyname(csHost, Port, &sa))) + return NULL; if (!proto) proto = SOCK_STREAM; if (netBuf < RPC_MIN_BUFSIZ) @@ -195,7 +204,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 +220,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, salen) == -1) { LOGERR; goto err; } + } + if (cli->cli_id == SOCK_DGRAM) { + sockaddr_t sa2; + if (!(salen = e_gethostbyname(csHost, 0, &sa2))) + goto err; + if (bind(cli->cli_sock, &sa2.sa, salen) == -1) { + LOGERR; + goto err; + } + } + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; err: @@ -243,8 +265,22 @@ 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()); + cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); if (cli->cli_sock == -1) { LOGERR; @@ -263,7 +299,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, e_addrlen(&cli->cli_sa)) == -1) { LOGERR; close(cli->cli_sock); return -1; @@ -287,6 +323,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); @@ -311,15 +357,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,64 +372,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_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); - /* check for response from known address */ - if (!estlen) { - /* 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; - /* calc estimated length */ - estlen = ntohl(rpc->call_len); - if (estlen > AIT_LEN(pkt)) - AIT_RE_BUF(pkt, estlen); - buf = AIT_GET_BUF(pkt); - rpc = (struct tagRPCCall*) buf; - blen = estlen; - 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 < 0); - /* compiler optimize loop if while(0) and stop working 'continue' on some platforms */ - break; - } while (42); - - if (ret < sizeof(struct tagRPCCall) || estlen != ret) { - rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", - estlen, ret); - return -1; - } - return ret; } @@ -397,13 +417,14 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res * @sess = RPC session info * @tag = Function tag for execution * @vars = Function argument array of values, may be NULL - * @noreply = We not want RPC reply + * @noreply = >0 We not want RPC reply, -1 IPC request with 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); @@ -416,8 +437,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 */ @@ -427,10 +450,10 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t if (!vars) rpc->call_argc = 0; else - rpc->call_argc = htons(array_Size(vars)); + rpc->call_argc = (u_char) array_Size(vars); /* set reply */ - rpc->call_req.flags = (uint64_t) htonl(noreply ? RPC_NOREPLY : RPC_REPLY); + rpc->call_req.flags = (uint64_t) htonl((noreply > 0) ? RPC_NOREPLY : RPC_REPLY); if (array_Size(vars)) { /* marshaling variables */ @@ -444,7 +467,11 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t /* total packet length */ rpc->call_len = htonl(len); + rpc->call_io = (noreply == -1) ? RPC_IPC : RPC_REQ; + /* sign packet */ + rpc->call_seq = htonl(seq); + if (!nocrc) { /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -459,7 +486,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 @@ -495,7 +522,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; } @@ -505,7 +532,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t strerror(ntohl(rpc->call_rep.eno))); return -1; } - len = ntohs(rpc->call_argc) * sizeof(ait_val_t); + len = 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; @@ -516,13 +543,13 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t } /* RPC is OK! Go de-marshaling variables ... */ - if (vars && ntohs(rpc->call_argc)) { + if (vars && rpc->call_argc) { #ifdef CLI_RES_ZCOPY *vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, - ntohs(rpc->call_argc), 42); + rpc->call_argc, 42); #else *vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, - ntohs(rpc->call_argc), 0); + rpc->call_argc, 0); #endif if (!*vars) { rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); @@ -537,7 +564,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t * rpc_cli_execCall() - Execute RPC call * * @cli = RPC Client session - * @noreply = We not want RPC reply + * @noreply = >0 We not want RPC reply, -1 IPC request with 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() @@ -548,39 +575,46 @@ 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) { rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); return -1; } else { - if (cli->cli_id == SOCK_STREAM) + if (cli->cli_id == SOCK_STREAM || cli->cli_id == SOCK_EXT) type = cli->cli_id; - buf = AIT_GET_BUF(&cli->cli_buf); + else + seq = random(); /* sign package */ } 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 */ + if (!wlen) /* closed rpc connection */ return 1; - if (noreply) /* we not want reply */ + if (noreply > 0) /* 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) { /* closed rpc connection */ + rpc_SetErr(ECONNRESET, "Closed 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; + return wlen; } /* @@ -636,6 +670,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]; @@ -730,6 +765,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; } @@ -746,6 +784,71 @@ rpc_cli_closeClient2(rpc_cli_t ** __restrict cli) return; close((*cli)->cli_sock); + + AIT_FREE_VAL(&(*cli)->cli_buf); + + if ((*cli)->cli_parent) + e_free((*cli)->cli_parent); + + e_free(*cli); + *cli = NULL; +} + +/* + * rpc_cli_openClientExt() - Connect to pipe RPC Server + * + * @InstID = InstID for RPC session request + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) + * @fd = File descriptor + * return: NULL == error or !=NULL connection to RPC server established + */ +rpc_cli_t * +rpc_cli_openClientExt(u_char InstID, int netBuf, int fd) +{ + rpc_cli_t *cli = NULL; + int n; + + cli = e_malloc(sizeof(rpc_cli_t)); + if (!cli) { + LOGERR; + return NULL; + } else + memset(cli, 0, sizeof(rpc_cli_t)); + + /* build session */ + cli->cli_parent = e_malloc(sizeof(rpc_sess_t)); + if (!cli->cli_parent) { + LOGERR; + e_free(cli); + return NULL; + } else { + ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; + ((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; + } + + cli->cli_id = SOCK_EXT; + cli->cli_sock = fd; + + n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2); + AIT_SET_BUFSIZ(&cli->cli_buf, 0, n); + + fcntl(cli->cli_sock, F_SETFL, + fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); + + return cli; +} + +/* + * rpc_cli_closeClientExt() - Close pipe connection to RPC server and free resources + * + * @cli = RPC Client session + * return: none + */ +void +rpc_cli_closeClientExt(rpc_cli_t ** __restrict cli) +{ + if (!cli || !*cli || (*cli)->cli_id != SOCK_EXT) + return; AIT_FREE_VAL(&(*cli)->cli_buf);