--- libaitrpc/src/cli.c	2012/11/19 12:43:21	1.12.2.1
+++ libaitrpc/src/cli.c	2012/11/19 21:28:55	1.12.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.12.2.1 2012/11/19 12:43:21 misho Exp $
+* $Id: cli.c,v 1.12.2.3 2012/11/19 21:28:55 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -57,6 +57,7 @@ rpc_cli_t *
 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port)
 {
 	rpc_cli_t *cli = NULL;
+	int n;
 
 	if (!rpccli) {
 		rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server");
@@ -89,6 +90,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 	}
 
 	AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf);
+	n = AIT_LEN(&cli->cli_buf);
 
 	/* connect to BLOB server */
 	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
@@ -97,6 +99,18 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 		io_free(cli);
 		return NULL;
 	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		io_free(cli);
+		return NULL;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		io_free(cli);
+		return NULL;
+	}
 	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
@@ -195,23 +209,33 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
-		AIT_FREE_VAL(&cli->cli_buf);
-		io_free(cli->cli_parent);
-		io_free(cli);
-		return NULL;
+		goto err;
 	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, 
+				&netBuf, sizeof netBuf) == -1) {
+		LOGERR;
+		goto err;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, 
+				&netBuf, sizeof netBuf) == -1) {
+		LOGERR;
+		goto err;
+	}
 	if (cli->cli_id == SOCK_STREAM)
 		if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 			LOGERR;
-			AIT_FREE_VAL(&cli->cli_buf);
-			close(cli->cli_sock);
-			io_free(cli->cli_parent);
-			io_free(cli);
-			return NULL;
+			goto err;
 		}
 
 	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
 	return cli;
+err:
+	AIT_FREE_VAL(&cli->cli_buf);
+	if (cli->cli_sock > 2)
+		close(cli->cli_sock);
+	io_free(cli->cli_parent);
+	io_free(cli);
+	return NULL;
 }
 
 /*
@@ -270,6 +294,8 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	if (out_vars)
 		*out_vars = NULL;
 
+	memset(&sa, 0, sizeof sa);
+
 	/* prepare RPC call */
 	rpc = (struct tagRPCCall*) buf;
 	rpc_addPktSession(&rpc->call_session, cli->cli_parent);
@@ -334,18 +360,18 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	do {
 		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-			if (ret)
+			if (ret) {
 				LOGERR;
-			else {
+			} else {
 				if (wlen++ < 7)
 					continue;
 				else
 					rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server");
 			}
+
 			return -1;
 		}
-	} while (0);
-	do {
+
 		memset(buf, 0, AIT_LEN(&cli->cli_buf));
 		if (cli->cli_id == SOCK_STREAM)
 			ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0);
@@ -361,10 +387,13 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 			}
 			return -1;
 		}
-		/* check for response from known address */
-		if (io_addrcmp(&cli->cli_sa, &sa, 42)) {
-			rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address");
-			continue;
+
+		if (cli->cli_id == SOCK_DGRAM) {
+			/* check for response from known address */
+			if (io_addrcmp(&cli->cli_sa, &sa, 42)) {
+				rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address");
+				continue;
+			}
 		}
 	} while (0);
 	if (ret < sizeof(struct tagRPCCall)) {