--- libaitrpc/src/cli.c 2016/08/02 10:26:58 1.26.4.2 +++ 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.26.4.2 2016/08/02 10:26:58 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 - 2016 +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, sizeof cli->cli_sa.sa) == -1) { + if (connect(cli->cli_sock, &cli->cli_sa.sa, e_addrlen(&cli->cli_sa)) == -1) { LOGERR; close(cli->cli_sock); e_free(cli); @@ -161,6 +161,7 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch int n = 1; rpc_cli_t *cli = NULL; sockaddr_t sa = E_SOCKADDR_INIT; + socklen_t salen; if (proto < 0 || proto > SOCK_RAW) { rpc_SetErr(EINVAL, "Invalid parameters can`t open RPC client"); @@ -171,7 +172,7 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch if (!Port && proto < SOCK_RAW) Port = RPC_DEFPORT; - if (!e_gethostbyname(csHost, Port, &sa)) + if (!(salen = e_gethostbyname(csHost, Port, &sa))) return NULL; if (!proto) proto = SOCK_STREAM; @@ -221,7 +222,7 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch } 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) { + if (connect(cli->cli_sock, &cli->cli_sa.sa, salen) == -1) { LOGERR; goto err; } @@ -229,9 +230,9 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch if (cli->cli_id == SOCK_DGRAM) { sockaddr_t sa2; - if (!e_gethostbyname(csHost, 0, &sa2)) + if (!(salen = e_gethostbyname(csHost, 0, &sa2))) goto err; - if (bind(cli->cli_sock, &sa2.sa, sizeof sa2.sa) == -1) { + if (bind(cli->cli_sock, &sa2.sa, salen) == -1) { LOGERR; goto err; } @@ -298,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, sizeof cli->cli_sa.sa) == -1) { + if (connect(cli->cli_sock, &cli->cli_sa.sa, e_addrlen(&cli->cli_sa)) == -1) { LOGERR; close(cli->cli_sock); return -1; @@ -404,7 +405,7 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res if (seq != ntohl(rpc->call_seq)) continue; } - } while (ret < 1); + } while (ret < 0); return ret; } @@ -416,7 +417,7 @@ 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 @@ -452,7 +453,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t 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 */ @@ -466,7 +467,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t /* total packet length */ rpc->call_len = htonl(len); - rpc->call_io = RPC_REQ; + rpc->call_io = (noreply == -1) ? RPC_IPC : RPC_REQ; /* sign packet */ rpc->call_seq = htonl(seq); @@ -563,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() @@ -595,23 +596,25 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 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, 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) return -1; - return 0; + return wlen; } /*