--- libaitrpc/src/cli.c	2013/11/14 22:53:12	1.19.6.1
+++ libaitrpc/src/cli.c	2013/12/15 16:27:09	1.20.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.19.6.1 2013/11/14 22:53:12 misho Exp $
+* $Id: cli.c,v 1.20.4.2 2013/12/15 16:27:09 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -228,6 +228,27 @@ 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)
+{
+	if (!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) {
+			LOGERR;
+			return -1;
+		}
+
+	return 0;
+}
+
+/*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *
  * @cli = RPC Client session
@@ -260,7 +281,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 +304,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 +316,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 {
@@ -304,10 +327,8 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 			ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen);
 		else
 			ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen);
-		if (ret < 1) {
-			LOGERR;
-			return -1;
-		}
+		if (ret < 1)
+			return ret;
 
 		/* check for response from known address */
 		if (!estlen) {
@@ -318,13 +339,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;
 		}
 
@@ -332,8 +352,9 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 		break;
 	} while (42);
 
-	if (ret < sizeof(struct tagRPCCall)) {
-		rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
+	if (ret < sizeof(struct tagRPCCall) || estlen != ret) {
+		rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", 
+				estlen, ret);
 		return -1;
 	}
 
@@ -491,7 +512,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, 
@@ -514,14 +535,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;