--- libaitrpc/src/srv.c	2012/09/17 14:16:42	1.11.2.3
+++ libaitrpc/src/srv.c	2012/11/05 17:06:51	1.11.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.11.2.3 2012/09/17 14:16:42 misho Exp $
+* $Id: srv.c,v 1.11.2.4 2012/11/05 17:06:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -135,7 +135,7 @@ execCall(sched_task_t *task)
 	if (argc) {
 		arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), 
 				AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), 
-				argc, 1);
+				argc, 42);
 		if (!arr) {
 			rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError());
 			rpc->call_argc ^= rpc->call_argc;
@@ -185,7 +185,10 @@ rxPacket(sched_task_t *task)
 	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagRPCCall *rpc;
 
-	memset(buf, 0, AIT_LEN(&c->cli_buf));
+	if (!off)
+		memset(buf, 0, AIT_LEN(&c->cli_buf));
+	else
+		memmove(buf, buf + off, AIT_LEN(&c->cli_buf) - off);
 	rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0);
 	if (rlen < 1) {
 		/* close connection */
@@ -835,13 +838,12 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	fcntl(srv->srv_server.cli_sock, F_SETFL, 
-			fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
-
 	if (listen(srv->srv_server.cli_sock, io_arraySize(srv->srv_clients)) == -1) {
 		LOGERR;
 		return -1;
-	}
+	} else
+		fcntl(srv->srv_server.cli_sock, F_SETFL, 
+				fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
 
 	if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) {
 		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());