--- libaitrpc/src/srv.c	2013/07/16 13:04:20	1.17
+++ 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 2013/07/16 13:04:20 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
@@ -172,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);
@@ -191,7 +192,7 @@ txPacket(sched_task_t *task)
 		}
 	}
 
-	rpc->call_len = htons(wlen);
+	rpc->call_len = htonl(wlen);
 
 #if 0
 	/* calculate CRC */
@@ -217,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);
@@ -238,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);
@@ -303,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 */
@@ -331,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 */
@@ -422,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;
@@ -480,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 */
@@ -506,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 */