--- libaitrpc/src/srv.c	2012/11/19 14:51:52	1.12.2.7
+++ libaitrpc/src/srv.c	2012/11/19 15:48:45	1.12.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.12.2.7 2012/11/19 14:51:52 misho Exp $
+* $Id: srv.c,v 1.12.2.8 2012/11/19 15:48:45 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -67,6 +67,26 @@ static sched_task_func_t cbProto[SOCK_RAW + 1][4] = {
 };
 
 
+inline void
+rpc_freeCli(rpc_cli_t * __restrict c)
+{
+	rpc_srv_t *s = c->cli_parent;
+	ait_val_t v;
+
+	printf("_t_1=%p t_e=%p so=%d c=%p %s:%hu\n", s->srv_root->root_timer.tqh_first, *s->srv_root->root_timer.tqh_last, c->cli_sock, c, io_n2addr(&c->cli_sa, &v), io_n2port(&c->cli_sa));
+AIT_FREE_VAL(&v);
+	schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
+	printf("+t_1=%p t_e=%p so=%d c=%p\n", s->srv_root->root_timer.tqh_first, *s->srv_root->root_timer.tqh_last, c->cli_sock, c);
+
+	/* free buffer */
+	AIT_FREE_VAL(&c->cli_buf);
+
+	io_arrayDel(s->srv_clients, c->cli_id, 0);
+	if (c)
+		io_free(c);
+}
+
+
 static inline int
 _check4freeslot(rpc_srv_t * __restrict srv, io_sockaddr_t * __restrict sa)
 {
@@ -121,39 +141,21 @@ _allocClient(rpc_srv_t * __restrict srv, io_sockaddr_t
 static void *
 freeClient(sched_task_t *task)
 {
-	rpc_cli_t *c = TASK_ARG(task);
-	rpc_srv_t *s = c->cli_parent;
+	rpc_freeCli(TASK_ARG(task));
 
-	schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);
-
-	/* free buffer */
-	AIT_FREE_VAL(&c->cli_buf);
-
-	io_arrayDel(s->srv_clients, c->cli_id, 0);
-	if (c)
-		io_free(c);
 	return NULL;
 }
 
 static void *
 closeClient(sched_task_t *task)
 {
-	rpc_cli_t *c = TASK_ARG(task);
-	rpc_srv_t *s = c->cli_parent;
+	int sock = ((rpc_cli_t*) TASK_ARG(task))->cli_sock;
 
-	schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);
+	rpc_freeCli(TASK_ARG(task));
 
 	/* 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_clients, c->cli_id, 0);
-	if (c)
-		io_free(c);
+	shutdown(sock, SHUT_RDWR);
+	close(sock);
 	return NULL;
 }
 
@@ -204,7 +206,7 @@ txPacket(sched_task_t *task)
 	if (ret == -1 || ret != wlen) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				TASK_ARG(task), 42, NULL, 0);
+				TASK_ARG(task), 0, NULL, 0);
 	}
 
 	return NULL;
@@ -281,7 +283,7 @@ rxPacket(sched_task_t *task)
 	if (rlen < 1) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				TASK_ARG(task), 42, NULL, 0);
+				TASK_ARG(task), 0, NULL, 0);
 		return NULL;
 	} else {
 		rlen += off;	/* add reminded bytes from previous rxPacket, if exists! */
@@ -429,7 +431,7 @@ txUDPPacket(sched_task_t *task)
 	if (ret == -1 || ret != wlen) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				 TASK_ARG(task), 42, NULL, 0);
+				 TASK_ARG(task), 0, NULL, 0);
 	}
 
 	return NULL;
@@ -457,6 +459,7 @@ rxUDPPacket(sched_task_t *task)
 	if (!c)
 		goto end;
 	else {
+		c->cli_sock = TASK_FD(task);
 		memcpy(&c->cli_sa, &sa, sizeof c->cli_sa);
 		memcpy(AIT_GET_BUF(&c->cli_buf), buf, AIT_LEN(&c->cli_buf));
 		/* armed timer for close stateless connection */