--- libaitrpc/src/cli.c	2015/05/18 15:09:59	1.25
+++ libaitrpc/src/cli.c	2015/06/28 22:11:30	1.25.2.3
@@ -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.25.2.3 2015/06/28 22:11:30 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -223,7 +223,17 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 			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 +261,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 +317,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 +387,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))