--- libaitrpc/src/srv.c	2013/07/15 14:16:52	1.16.2.1
+++ libaitrpc/src/srv.c	2013/07/15 14:22:00	1.16.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.16.2.1 2013/07/15 14:16:52 misho Exp $
+* $Id: srv.c,v 1.16.2.2 2013/07/15 14:22:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -561,9 +561,9 @@ closeBLOBClient(sched_task_t *task)
 static void *
 toutBLOB(sched_task_t *task)
 {
-	rpc_cli_t *c = TASK_DATA(task);
+	rpc_cli_t *c = TASK_ARG(task);
 
-	rpc_srv_unregisterBLOB((rpc_srv_t*) c->cli_parent, (uint32_t) TASK_ARG(task));
+	rpc_srv_unregisterBLOB((rpc_srv_t*) c->cli_parent, (uint32_t) TASK_DATA(task));
 
 	return NULL;
 }
@@ -650,9 +650,8 @@ rxBLOB(sched_task_t *task)
 				blob.hdr_ret = htonl(rpc_srv_recvBLOB(c, b));
 				rpc_srv_blobUnmap(b);
 
-				schedTimer(TASK_ROOT(task), toutBLOB, 
-						(void*) (intptr_t) ntohl(blob.hdr_var), ts, 
-						TASK_ARG(task), ntohl(blob.hdr_len));
+				schedTimer(TASK_ROOT(task), toutBLOB, TASK_ARG(task), ts, 
+						(void*) (intptr_t) ntohl(blob.hdr_var), ntohl(blob.hdr_len));
 			} else {
 				blob.hdr_cmd = error;
 				blob.hdr_ret = RPC_ERROR(-1);
@@ -664,7 +663,7 @@ rxBLOB(sched_task_t *task)
 				blob.hdr_ret = RPC_ERROR(-1);
 			}
 
-			schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_ARG, 
+			schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, 
 					(void*) (intptr_t) ntohl(blob.hdr_var), NULL);
 			break;
 		default: