--- ansh/src/daemon3.c	2012/01/23 16:13:07	1.3.2.1
+++ ansh/src/daemon3.c	2012/05/23 15:41:38	1.3.2.3
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon3.c,v 1.3.2.1 2012/01/23 16:13:07 misho Exp $
+ * $Id: daemon3.c,v 1.3.2.3 2012/05/23 15:41:38 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -64,7 +64,7 @@ icmpTx(sched_task_t *task)
 		str = cryptBuffer(proc->proc_buf_[FD2NET], proc->proc_rlen_[FD2NET], Crypted);
 		if (str) {
 			memcpy(proc->proc_buf_[FD2NET], str, proc->proc_rlen_[FD2NET]);
-			free(str);
+			io_free(str);
 		}
 	}
 
@@ -93,7 +93,7 @@ icmpRx(sched_task_t *task)
 	FTRACE(3);
 
 	rlen = bpfLEN;
-	if (!(buf = malloc(rlen)))
+	if (!(buf = io_malloc(rlen)))
 		goto end;
 	else
 		memset(buf, 0, rlen);
@@ -121,7 +121,7 @@ icmpRx(sched_task_t *task)
 		str = cryptBuffer(buf, rlen, Crypted);
 		if (str) {
 			memcpy(buf, str, rlen);
-			free(str);
+			io_free(str);
 		}
 	}
 
@@ -153,7 +153,7 @@ icmpRx(sched_task_t *task)
 	memcpy(proc->proc_buf_[NET2FD], buf, proc->proc_rlen_[NET2FD]);
 	schedWrite(TASK_ROOT(task), fdTx, proc, proc->proc_pty, NULL, 0);
 end:
-	free(buf);
+	io_free(buf);
 	schedRead(TASK_ROOT(task), icmpRx, NULL, proc ? proc->proc_sock : TASK_FD(task), NULL, 0);
 	return NULL;
 }
@@ -162,7 +162,7 @@ void *
 fdTx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int wlen;
 
 	FTRACE(3);
@@ -193,8 +193,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, NULL, 0);
+		ts.tv_sec = Timeout;
+		schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 	}
 	return NULL;
 }
@@ -203,7 +203,7 @@ void *
 fdRx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int rlen;
 
 	FTRACE(3);
@@ -238,8 +238,8 @@ fdRx(sched_task_t *task)
 
 	/* if Timeout defined, go arm timer */
 	if (Timeout) {
-		tv.tv_sec = Timeout;
-		schedTimer(TASK_ROOT(task), TOfunc, proc, tv, NULL, 0);
+		ts.tv_sec = Timeout;
+		schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 	}
 	return NULL;
 }
@@ -248,7 +248,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);
@@ -280,8 +280,8 @@ spawnLogin(sched_task_t *task, struct tagProc *proc)
 
 			/* if Timeout defined, go arm timer */
 			if (Timeout) {
-				tv.tv_sec = Timeout;
-				schedTimer(TASK_ROOT(task), TOfunc, proc, tv, NULL, 0);
+				ts.tv_sec = Timeout;
+				schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 			}
 			break;
 	}