--- ansh/src/daemon3.c 2011/10/13 11:01:37 1.1.1.1.2.3 +++ ansh/src/daemon3.c 2011/10/13 14:29:30 1.1.1.1.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: daemon3.c,v 1.1.1.1.2.3 2011/10/13 11:01:37 misho Exp $ + * $Id: daemon3.c,v 1.1.1.1.2.4 2011/10/13 14:29:30 misho Exp $ * *************************************************************************/ #include "global.h" @@ -31,8 +31,9 @@ icmpTx(sched_task_t *task) } } - if ((wlen = icmpSend(TASK_FD(task), 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) { + 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; } @@ -50,6 +51,7 @@ icmpRx(sched_task_t *task) struct tagProc *proc = NULL; char ret; u_short id, *b; + u_int seq; FTRACE(3); @@ -57,9 +59,10 @@ icmpRx(sched_task_t *task) if (!(buf = malloc(rlen))) goto end; - if ((ret = icmpRecv(TASK_FD(task), &id, &Crypted, 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; @@ -86,6 +89,12 @@ icmpRx(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,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; @@ -153,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; @@ -192,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; @@ -217,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;