--- libaitio/src/sock.c	2013/12/12 21:21:19	1.11.2.4
+++ libaitio/src/sock.c	2013/12/15 22:44:30	1.11.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: sock.c,v 1.11.2.4 2013/12/12 21:21:19 misho Exp $
+* $Id: sock.c,v 1.11.2.7 2013/12/15 22:44:30 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -63,6 +63,9 @@ io_closeClient(sched_task_t *task)
 		ioFreePTY(cli->cli_pty, cli->cli_name);
 	if (s->sock_prog) {
 		io_progDetach(s->sock_prog, cli->cli_pty);
+#if 0
+		io_progCloseAt(s->sock_prog, cli->cli_pty);
+#endif
 		cli->cli_pty ^= cli->cli_pty;
 		io_progCheck(s->sock_prog, 42);
 	}
@@ -154,8 +157,10 @@ io_txNet(sched_task_t *task)
 
 		if ((ret = poll(pfd, 1, s->sock_timeout.tv_sec * 1000)) < 1 || 
 				pfd->revents & (POLLNVAL | POLLERR | POLLHUP)) {
+#if 0
 			if (!ret)
 				continue;
+#endif
 			schedEvent(TASK_ROOT(task), io_closeClient, cli, 0, NULL, 0);
 			break;
 		}
@@ -353,6 +358,8 @@ io_bridgeClient2Pool(sched_task_t *task)
 		pthread_mutex_unlock(&s->sock_mtx);
 	}
 
+	io_progCheck(s->sock_prog, 42);
+
 	cli->cli_parent = TASK_ARG(task);
 	cli->cli_fd = c;
 	cli->cli_pty = io_progAttach(s->sock_prog, 42);
@@ -618,6 +625,18 @@ ioLoopSocket(sock_t * __restrict s, sched_task_func_t 
 	return schedRun(s->sock_root, &s->sock_kill);
 }
 
+static void *
+io_progPurge(sched_task_t *task)
+{
+	sock_t *s = (sock_t*) TASK_ARG(task);
+
+	io_progVacuum(s->sock_prog, 0);
+
+	schedTimer(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), 
+			s->sock_timeout, TASK_DATA(task), TASK_DATLEN(task));
+	taskExit(task, NULL);
+}
+
 /*
  * ioBridgeProg2Socket() - Start socket scheduler and bridge program to socket
  *
@@ -631,8 +650,13 @@ ioBridgeProg2Socket(sock_t * __restrict s, const char 
 	if (!s || !prgname || s->sock_kill)
 		return -1;
 
-	schedRead(s->sock_root, s->sock_prog ? io_bridgeClient2Pool : io_bridgeClient, 
-			s, s->sock_fd, (void*) prgname, 0);
+	if (s->sock_prog) {
+		schedRead(s->sock_root, io_bridgeClient2Pool, 
+				s, s->sock_fd, (void*) prgname, 0);
+		schedTimer(s->sock_root, io_progPurge, s, s->sock_timeout, NULL, 0);
+	} else
+		schedRead(s->sock_root, io_bridgeClient, 
+				s, s->sock_fd, (void*) prgname, 0);
 	return schedRun(s->sock_root, &s->sock_kill);
 }