--- libaitrpc/src/srv.c	2013/08/20 23:37:43	1.17.4.1
+++ libaitrpc/src/srv.c	2013/08/22 12:22:25	1.17.6.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.17.4.1 2013/08/20 23:37:43 misho Exp $
+* $Id: srv.c,v 1.17.6.2 2013/08/22 12:22:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -74,8 +74,8 @@ rpc_freeCli(rpc_cli_t * __restrict c)
 
 	schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
 
-	/* free buffer(s) */
-	ait_freeVars(&c->cli_buf);
+	/* free buffer */
+	AIT_FREE_VAL(&c->cli_buf);
 
 	array_Del(s->srv_clients, c->cli_id, 0);
 	if (c)
@@ -127,13 +127,7 @@ _allocClient(rpc_srv_t * __restrict srv, sockaddr_t * 
 		}
 
 		/* alloc empty buffer */
-		c->cli_buf = ait_allocVars(1);
-		if (!c->cli_buf) {
-			rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
-			array_Del(srv->srv_clients, n, 42);
-			return NULL;
-		} else
-			AIT_SET_BUFSIZ(array(c->cli_buf, 0, ait_val_t*), 0, srv->srv_netbuf);
+		AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf);
 	}
 
 	return c;
@@ -178,6 +172,7 @@ txPacket(sched_task_t *task)
 		f = rpc_srv_getCall(s, ntohs(rpc->call_tag));
 		if (!f) {
 			rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
+
 			rpc->call_argc ^= rpc->call_argc;
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
@@ -197,7 +192,7 @@ txPacket(sched_task_t *task)
 		}
 	}
 
-	rpc->call_len = htons(wlen);
+	rpc->call_len = htonl(wlen);
 
 #if 0
 	/* calculate CRC */
@@ -223,17 +218,17 @@ execCall(sched_task_t *task)
 	rpc_srv_t *s = c->cli_parent;
 	rpc_func_t *f = NULL;
 	array_t *arr = NULL;
-	u_char *buf = AIT_GET_BUF(&c->cli_buf) + TASK_VAL(task);
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int argc = ntohs(rpc->call_argc);
 
 	/* Go decapsulate variables ... */
 	if (argc) {
 		arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall), 
-				AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), 
-				argc, 42);
+				AIT_LEN(&c->cli_buf) - sizeof(struct tagRPCCall), argc, 42);
 		if (!arr) {
 			rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError());
+
 			rpc->call_argc ^= rpc->call_argc;
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
@@ -244,6 +239,7 @@ execCall(sched_task_t *task)
 
 	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {
 		rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
+
 		rpc->call_argc ^= rpc->call_argc;
 		rpc->call_rep.ret = RPC_ERROR(-1);
 		rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
@@ -309,7 +305,7 @@ rxPacket(sched_task_t *task)
 		} else
 			rpc = (struct tagRPCCall*) (buf + off);
 
-		len = ntohs(rpc->call_len);
+		len = ntohl(rpc->call_len);
 		rlen -= len;
 
 		/* check RPC packet lengths */
@@ -337,12 +333,14 @@ rxPacket(sched_task_t *task)
 		/* check RPC packet session info */
 		if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
 			rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+
 			rpc->call_argc ^= rpc->call_argc;
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(errno);
 		} else {
 			/* execute RPC call */
-			schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), off, NULL, 0);
+			schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 
+					(int) noreply, rpc, len);
 		}
 
 		/* send RPC reply */
@@ -428,7 +426,7 @@ txUDPPacket(sched_task_t *task)
 		}
 	}
 
-	rpc->call_len = htons(wlen);
+	rpc->call_len = htonl(wlen);
 
 	/* calculate CRC */
 	rpc->call_crc ^= rpc->call_crc;
@@ -486,7 +484,7 @@ rxUDPPacket(sched_task_t *task)
 		} else
 			rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off);
 
-		len = ntohs(rpc->call_len);
+		len = ntohl(rpc->call_len);
 		rlen -= len;
 
 		/* check RPC packet lengths */
@@ -512,12 +510,14 @@ rxUDPPacket(sched_task_t *task)
 		/* check RPC packet session info */
 		if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) {
 			rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+
 			rpc->call_argc ^= rpc->call_argc;
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(errno);
 		} else {
 			/* execute RPC call */
-			schedEvent(TASK_ROOT(task), execCall, c, off, NULL, 0);
+			schedEvent(TASK_ROOT(task), execCall, c, 
+					(int) noreply, rpc, len);
 		}
 
 		/* send RPC reply */