--- libaitrpc/src/srv.c	2012/03/28 13:37:13	1.7.2.2
+++ libaitrpc/src/srv.c	2012/03/29 00:40:59	1.7.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.7.2.2 2012/03/28 13:37:13 misho Exp $
+* $Id: srv.c,v 1.7.2.3 2012/03/29 00:40:59 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -83,6 +83,8 @@ txPacket(sched_task_t *task)
 		}
 	}
 
+	rpc->call_len = htons(wlen);
+
 	/* calculate CRC */
 	rpc->call_crc ^= rpc->call_crc;
 	rpc->call_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2));
@@ -107,7 +109,7 @@ execCall(sched_task_t *task)
 	rpc_srv_t *s = c->cli_parent;
 	rpc_func_t *f = NULL;
 	array_t *arr = NULL;
-	u_char *buf = TASK_DATA(task);
+	u_char *buf = TASK_DATA(task) + TASK_VAL(task);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int argc = ntohs(rpc->call_argc);
 
@@ -116,7 +118,8 @@ execCall(sched_task_t *task)
 	/* Go decapsulate variables ... */
 	if (argc) {
 		arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), 
-				TASK_DATLEN(task) - sizeof(struct tagRPCCall), argc, 1);
+				TASK_DATLEN(task) - TASK_VAL(task) - sizeof(struct tagRPCCall), 
+				argc, 1);
 		if (!arr) {
 			rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError());
 			rpc->call_argc ^= rpc->call_argc;
@@ -163,8 +166,8 @@ rxPacket(sched_task_t *task)
 	rpc_cli_t *c = TASK_ARG(task);
 	rpc_srv_t *s = c->cli_parent;
 	u_char *buf = TASK_DATA(task);
-	int rlen;
-	u_short crc;
+	int rlen, noreply;
+	u_short crc, off = 0;
 	struct tagRPCCall *rpc;
 	struct timespec ts;
 
@@ -182,49 +185,59 @@ rxPacket(sched_task_t *task)
 	} else
 		ioDEBUG(RPC_DEBUG_LEVEL, "Readed %d bytes", rlen);
 
-	if (rlen < sizeof(struct tagRPCCall)) {
-		rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
+	do {
+		if (rlen < sizeof(struct tagRPCCall)) {
+			rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
 
-		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
-		return NULL;
-	} else
-		rpc = (struct tagRPCCall*) buf;
+			schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
+					TASK_DATA(task), TASK_DATLEN(task));
+			return NULL;
+		} else
+			rpc = (struct tagRPCCall*) (buf + off);
 
-	/* check integrity of packet */
-	crc = ntohs(rpc->call_crc);
-	rpc->call_crc ^= rpc->call_crc;
-	if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) {
-		rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
+		rlen -= ntohs(rpc->call_len);
 
-		schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
-		return NULL;
-	}
+		/* check integrity of packet */
+		crc = ntohs(rpc->call_crc);
+		rpc->call_crc ^= rpc->call_crc;
+		if (crc != crcFletcher16((u_short*) (buf + off), 
+					io_align(ntohs(rpc->call_len), 1) / 2)) {
+			rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
 
-	/* 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);
-		goto end;
-	} else {
-		/* change socket timeout from last packet */
-		ts.tv_sec = rpc->call_session.sess_timeout;
-		ts.tv_nsec = 0;
-		schedPolling(TASK_ROOT(task), &ts, NULL);
-	}
+			off += ntohs(rpc->call_len);
+			if (rlen < 1)
+				break;
+			else
+				continue;
+		}
 
-	/* execute RPC call */
-	schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 0, 
-			TASK_DATA(task), TASK_DATLEN(task));
+		noreply = rpc->call_req.flags & RPC_NOREPLY;
 
-end:
-	/* send RPC reply */
-	if (!(rpc->call_req.flags & RPC_NOREPLY))
-		schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(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 {
+			/* change socket timeout from last packet */
+			ts.tv_sec = rpc->call_session.sess_timeout;
+			ts.tv_nsec = 0;
+			schedPolling(TASK_ROOT(task), &ts, NULL);
+
+			/* execute RPC call */
+			schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), off, 
+					TASK_DATA(task), TASK_DATLEN(task));
+		}
+
+		/* send RPC reply */
+		if (!noreply)
+			schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), 
+					buf + off, TASK_DATLEN(task) - off);
+
+		off += ntohs(rpc->call_len);
+	} while (rlen > 0);
+
 	/* lets get next packet */
 	schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), 
 			TASK_DATA(task), TASK_DATLEN(task));