--- libaitrpc/src/builtin.c	2012/05/18 15:24:33	1.7.2.9
+++ libaitrpc/src/builtin.c	2012/11/19 15:54:47	1.10.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.7.2.9 2012/05/18 15:24:33 misho Exp $
+* $Id: builtin.c,v 1.10.2.2 2012/11/19 15:54:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -63,7 +63,7 @@ rpcServerClients(rpc_cli_t *cli, struct tagRPCCall *rp
 	srv = RPC_SRV_SERVER(cli);
 
 	len = io_arraySize(srv->srv_clients) * STRSIZ;
-	if (!(val = malloc(len))) {
+	if (!(val = io_malloc(len))) {
 		LOGERR;
 		return -1;
 	} else
@@ -85,7 +85,7 @@ rpcServerClients(rpc_cli_t *cli, struct tagRPCCall *rp
 
 	/* return values */
 	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
-	free(val);
+	io_free(val);
 	return 0;
 }
 
@@ -101,17 +101,17 @@ rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc,
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
 
-	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
+	SLIST_FOREACH(f, &srv->srv_funcs, func_next)
 		i++;
 	len = i * STRSIZ;
 
-	if (!(val = malloc(len))) {
+	if (!(val = io_malloc(len))) {
 		LOGERR;
 		return -1;
 	} else
 		memset(val, 0, len);
 
-	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
+	SLIST_FOREACH(f, &srv->srv_funcs, func_next)
 		if (AIT_ADDR(&f->func_name)) {
 			memset(str, 0, sizeof str);
 			snprintf(str, sizeof str, "/%hu/0x%p; ", AIT_KEY(&f->func_name), 
@@ -121,7 +121,7 @@ rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc,
 
 	/* return variables */
 	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
-	free(val);
+	io_free(val);
 	return 0;
 }
 
@@ -148,9 +148,10 @@ rpcServerShutdown(rpc_cli_t *cli, struct tagRPCCall *r
 
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
+	
+	rpc_freeCli(cli);
 
 	srv->srv_kill = 1;
-
 	return 0;
 }
 
@@ -172,8 +173,9 @@ rpcBLOBServerShutdown(rpc_cli_t *cli, struct tagRPCCal
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
 
-	srv->srv_blob.kill = 1;
+	rpc_freeBLOBCli(cli);
 
+	srv->srv_blob.kill = 1;
 	return 0;
 }
 
@@ -203,7 +205,7 @@ rpcBLOBServerVars(rpc_cli_t *cli, struct tagRPCCall *r
 		return 0;
 	}
 
-	if (!(val = malloc(len))) {
+	if (!(val = io_malloc(len))) {
 		LOGERR;
 		return -1;
 	} else
@@ -216,7 +218,7 @@ rpcBLOBServerVars(rpc_cli_t *cli, struct tagRPCCall *r
 	}
 
 	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
-	free(val);
+	io_free(val);
 	return 0;
 }
 
@@ -240,7 +242,7 @@ rpcBLOBServerClients(rpc_cli_t *cli, struct tagRPCCall
 	}
 
 	len = io_arraySize(srv->srv_blob.clients) * STRSIZ;
-	if (!(val = malloc(len))) {
+	if (!(val = io_malloc(len))) {
 		LOGERR;
 		return -1;
 	} else
@@ -261,7 +263,7 @@ rpcBLOBServerClients(rpc_cli_t *cli, struct tagRPCCall
 	}
 
 	AIT_SET_STR(io_getVars(&RPC_RETVARS(cli), 0), val);
-	free(val);
+	io_free(val);
 	return 0;
 }