--- ansh/src/daemon2.c	2012/01/23 10:34:12	1.3
+++ ansh/src/daemon2.c	2012/05/23 15:41:38	1.3.2.3
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon2.c,v 1.3 2012/01/23 10:34:12 misho Exp $
+ * $Id: daemon2.c,v 1.3.2.3 2012/05/23 15:41:38 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -84,7 +84,7 @@ pktRx(sched_task_t *task)
 	FTRACE(3);
 
 	rlen = bpfLEN;
-	if (!(buf = malloc(rlen)))
+	if (!(buf = io_malloc(rlen)))
 		goto end;
 	else
 		memset(buf, 0, rlen);
@@ -133,10 +133,10 @@ pktRx(sched_task_t *task)
 	proc->proc_rlen_[NET2FD] = rlen;
 	memset(proc->proc_buf_[NET2FD], 0, proc->proc_blen);
 	memcpy(proc->proc_buf_[NET2FD], buf, proc->proc_rlen_[NET2FD]);
-	schedWrite(TASK_ROOT(task), fdTx, proc, proc->proc_pty);
+	schedWrite(TASK_ROOT(task), fdTx, proc, proc->proc_pty, NULL, 0);
 end:
-	free(buf);
-	schedRead(TASK_ROOT(task), pktRx, NULL, proc ? proc->proc_sock : TASK_FD(task));
+	io_free(buf);
+	schedRead(TASK_ROOT(task), pktRx, NULL, proc ? proc->proc_sock : TASK_FD(task), NULL, 0);
 	return NULL;
 }
 
@@ -144,7 +144,7 @@ void *
 fdTx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int wlen;
 
 	FTRACE(3);
@@ -159,7 +159,7 @@ fdTx(sched_task_t *task)
 
 	/* if Timeout defined, disarm timer */
 	if (Timeout)
-		schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL);
+		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, TOfunc, NULL);
 
 	wlen = write(TASK_FD(task), proc->proc_buf_[NET2FD], proc->proc_rlen_[NET2FD]);
 	switch (wlen) {
@@ -175,8 +175,8 @@ fdTx(sched_task_t *task)
 
 	/* if Timeout defined, go arm timer */
 	if (Timeout) {
-		tv.tv_sec = Timeout;
-		schedTimer(TASK_ROOT(task), TOfunc, proc, tv);
+		ts.tv_sec = Timeout;
+		schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 	}
 	return NULL;
 }
@@ -185,7 +185,7 @@ void *
 fdRx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int rlen;
 
 	FTRACE(3);
@@ -198,7 +198,7 @@ fdRx(sched_task_t *task)
 
 	/* if Timeout defined, disarm timer */
 	if (Timeout)
-		schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL);
+		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, TOfunc, NULL);
 
 	memset(proc->proc_buf_[FD2NET], 0, proc->proc_blen);
 	rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET], 
@@ -215,13 +215,13 @@ fdRx(sched_task_t *task)
 	}
 	VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]);
 
-	schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
-	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);
+	schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock, NULL, 0);
+	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty, NULL, 0);
 
 	/* if Timeout defined, go arm timer */
 	if (Timeout) {
-		tv.tv_sec = Timeout;
-		schedTimer(TASK_ROOT(task), TOfunc, proc, tv);
+		ts.tv_sec = Timeout;
+		schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 	}
 	return NULL;
 }
@@ -230,7 +230,7 @@ int
 spawnLogin(sched_task_t *task, struct tagProc *proc)
 {
 	int flg;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	char str[STRSIZ] = { 0 };
 
 	FTRACE(3);
@@ -255,12 +255,12 @@ spawnLogin(sched_task_t *task, struct tagProc *proc)
 			fcntl(proc->proc_pty, F_SETFL, flg | O_NONBLOCK);
 
 			VERB(3) LOG("Parent know child pid %d", proc->proc_pid);
-			schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);
+			schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty, NULL, 0);
 
 			/* if Timeout defined, go arm timer */
 			if (Timeout) {
-				tv.tv_sec = Timeout;
-				schedTimer(TASK_ROOT(task), TOfunc, proc, tv);
+				ts.tv_sec = Timeout;
+				schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 			}
 			break;
 	}