--- libaitrpc/src/cli.c 2013/11/15 09:18:38 1.19.6.2 +++ libaitrpc/src/cli.c 2014/11/12 21:37:51 1.22.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.19.6.2 2013/11/15 09:18:38 misho Exp $ +* $Id: cli.c,v 1.22.6.1 2014/11/12 21:37:51 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -228,6 +228,52 @@ err: } /* + * rpc_cli_reconnectClient() - Reconnecting client to RPC server + * + * @cli = RPC Client session + * return: -1 error or 0 ok + */ +int +rpc_cli_reconnectClient(rpc_cli_t * __restrict cli) +{ + int netBuf; + + if (!cli) + return -1; + else + netBuf = AIT_LEN(&cli->cli_buf); + + close(cli->cli_sock); + + cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); + if (cli->cli_sock == -1) { + LOGERR; + return -1; + } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, + &netBuf, sizeof netBuf) == -1) { + LOGERR; + close(cli->cli_sock); + return -1; + } + if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, + &netBuf, sizeof netBuf) == -1) { + LOGERR; + close(cli->cli_sock); + return -1; + } + if (cli->cli_id == SOCK_STREAM) + if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { + LOGERR; + close(cli->cli_sock); + return -1; + } + + fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); + return 0; +} + +/* * rpc_cli_closeClient() - Close connection to RPC server and free resources * * @cli = RPC Client session @@ -260,7 +306,7 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) * @sa = Server address * @pkt = RPC packet * @len = Length of packet - * return: -1 error or !=-1 sended bytes + * return: -1 error, 0 EOF or >0 sended bytes */ int rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len) @@ -283,7 +329,7 @@ rpc_pkt_Send(int sock, int type, sockaddr_t * __restri * @type = Type of socket * @sa = Server address * @pkt = RPC packet - * return: -1 error or !=-1 sended bytes + * 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) @@ -295,8 +341,10 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res if (!pkt) { rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; - } else + } else { buf = AIT_GET_BUF(pkt); + rpc = (struct tagRPCCall*) buf; + } /* reply from RPC server */ do { @@ -305,7 +353,7 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res else ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen); if (ret < 1) - return -1; + return ret; /* check for response from known address */ if (!estlen) { @@ -316,13 +364,12 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res } /* calc estimated length */ - rpc = (struct tagRPCCall*) buf; estlen = ntohl(rpc->call_len); if (estlen > AIT_LEN(pkt)) AIT_RE_BUF(pkt, estlen); buf = AIT_GET_BUF(pkt); - blen = estlen; rpc = (struct tagRPCCall*) buf; + blen = estlen; continue; } @@ -407,7 +454,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * rpc_pkt_Replay() - Decode RPC Replay packet * * @pkt = Packet buffer - * @sess = RPC session info + * @sess = RPC session info, if =NULL don't check session * @tag = Function tag * @vars = Function argument array of values, may be NULL * @nocrc = Without CRC calculation @@ -422,7 +469,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t u_char *buf; uint16_t crc; - if (!pkt || !sess) { + if (!pkt) { rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; } else @@ -440,7 +487,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t } /* check RPC packet session info */ - if (rpc_chkPktSession(&rpc->call_session, sess)) { + if (sess && rpc_chkPktSession(&rpc->call_session, sess)) { rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); return -1; } @@ -490,7 +537,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t * @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() - * return: -1 error or != -1 ok result + * return: -1 error, 0 ok result or 1 closed rpc connection */ int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, @@ -513,14 +560,18 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type)) == -1) return -1; - if (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; if (noreply) /* we not want reply */ return 0; - if (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)) == -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) return -1;