--- libaitrpc/src/srv.c	2012/05/18 15:24:33	1.9.2.29
+++ libaitrpc/src/srv.c	2012/08/29 14:04:04	1.11.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.29 2012/05/18 15:24:33 misho Exp $
+* $Id: srv.c,v 1.11.2.1 2012/08/29 14:04:04 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;
 }
 
@@ -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);
 			}
@@ -446,13 +446,14 @@ acceptBLOBClients(sched_task_t *task)
 	rpc_cli_t *c = NULL;
 	register int i;
 	socklen_t salen = sizeof(io_sockaddr_t);
+	int n = 1;
 
 	/* check free slots for connect */
 	for (i = 0; i < io_arraySize(srv->srv_blob.clients) && 
 			(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;
@@ -474,8 +475,10 @@ acceptBLOBClients(sched_task_t *task)
 		AIT_FREE_VAL(&c->cli_buf);
 		io_arrayDel(srv->srv_blob.clients, i, 42);
 		goto end;
-	} else
+	} else {
+		setsockopt(c->cli_sock, IPPROTO_TCP, TCP_NOPUSH, &n, sizeof n);
 		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
+	}
 
 	schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0);
 end:
@@ -663,7 +666,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 +692,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 +715,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 +737,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 +746,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 +756,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 +785,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 +808,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	(*psrv)->srv_kill = 1;
 	sleep(RPC_SCHED_POLLING);
 
-	free(*psrv);
+	io_free(*psrv);
 	*psrv = NULL;
 }
 
@@ -867,7 +870,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		TAILQ_REMOVE(&srv->srv_funcs, f, func_node);
 
 		AIT_FREE_VAL(&f->func_name);
-		free(f);
+		io_free(f);
 	}
 
 	schedEnd(&srv->srv_root);