--- libaitrpc/src/srv.c	2012/05/17 16:47:35	1.9.2.28
+++ libaitrpc/src/srv.c	2012/07/22 19:28:44	1.10.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.28 2012/05/17 16:47:35 misho Exp $
+* $Id: srv.c,v 1.10.2.3 2012/07/22 19:28:44 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -64,7 +64,7 @@ closeClient(sched_task_t *task)
 
 	io_arrayDel(s->srv_clients, c->cli_id, 0);
 	if (c)
-		free(c);
+		io_free(c);
 	return NULL;
 }
 
@@ -89,11 +89,11 @@ txPacket(sched_task_t *task)
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 		} else {
-			rpc->call_argc = htons(io_arraySize(f->func_vars));
+			rpc->call_argc = htons(io_arraySize(RPC_RETVARS(c)));
 			/* Go Encapsulate variables */
-			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, f->func_vars);
+			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, RPC_RETVARS(c));
 			/* Free return values */
-			io_clrVars(f->func_vars);
+			io_freeVars(&c->cli_vars);
 			if (ret == -1) {
 				rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
 				rpc->call_argc ^= rpc->call_argc;
@@ -153,8 +153,8 @@ execCall(sched_task_t *task)
 		rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 	} else {
 		/* if client doesn't want reply */
-		argc = rpc->call_req.flags & RPC_NOREPLY;
-		rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(f, rpc, arr));
+		argc = RPC_CHK_NOREPLY(rpc);
+		rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(c, rpc, f->func_name, arr));
 		if (rpc->call_rep.ret == htonl(-1)) {
 			rpc->call_rep.eno = RPC_ERROR(errno);
 			rpc->call_argc ^= rpc->call_argc;
@@ -162,11 +162,11 @@ execCall(sched_task_t *task)
 			rpc->call_rep.eno ^= rpc->call_rep.eno;
 			if (argc) {
 				/* without reply */
-				io_clrVars(f->func_vars);
+				io_freeVars(&c->cli_vars);
 				rpc->call_argc ^= rpc->call_argc;
 			} else {
 				/* reply */
-				rpc->call_argc = htons(io_arraySize(f->func_vars));
+				rpc->call_argc = htons(io_arraySize(RPC_RETVARS(c)));
 			}
 		}
 	}
@@ -229,7 +229,7 @@ rxPacket(sched_task_t *task)
 			continue;
 		}
 
-		noreply = rpc->call_req.flags & RPC_NOREPLY;
+		noreply = RPC_CHK_NOREPLY(rpc);
 
 		/* check RPC packet session info */
 		if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
@@ -267,7 +267,7 @@ acceptClients(sched_task_t *task)
 			(c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++);
 	if (c)	/* no more free slots! */
 		goto end;
-	c = malloc(sizeof(rpc_cli_t));
+	c = io_malloc(sizeof(rpc_cli_t));
 	if (!c) {
 		LOGERR;
 		srv->srv_kill = 1;
@@ -318,7 +318,7 @@ closeBLOBClient(sched_task_t *task)
 
 	io_arrayDel(s->srv_blob.clients, c->cli_id, 0);
 	if (c)
-		free(c);
+		io_free(c);
 	return NULL;
 }
 
@@ -421,7 +421,7 @@ rxBLOB(sched_task_t *task)
 			}
 			break;
 		case unset:
-			if (rpc_srv_unregisterBLOB(s, blob.hdr_var) == -1) {
+			if (rpc_srv_unregisterBLOB(s, ntohl(blob.hdr_var)) == -1) {
 				blob.hdr_cmd = error;
 				blob.hdr_ret = RPC_ERROR(-1);
 			}
@@ -452,7 +452,7 @@ acceptBLOBClients(sched_task_t *task)
 			(c = io_array(srv->srv_blob.clients, i, rpc_cli_t*)); i++);
 	if (c)	/* no more free slots! */
 		goto end;
-	c = malloc(sizeof(rpc_cli_t));
+	c = io_malloc(sizeof(rpc_cli_t));
 	if (!c) {
 		LOGERR;
 		srv->srv_kill = srv->srv_blob.kill = 1;
@@ -663,7 +663,7 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
 
 		rpc_srv_blobFree(srv, b);
-		free(b);
+		io_free(b);
 	}
 
 	schedEnd(&srv->srv_blob.root);
@@ -689,7 +689,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, 
 {
 	int n = 1;
 	rpc_srv_t *srv = NULL;
-	io_sockaddr_t sa;
+	io_sockaddr_t sa = IO_SOCKADDR_INIT;
 
 	if (!concurentClients || !regProgID) {
 		rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
@@ -712,7 +712,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, 
 	srandom((time(&tim) ^ getpid()));
 #endif
 
-	srv = malloc(sizeof(rpc_srv_t));
+	srv = io_malloc(sizeof(rpc_srv_t));
 	if (!srv) {
 		LOGERR;
 		return NULL;
@@ -734,7 +734,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, 
 	srv->srv_root = schedBegin();
 	if (!srv->srv_root) {
 		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
-		free(srv);
+		io_free(srv);
 		return NULL;
 	}
 
@@ -743,7 +743,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, 
 	if (!srv->srv_clients) {
 		rpc_SetErr(io_GetErrno(), "%s", io_GetError());
 		schedEnd(&srv->srv_root);
-		free(srv);
+		io_free(srv);
 		return NULL;
 	}
 
@@ -753,7 +753,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, 
 		LOGERR;
 		io_arrayDestroy(&srv->srv_clients);
 		schedEnd(&srv->srv_root);
-		free(srv);
+		io_free(srv);
 		return NULL;
 	}
 	if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
@@ -782,7 +782,7 @@ err:	/* error condition */
 	close(srv->srv_server.cli_sock);
 	io_arrayDestroy(&srv->srv_clients);
 	schedEnd(&srv->srv_root);
-	free(srv);
+	io_free(srv);
 	return NULL;
 }
 
@@ -805,7 +805,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	(*psrv)->srv_kill = 1;
 	sleep(RPC_SCHED_POLLING);
 
-	free(*psrv);
+	io_free(*psrv);
 	*psrv = NULL;
 }
 
@@ -853,6 +853,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 			close(c->cli_sock);
 
 			schedCancelby(srv->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
+			io_freeVars(&RPC_RETVARS(c));
 			AIT_FREE_VAL(&c->cli_buf);
 		}
 		io_arrayDel(srv->srv_clients, i, 42);
@@ -865,9 +866,8 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 	TAILQ_FOREACH_SAFE(f, &srv->srv_funcs, func_node, tmp) {
 		TAILQ_REMOVE(&srv->srv_funcs, f, func_node);
 
-		io_freeVars(&f->func_vars);
 		AIT_FREE_VAL(&f->func_name);
-		free(f);
+		io_free(f);
 	}
 
 	schedEnd(&srv->srv_root);
@@ -878,22 +878,23 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
  *
- * @call = Register RPC call
+ * @cli = RPC client
  * @rpc = IN RPC call structure
+ * @funcname = Execute RPC function
  * @args = IN RPC calling arguments from RPC client
  * return: -1 error, !=-1 ok
  */
 int
-rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
-		array_t * __restrict args)
+rpc_srv_execCall(rpc_cli_t * __restrict cli, struct tagRPCCall * __restrict rpc, 
+		ait_val_t funcname, array_t * __restrict args)
 {
 	rpc_callback_t func;
 
-	if (!call || !rpc || !call->func_parent || !AIT_ADDR(&call->func_name)) {
+	if (!cli || !rpc || !AIT_ADDR(&funcname)) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t exec function");
 		return -1;
 	}
 
-	func = AIT_GET_LIKE(&call->func_name, rpc_callback_t);
-	return func(call, rpc, args);
+	func = AIT_GET_LIKE(&funcname, rpc_callback_t);
+	return func(cli, rpc, args);
 }