--- libaitrpc/src/cli.c	2012/05/19 00:29:51	1.10
+++ libaitrpc/src/cli.c	2012/07/22 20:44:13	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.10 2012/05/19 00:29:51 misho Exp $
+* $Id: cli.c,v 1.11 2012/07/22 20:44:13 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -63,7 +63,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 		return NULL;
 	}
 
-	cli = malloc(sizeof(rpc_cli_t));
+	cli = io_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
@@ -94,13 +94,13 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
-		free(cli);
+		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);
-		free(cli);
+		io_free(cli);
 		return NULL;
 	} else
 		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
@@ -125,7 +125,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
 
 	AIT_FREE_VAL(&(*cli)->cli_buf);
 
-	free(*cli);
+	io_free(*cli);
 	*cli = NULL;
 }
 
@@ -145,7 +145,7 @@ rpc_cli_t *
 rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port)
 {
 	rpc_cli_t *cli = NULL;
-	io_sockaddr_t sa;
+	io_sockaddr_t sa = IO_SOCKADDR_INIT;
 
 	if (!io_gethostbyname(csHost, Port, &sa))
 		return NULL;
@@ -164,7 +164,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 	srandom((time(&tim) ^ getpid()));
 #endif
 
-	cli = malloc(sizeof(rpc_cli_t));
+	cli = io_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
@@ -172,10 +172,10 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		memset(cli, 0, sizeof(rpc_cli_t));
 
 	/* build session */
-	cli->cli_parent = malloc(sizeof(rpc_sess_t));
+	cli->cli_parent = io_malloc(sizeof(rpc_sess_t));
 	if (!cli->cli_parent) {
 		LOGERR;
-		free(cli);
+		io_free(cli);
 		return NULL;
 	} else {
 		((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
@@ -191,16 +191,16 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 	if (cli->cli_sock == -1) {
 		LOGERR;
 		AIT_FREE_VAL(&cli->cli_buf);
-		free(cli->cli_parent);
-		free(cli);
+		io_free(cli->cli_parent);
+		io_free(cli);
 		return NULL;
 	}
 	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);
-		free(cli->cli_parent);
-		free(cli);
+		io_free(cli->cli_parent);
+		io_free(cli);
 		return NULL;
 	} else
 		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
@@ -226,9 +226,9 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
 	AIT_FREE_VAL(&(*cli)->cli_buf);
 
 	if ((*cli)->cli_parent)
-		free((*cli)->cli_parent);
+		io_free((*cli)->cli_parent);
 
-	free(*cli);
+	io_free(*cli);
 	*cli = NULL;
 }