--- libaitio/inc/aitio.h	2013/11/21 12:54:21	1.36.2.1
+++ libaitio/inc/aitio.h	2013/11/21 15:01:22	1.36.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.36.2.1 2013/11/21 12:54:21 misho Exp $
+* $Id: aitio.h,v 1.36.2.4 2013/11/21 15:01:22 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -82,19 +82,18 @@ typedef struct tagCliSock sock_cli_t;
 typedef void *(*sock_cb_t)(sock_cli_t*);
 struct tagCliSock {
 	void				*cli_parent;
-	pthread_t			cli_tid;
 	int				cli_fd;
 	int				cli_pty;
 	sockaddr_t			cli_addr;
 	char				cli_name[64];
 
-	sock_cb_t			cli_func;
-	void				*cli_arg;
+	sched_task_func_t		cli_func;
 
 	ait_val_t			cli_buf;
 
 	TAILQ_ENTRY(tagCliSock)		cli_node;
 };
+
 typedef struct {
 	int				sock_role;
 	int				sock_backq;
@@ -141,7 +140,15 @@ sock_t *ioInitSocket(int role, int type, int proto, 
  * return: none
  */
 void ioCloseSocket(sock_t ** __restrict s);
+#define ioKillSocket(x)		(assert((x)), (x)->sock_kill = 1)
 /*
+ * ioCloseClient() - Close client socket
+ *
+ * @c = Client socket
+ * return: 0 ok or !=0 error
+ */
+int ioCloseClient(sock_cli_t * __restrict c);
+/*
  * ioUpSocket() - Setup socket for use
  *
  * @s = Socket
@@ -151,21 +158,20 @@ void ioCloseSocket(sock_t ** __restrict s);
  */
 int ioUpSocket(sock_t * __restrict s, void *arg, int timeout);
 /*
- * ioLoopSocket() - Start socket scheduler
+ * ioUpdTimerSocket() - Update timeout of socket
  *
- * @s = Socket
- * return: -1 error or return result from scheduler
+ * @c = Client socket
+ * return:  none
  */
-int ioLoopSocket(sock_t * __restrict s);
+void ioUpdTimerSocket(sock_cli_t * __restrict c);
 /*
- * ioAcceptSocket() - Accept clients
+ * ioLoopSocket() - Start socket scheduler
  *
  * @s = Socket
- * @f = callback function for client handling
- * @arg = optional argument for callback function
- * return: -1 error or 0 ok
+ * @rcb = Read callback
+ * return: -1 error or return result from scheduler
  */
-int ioAcceptSocket(sock_t * __restrict s, sock_cb_t f, void *arg);
+int ioLoopSocket(sock_t * __restrict s, sched_task_func_t rcb);
 
 /*
  * ioPromptRead() - Read data from input h[0] with prompt to output h[1]