--- ansh/src/daemon3.c	2011/10/04 22:37:46	1.1.1.1
+++ ansh/src/daemon3.c	2011/10/13 14:29:30	1.1.1.1.2.4
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon3.c,v 1.1.1.1 2011/10/04 22:37:46 misho Exp $
+ * $Id: daemon3.c,v 1.1.1.1.2.4 2011/10/13 14:29:30 misho Exp $
  *
  *************************************************************************/
 #include "global.h"
@@ -15,6 +15,7 @@ icmpTx(sched_task_t *task)
 {
 	struct tagProc *proc;
 	int wlen;
+	u_char *str;
 
 	FTRACE(3);
 
@@ -22,8 +23,17 @@ icmpTx(sched_task_t *task)
 	if (!(proc = TASK_ARG(task)))
 		return (void*) -1;
 
-	if ((wlen = icmpSend(TASK_FD(task), proc->proc_id, proc->proc_flg, proc->proc_buf_[FD2NET], 
-			proc->proc_rlen_[FD2NET], &proc->proc_cli, sizeof proc->proc_cli)) != ANSH_FLG_ERR) {
+	if (Crypted) {
+		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);
+		}
+	}
+
+	if ((wlen = icmpSend(TASK_FD(task), ++proc->proc_seq, proc->proc_id, proc->proc_flg, Crypted, 
+					proc->proc_buf_[FD2NET], proc->proc_rlen_[FD2NET], &proc->proc_cli, 
+					sizeof proc->proc_cli)) != ANSH_FLG_ERR) {
 		proc->proc_flg = ANSH_FLG_OK;
 		proc->proc_rlen_[FD2NET] = 0;
 	}
@@ -35,12 +45,13 @@ icmpTx(sched_task_t *task)
 void *
 icmpRx(sched_task_t *task)
 {
-	u_char *buf;
+	u_char *buf, *str;
 	struct sockaddr sa;
 	int rlen, n = 0, salen = sizeof sa;
 	struct tagProc *proc = NULL;
 	char ret;
 	u_short id, *b;
+	u_int seq;
 
 	FTRACE(3);
 
@@ -48,9 +59,10 @@ icmpRx(sched_task_t *task)
 	if (!(buf = malloc(rlen)))
 		goto end;
 
-	if ((ret = icmpRecv(TASK_FD(task), &id, buf, &rlen, &sa, (socklen_t *) &salen)) == ANSH_FLG_ERR)
+	if ((ret = icmpRecv(TASK_FD(task), &seq, &id, &Crypted, buf, &rlen, &sa, 
+					(socklen_t *) &salen)) == ANSH_FLG_ERR)
 		goto end;
-	VERB(5) LOG("Received %d bytes", rlen);
+	VERB(5) LOG("Received %d bytes %d", rlen, seq);
 	if (!(ret & ANSH_FLG_CPOUT))
 		goto end;
 
@@ -66,9 +78,23 @@ icmpRx(sched_task_t *task)
 		goto end;
 	}
 
+	if (Crypted) {
+		str = cryptBuffer(buf, rlen, Crypted);
+		if (str) {
+			memcpy(buf, str, rlen);
+			free(str);
+		}
+	}
+
 	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;
@@ -115,6 +141,7 @@ 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;
 
@@ -136,6 +163,7 @@ 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;
 
@@ -175,6 +203,7 @@ 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;
 
@@ -187,7 +216,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 - sizeof(struct icmp) + sizeof(struct ansh_hdr));
 	switch (rlen) {
 		case -1:
 			ERR("readtty #%d - %s", errno, strerror(errno));
@@ -199,6 +229,7 @@ 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;
 
@@ -246,7 +277,7 @@ spawnLogin(sched_task_t *task, struct tagProc *proc)
 			if (proc->proc_cli.sa_family == AF_INET) {
 				sin = (struct sockaddr_in*) &proc->proc_cli;
 				inet_ntop(AF_INET, &sin->sin_addr, str + 8, INET_ADDRSTRLEN);
-			} else if (proc->proc_cli.sa_family == AF_INET) {
+			} else if (proc->proc_cli.sa_family == AF_INET6) {
 				sin6 = (struct sockaddr_in6*) &proc->proc_cli;
 				inet_ntop(AF_INET6, &sin6->sin6_addr, str + 8, INET6_ADDRSTRLEN);
 			}