--- ansh/src/daemon2.c	2011/10/10 09:11:48	1.1.1.1.2.1
+++ ansh/src/daemon2.c	2011/10/13 11:01:37	1.1.1.1.2.3
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon2.c,v 1.1.1.1.2.1 2011/10/10 09:11:48 misho Exp $
+ * $Id: daemon2.c,v 1.1.1.1.2.3 2011/10/13 11:01:37 misho Exp $
  *
  *************************************************************************/
 #include "global.h"
@@ -31,7 +31,7 @@ pktTx(sched_task_t *task)
 		}
 	}
 
-	if ((wlen = pktSend(TASK_FD(task), proc->proc_id, proc->proc_flg, Crypted, proc->proc_buf_[FD2NET], 
+	if ((wlen = pktSend(TASK_FD(task), proc->proc_flg, Crypted, proc->proc_buf_[FD2NET], 
 			proc->proc_rlen_[FD2NET], &proc->proc_ea)) != ANSH_FLG_ERR) {
 		proc->proc_flg = ANSH_FLG_OK;
 		proc->proc_rlen_[FD2NET] = 0;
@@ -135,7 +135,7 @@ fdTx(sched_task_t *task)
 		proc->proc_flg = ANSH_FLG_EOF;
 		proc->proc_rlen_[FD2NET] = 0;
 
-		schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
+		schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
 		return NULL;
 	}
 
@@ -156,7 +156,7 @@ fdTx(sched_task_t *task)
 			proc->proc_flg = ANSH_FLG_EOF;
 			proc->proc_rlen_[FD2NET] = 0;
 
-			schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
+			schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
 			return NULL;
 		default:
 			proc->proc_flg = ANSH_FLG_OK;
@@ -195,7 +195,7 @@ fdRx(sched_task_t *task)
 		proc->proc_flg = ANSH_FLG_EOF;
 		proc->proc_rlen_[FD2NET] = 0;
 
-		schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
+		schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
 		return NULL;
 	}
 
@@ -204,7 +204,8 @@ fdRx(sched_task_t *task)
 		schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL);
 
 	memset(proc->proc_buf_[FD2NET], 0, proc->proc_blen);
-	rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET], proc->proc_blen);
+	rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET], 
+			proc->proc_blen - ETHER_HDR_LEN + sizeof(struct ansh_hdr));
 	switch (rlen) {
 		case -1:
 			ERR("readtty #%d - %s", errno, strerror(errno));
@@ -219,7 +220,7 @@ fdRx(sched_task_t *task)
 			proc->proc_flg = ANSH_FLG_EOF;
 			proc->proc_rlen_[FD2NET] = 0;
 
-			schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
+			schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
 			return NULL;
 		default:
 			proc->proc_flg = ANSH_FLG_OK;
@@ -227,7 +228,7 @@ fdRx(sched_task_t *task)
 	}
 	VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]);
 
-	schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
+	schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
 	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);
 
 	/* if Timeout defined, go arm timer */