--- libaitrpc/src/srv.c	2012/11/19 15:48:45	1.12.2.8
+++ libaitrpc/src/srv.c	2012/11/19 15:54:47	1.12.2.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.12.2.8 2012/11/19 15:48:45 misho Exp $
+* $Id: srv.c,v 1.12.2.9 2012/11/19 15:54:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -525,25 +525,32 @@ end:
 
 /* ------------------------------------------------------ */
 
-static void *
-closeBLOBClient(sched_task_t *task)
+inline void
+rpc_freeBLOBCli(rpc_cli_t * __restrict c)
 {
-	rpc_cli_t *c = TASK_ARG(task);
 	rpc_srv_t *s = c->cli_parent;
 
-	schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);
+	schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL);
 
-	/* close client socket */
-	if (TASK_VAL(task))
-		shutdown(c->cli_sock, SHUT_RDWR);
-	close(c->cli_sock);
-
 	/* free buffer */
 	AIT_FREE_VAL(&c->cli_buf);
 
 	io_arrayDel(s->srv_blob.clients, c->cli_id, 0);
 	if (c)
 		io_free(c);
+}
+
+
+static void *
+closeBLOBClient(sched_task_t *task)
+{
+	int sock = ((rpc_cli_t*) TASK_ARG(task))->cli_sock;
+
+	rpc_freeBLOBCli(TASK_ARG(task));
+
+	/* close client socket */
+	shutdown(sock, SHUT_RDWR);
+	close(sock);
 	return NULL;
 }