--- libaitrpc/src/srv.c	2012/05/15 20:49:25	1.9.2.6
+++ libaitrpc/src/srv.c	2012/05/16 07:15:45	1.9.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.6 2012/05/15 20:49:25 misho Exp $
+* $Id: srv.c,v 1.9.2.8 2012/05/16 07:15:45 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -75,7 +75,6 @@ txPacket(sched_task_t *task)
 	u_char buf[USHRT_MAX] = { 0 };
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, wlen = sizeof(struct tagRPCCall);
-	array_t *arr = NULL;
 
 	/* copy RPC header */
 	memcpy(buf, TASK_DATA(task), wlen);
@@ -87,9 +86,9 @@ txPacket(sched_task_t *task)
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 		} else {
-			rpc->call_argc = htons(rpc_srv_getVars(f, &arr));
+			rpc->call_argc = htons(io_arraySize(f->func_vars));
 			/* Go Encapsulate variables */
-			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, arr);
+			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, f->func_vars);
 			/* Free return values */
 			io_clrVars(f->func_vars);
 			if (ret == -1) {
@@ -141,7 +140,8 @@ execCall(sched_task_t *task)
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 			return NULL;
 		}
-	}
+	} else
+		arr = NULL;
 
 	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {
 		rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
@@ -161,8 +161,10 @@ execCall(sched_task_t *task)
 				/* without reply */
 				io_clrVars(f->func_vars);
 				rpc->call_argc ^= rpc->call_argc;
-			} else
-				rpc->call_argc = htons(rpc_srv_getVars(f, NULL));
+			} else {
+				/* reply */
+				rpc->call_argc = htons(io_arraySize(f->func_vars));
+			}
 		}
 	}