--- libaitrpc/src/cli.c	2011/08/29 23:26:56	1.4.2.1
+++ libaitrpc/src/cli.c	2011/08/30 11:13:29	1.4.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.4.2.1 2011/08/29 23:26:56 misho Exp $
+* $Id: cli.c,v 1.4.2.2 2011/08/30 11:13:29 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -60,6 +60,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
 	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
 	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	int n;
 
 	if (!rpccli || 
 			(rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6 && 
@@ -100,6 +101,21 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 		free(cli);
 		return NULL;
 	}
+	n = cli->cli_netbuf;
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		free(cli->cli_parent);
+		free(cli);
+		return NULL;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		free(cli->cli_parent);
+		free(cli);
+		return NULL;
+	}
 	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
 		LOGERR;
 		free(cli);
@@ -135,13 +151,14 @@ rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli)
  * rpc_cli_openClient() Connect to RPC Server
  * @ProgID = ProgramID for RPC session request
  * @ProcID = ProcessID for RPC session request
+ * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
  * @family = Family socket type, AF_INET or AF_INET6
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *
-rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short family, const char *csHost, u_short Port)
+rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, u_short family, const char *csHost, u_short Port)
 {
 	rpc_cli_t *cli = NULL;
 	struct hostent *host = NULL;
@@ -149,6 +166,7 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
 	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
 	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
 	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	int n;
 
 	if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n");
@@ -156,6 +174,8 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
 	}
 	if (!Port)
 		Port = RPC_DEFPORT;
+	if (!netBuf)
+		netBuf = BUFSIZ;
 	if (csHost && family != AF_LOCAL) {
 		host = gethostbyname2(csHost, family);
 		if (!host) {
@@ -194,6 +214,8 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
 		return NULL;
 	} else
 		memset(cli, 0, sizeof(rpc_cli_t));
+
+	cli->cli_netbuf = netBuf;
 	cli->cli_parent = malloc(sizeof(rpc_sess_t));
 	if (!cli->cli_parent) {
 		LOGERR;
@@ -225,8 +247,24 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
 		free(cli);
 		return NULL;
 	}
+	n = cli->cli_netbuf;
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		free(cli->cli_parent);
+		free(cli);
+		return NULL;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		free(cli->cli_parent);
+		free(cli);
+		return NULL;
+	}
 	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
 		LOGERR;
+		close(cli->cli_sock);
 		free(cli->cli_parent);
 		free(cli);
 		return NULL;