--- libaitrpc/src/cli.c	2013/12/15 16:27:09	1.20.4.2
+++ libaitrpc/src/cli.c	2013/12/15 22:02:24	1.20.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.20.4.2 2013/12/15 16:27:09 misho Exp $
+* $Id: cli.c,v 1.20.4.3 2013/12/15 22:02:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -236,15 +236,40 @@ err:
 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;
 }