--- ansh/src/daemon2.c	2011/10/10 09:11:48	1.1.1.1.2.1
+++ ansh/src/daemon2.c	2011/10/13 15:24:17	1.1.1.1.2.5
@@ -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.5 2011/10/13 15:24:17 misho Exp $
  *
  *************************************************************************/
 #include "global.h"
@@ -31,8 +31,9 @@ pktTx(sched_task_t *task)
 		}
 	}
 
-	if ((wlen = pktSend(TASK_FD(task), proc->proc_id, proc->proc_flg, Crypted, proc->proc_buf_[FD2NET], 
-			proc->proc_rlen_[FD2NET], &proc->proc_ea)) != ANSH_FLG_ERR) {
+	if ((wlen = pktSend(TASK_FD(task), ++proc->proc_seq, 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;
 	}
@@ -50,14 +51,17 @@ pktRx(sched_task_t *task)
 	struct tagProc *proc = NULL;
 	char ret;
 	u_short *b;
+	u_int seq;
 
 	FTRACE(3);
 
 	rlen = bpfLEN;
 	if (!(buf = malloc(rlen)))
 		goto end;
+	else
+		memset(buf, 0, rlen);
 
-	if ((ret = pktRecv(TASK_FD(task), &Crypted, buf, &rlen, &eth)) == ANSH_FLG_ERR)
+	if ((ret = pktRecv(TASK_FD(task), &seq, &Crypted, buf, &rlen, &eth)) == ANSH_FLG_ERR)
 		goto end;
 	VERB(5) LOG("Received %d bytes", rlen);
 	if (!(ret & ANSH_FLG_CPOUT))
@@ -86,6 +90,12 @@ pktRx(sched_task_t *task)
 	switch (ret) {
 		case ANSH_FLG_EOF:
 		case ANSH_FLG_CPOUT:
+			if (seq <= proc->proc_seq)
+				goto end;
+			else if (seq > (proc->proc_seq + 1))
+				LOG("LOST PACKET(s) detect: %d; received seq=%d - %d", 
+						seq - proc->proc_seq + 1, seq, proc->proc_seq);
+			proc->proc_seq = seq;
 			break;
 		case ANSH_FLG_WINZ:
 			b = (u_short*) buf;
@@ -132,10 +142,11 @@ fdTx(sched_task_t *task)
 		schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);
 
 		proc->proc_pid = 0;
+		proc->proc_seq = 0;
 		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;
 	}
 
@@ -153,10 +164,11 @@ fdTx(sched_task_t *task)
 			schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);
 
 			proc->proc_pid = 0;
+			proc->proc_seq = 0;
 			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;
@@ -192,10 +204,11 @@ fdRx(sched_task_t *task)
 		schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);
 
 		proc->proc_pid = 0;
+		proc->proc_seq = 0;
 		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 +217,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));
@@ -216,10 +230,11 @@ fdRx(sched_task_t *task)
 			VERB(3) LOG("EOF process status %d", rlen);
 
 			proc->proc_pid = 0;
+			proc->proc_seq = 0;
 			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 +242,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 */