--- libaitio/src/sock.c	2013/11/22 14:31:08	1.6
+++ libaitio/src/sock.c	2013/11/22 15:09:17	1.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: sock.c,v 1.6 2013/11/22 14:31:08 misho Exp $
+* $Id: sock.c,v 1.7 2013/11/22 15:09:17 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -51,7 +51,7 @@ io_closeClient(sched_task_t *task)
 {
 	sock_cli_t *cli = (sock_cli_t*) TASK_ARG(task);
 	sock_t *s = (sock_t*) cli->cli_parent;
-	int stat, sock = (int) TASK_DATLEN(task);
+	int stat;
 
 	pthread_mutex_lock(&s->sock_mtx);
 	TAILQ_REMOVE(&s->sock_cli, cli, cli_node);
@@ -60,17 +60,17 @@ io_closeClient(sched_task_t *task)
 	schedCancelby(s->sock_root, taskMAX, CRITERIA_ARG, cli, NULL);
 
 	if (s->sock_type == SOCK_STREAM) {
-		shutdown(sock, SHUT_RDWR);
-		close(sock);
+		shutdown(cli->cli_fd, SHUT_RDWR);
+		close(cli->cli_fd);
 	}
 	AIT_FREE_VAL(&cli->cli_buf[1]);
 	AIT_FREE_VAL(&cli->cli_buf[0]);
 
 	if (cli->cli_pid > 0) {
-		kill(cli->cli_pid, SIGTERM);
+		kill(cli->cli_pid, SIGKILL);
 		while (waitpid(cli->cli_pid, &stat, WNOHANG) > 0) {
 			usleep(1000);
-			kill(cli->cli_pid, SIGTERM);
+			kill(cli->cli_pid, SIGKILL);
 		}
 	}
 
@@ -123,7 +123,7 @@ io_acceptClient(sched_task_t *task)
 	AIT_SET_BUFSIZ(&cli->cli_buf[1], 0, AIT_LEN(&s->sock_buf));
 
 	schedRead(TASK_ROOT(task), cli->cli_func, cli, cli->cli_fd, TASK_ARG(task), 0);
-	ioUpdTimerSocket(cli, NULL);
+	ioUpdTimerSocket(cli);
 end:
 	schedReadSelf(task);
 	taskExit(task, NULL);
@@ -136,7 +136,7 @@ io_txNet(sched_task_t *task)
 	sock_cli_t *cli = TASK_ARG(task);
 	sock_t *s = (sock_t*) cli->cli_parent;
 
-	ioUpdTimerSocket(cli, NULL);
+	ioUpdTimerSocket(cli);
 
 	if (s->sock_type == SOCK_STREAM)
 		wlen = send(TASK_FD(task), TASK_DATA(task), TASK_DATLEN(task), 0);
@@ -144,8 +144,7 @@ io_txNet(sched_task_t *task)
 		wlen = sendto(TASK_FD(task), TASK_DATA(task), TASK_DATLEN(task), 0, 
 				&cli->cli_addr.sa, cli->cli_addr.sa.sa_len);
 	if (wlen < 1)
-		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, 
-				(void*) cli->cli_func, cli->cli_fd);
+		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, NULL, 0);
 
 	taskExit(task, NULL);
 }
@@ -156,12 +155,11 @@ io_txPty(sched_task_t *task)
 	int wlen;
 	sock_cli_t *cli = TASK_ARG(task);
 
-	ioUpdTimerSocket(cli, NULL);
+	ioUpdTimerSocket(cli);
 
 	wlen = write(TASK_FD(task), TASK_DATA(task), TASK_DATLEN(task));
 	if (wlen < 1)
-		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, 
-				(void*) cli->cli_func, cli->cli_fd);
+		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, NULL, 0);
 
 	taskExit(task, NULL);
 }
@@ -175,7 +173,7 @@ io_rxNet(sched_task_t *task)
 	sockaddr_t sa;
 	socklen_t salen = sizeof sa.ss;
 
-	ioUpdTimerSocket(cli, NULL);
+	ioUpdTimerSocket(cli);
 
 	if (s->sock_type == SOCK_STREAM)
 		rlen = recv(TASK_FD(task), AIT_GET_BUF(&cli->cli_buf[0]), 
@@ -187,8 +185,7 @@ io_rxNet(sched_task_t *task)
 			goto end;
 	}
 	if (rlen < 1)
-		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, 
-				(void*) cli->cli_func, cli->cli_fd);
+		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, NULL, 0);
 	else
 		schedEvent(TASK_ROOT(task), io_txPty, cli, cli->cli_pty, 
 				AIT_GET_BUF(&cli->cli_buf[0]), rlen);
@@ -203,12 +200,11 @@ io_rxPty(sched_task_t *task)
 	int rlen;
 	sock_cli_t *cli = TASK_ARG(task);
 
-	ioUpdTimerSocket(cli, NULL);
+	ioUpdTimerSocket(cli);
 
 	rlen = read(TASK_FD(task), AIT_GET_BUF(&cli->cli_buf[1]), AIT_LEN(&cli->cli_buf[1]));
 	if (rlen < 1)
-		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, 
-				(void*) cli->cli_func, cli->cli_fd);
+		schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, NULL, 0);
 	else
 		schedEvent(TASK_ROOT(task), io_txNet, cli, cli->cli_fd, 
 				AIT_GET_BUF(&cli->cli_buf[1]), rlen);
@@ -285,7 +281,7 @@ io_bridgeClient(sched_task_t *task)
 					TASK_ARG(task), 0);
 			schedRead(TASK_ROOT(task), io_rxNet, cli, cli->cli_fd, 
 					TASK_ARG(task), 0);
-			ioUpdTimerSocket(cli, NULL);
+			ioUpdTimerSocket(cli);
 			break;
 	}
 end:
@@ -407,10 +403,10 @@ ioCloseSocket(sock_t ** __restrict s)
 			AIT_FREE_VAL(&cli->cli_buf[0]);
 
 			if (cli->cli_pid > 0) {
-				kill(cli->cli_pid, SIGTERM);
+				kill(cli->cli_pid, SIGKILL);
 				while (waitpid(cli->cli_pid, &stat, WNOHANG) > 0) {
 					usleep(1000);
-					kill(cli->cli_pid, SIGTERM);
+					kill(cli->cli_pid, SIGKILL);
 				}
 			}
 
@@ -487,11 +483,10 @@ ioUpSocket(sock_t * __restrict s, void *arg, int timeo
  * ioUpdTimerSocket() - Update timeout of socket
  *
  * @c = Client socket
- * @arg = Optional data argument
  * return:  none
  */
 void
-ioUpdTimerSocket(sock_cli_t * __restrict c, void *arg)
+ioUpdTimerSocket(sock_cli_t * __restrict c)
 {
 	sock_t *s;
 
@@ -500,8 +495,8 @@ ioUpdTimerSocket(sock_cli_t * __restrict c, void *arg)
 	else
 		s = c->cli_parent;
 
-	schedCancelby(s->sock_root, taskTIMER, CRITERIA_DATLEN, (void*) c->cli_fd, NULL);
-	schedTimer(s->sock_root, io_closeClient, c, s->sock_timeout, arg, c->cli_fd);
+	schedCancelby(s->sock_root, taskTIMER, CRITERIA_ARG, c, NULL);
+	schedTimer(s->sock_root, io_closeClient, c, s->sock_timeout, NULL, 0);
 }
 
 /*
@@ -520,7 +515,7 @@ ioCloseClient(sock_cli_t * __restrict c)
 	else
 		s = c->cli_parent;
 
-	return !schedEvent(s->sock_root, io_closeClient, c, 0, NULL, c->cli_fd);
+	return !schedEvent(s->sock_root, io_closeClient, c, 0, NULL, 0);
 }
 
 /*