--- libaitio/src/sock.c	2013/11/22 08:23:51	1.4.4.7
+++ libaitio/src/sock.c	2013/11/22 08:53:17	1.4.4.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: sock.c,v 1.4.4.7 2013/11/22 08:23:51 misho Exp $
+* $Id: sock.c,v 1.4.4.8 2013/11/22 08:53:17 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -124,8 +124,74 @@ end:
 }
 
 static void *
-io_bridgeSock(sched_task_t *task)
+io_bridgeClient(sched_task_t *task)
 {
+	int c, rlen;
+	pid_t pid;
+	sockaddr_t sa;
+	socklen_t salen = sizeof sa.ss;
+	sock_cli_t *cli = NULL;
+	sock_t *s = (sock_t*) TASK_ARG(task);
+	array_t *args = NULL;
+	char **argv = NULL;
+
+	if (s->sock_type == SOCK_STREAM) {
+		if ((c = accept(TASK_FD(task), &sa.sa, &salen)) == -1) {
+			LOGERR;
+			goto end;
+		}
+	} else {
+		if ((rlen = recvfrom(TASK_FD(task), 
+						AIT_GET_BUF(&s->sock_buf), AIT_LEN(&s->sock_buf), 
+						MSG_PEEK, &sa.sa, &salen)) == -1) {
+			LOGERR;
+			goto end;
+		} else
+			c = TASK_FD(task);
+	}
+
+	cli = e_malloc(sizeof(sock_cli_t));
+	if (!cli) {
+		io_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		if (s->sock_type == SOCK_STREAM)
+			close(c);
+		goto end;
+	} else {
+		memset(cli, 0, sizeof(sock_cli_t));
+		pthread_mutex_lock(&s->sock_mtx);
+		TAILQ_INSERT_TAIL(&s->sock_cli, cli, cli_node);
+		pthread_mutex_unlock(&s->sock_mtx);
+	}
+
+	cli->cli_parent = TASK_ARG(task);
+	cli->cli_fd = c;
+	strlcpy(cli->cli_cmdline, TASK_DATA(task), sizeof cli->cli_cmdline);
+	memcpy(&cli->cli_addr, &sa, sizeof cli->cli_addr);
+	AIT_SET_BUFSIZ(&cli->cli_buf[0], 0, AIT_LEN(&s->sock_buf));
+	AIT_SET_BUFSIZ(&cli->cli_buf[1], 0, AIT_LEN(&s->sock_buf));
+
+	switch ((pid = ioForkPTY(&cli->cli_pty, cli->cli_name, sizeof cli->cli_name, 
+				NULL, NULL, NULL))) {
+		case -1:
+			ELIBERR(io);
+			break;
+		case 0:
+			array_Args(cli->cli_cmdline, 0, " \t", &args);
+			argv = array_To(args);
+			array_Destroy(&args);
+
+			execv(*argv, argv);
+			break;
+		default:
+			schedRead(TASK_ROOT(task), io_rxPty, TASK_ARG(task), 
+					cli->cli_pty, NULL, 0);
+			schedRead(TASK_ROOT(task), io_rxNet, TASK_ARG(task), 
+					cli->cli_fd, NULL, 0);
+			ioUpdTimerSocket(cli);
+			break;
+	}
+end:
+	schedReadSelf(task);
 	taskExit(task, NULL);
 }
 
@@ -380,5 +446,6 @@ ioBridgeProg2Socket(sock_t * __restrict s, const char 
 	if (!s || !prgname || s->sock_kill)
 		return -1;
 
-	return ioLoopSocket(s, io_bridgeSock);
+	schedRead(s->sock_root, io_bridgeClient, s, s->sock_fd, (void*) prgname, 0);
+	return schedRun(s->sock_root, &s->sock_kill);
 }