--- ansh/src/daemon3.c	2012/07/22 22:41:33	1.4
+++ ansh/src/daemon3.c	2013/01/18 09:31:47	1.4.4.1
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon3.c,v 1.4 2012/07/22 22:41:33 misho Exp $
+ * $Id: daemon3.c,v 1.4.4.1 2013/01/18 09:31:47 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -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]);
-			io_free(str);
+			e_free(str);
 		}
 	}
 
@@ -83,7 +83,7 @@ void *
 icmpRx(sched_task_t *task)
 {
 	u_char *buf, *str;
-	io_sockaddr_t sa;
+	sockaddr_t sa;
 	int rlen, n = 0, salen = sizeof sa;
 	struct tagProc *proc = NULL;
 	char ret;
@@ -93,7 +93,7 @@ icmpRx(sched_task_t *task)
 	FTRACE(3);
 
 	rlen = bpfLEN;
-	if (!(buf = io_malloc(rlen)))
+	if (!(buf = e_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);
-			io_free(str);
+			e_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:
-	io_free(buf);
+	e_free(buf);
 	schedRead(TASK_ROOT(task), icmpRx, NULL, proc ? proc->proc_sock : TASK_FD(task), NULL, 0);
 	return NULL;
 }