--- libaitrpc/src/cli.c	2015/05/18 15:09:59	1.25
+++ libaitrpc/src/cli.c	2015/07/02 22:28:15	1.26
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.25 2015/05/18 15:09:59 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,6 +158,7 @@ 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;
 
@@ -218,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:
@@ -251,6 +264,16 @@ 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());
@@ -297,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);
@@ -359,6 +390,8 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 
 		if (ret > 0) {
 			rpc = (struct tagRPCCall*) AIT_GET_BUF(pkt);
+			if (ret < ntohl(rpc->call_len))
+				continue;
 
 			/* check for loop request */
 			if (!(rpc->call_io & RPC_ACK))
@@ -399,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 */
@@ -551,10 +586,12 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	if (out_vars)
 		*out_vars = NULL;
 
-	if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type, seq)) == -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;
@@ -562,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, seq)) == -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;