From owner-p4-projects@FreeBSD.ORG  Thu Jul 31 14:51:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AEA8C106572E; Thu, 31 Jul 2008 14:51:09 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 873B8106566C
	for <perforce@FreeBSD.org>; Thu, 31 Jul 2008 14:51:08 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A0868FC1F
	for <perforce@FreeBSD.org>; Thu, 31 Jul 2008 14:51:08 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6VEp8Uv095088
	for <perforce@FreeBSD.org>; Thu, 31 Jul 2008 14:51:08 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6VEp8DX095086
	for perforce@freebsd.org; Thu, 31 Jul 2008 14:51:08 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Thu, 31 Jul 2008 14:51:08 GMT
Message-Id: <200807311451.m6VEp8DX095086@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 146321 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jul 2008 14:51:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=146321

Change 146321 by rpaulo@rpaulo_epsilon on 2008/07/31 14:50:40

	Implement the last bits of basic SEQ/ACK processing.

Affected files ...

.. //depot/projects/soc2008/rpaulo-tcpad/verify.c#7 edit

Differences ...

==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#7 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#6 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#7 $
  */
 
 #include <stdio.h>
@@ -195,12 +195,15 @@
 
 		switch (tp->t_state) {
 		case TCPS_ESTABLISHED:
+			tp->snd_nxt += tlen;
+#if 0
 			if (th->th_seq != tp->snd_nxt)
 				printf("wrong seq %u %u\n", th->th_seq,
 				    tp->snd_nxt);
 			if (th->th_ack != tp->rcv_nxt)
 				printf("wrong ack %u %u\n", th->th_ack,
 				    tp->rcv_nxt);
+#endif
 			break;
 		}
 	}
@@ -320,7 +323,8 @@
 				free(cp);
 				return (NULL);
 			} else {
-                                dumper_error(cp, "RST: ACK < snd_nxt");
+                                dumper_error(cp, "SEG.ACK < SND.UNA or "
+				    "SEG.ACK > SND.NXT");
                                 dumper_free(cp);
                                 LIST_REMOVE(cp, entries);
 				free(cp);
@@ -368,8 +372,8 @@
 				DPRINTF(DEBUG_FSM, "FSM transition: %p "
 				    "SYN_RECEIVED -> ESTABLISHED\n", tp);
 			} else {
-				dumper_error(cp, "ACK < SND.UNA or "
-				    "ACK > SND.NXT");
+				dumper_error(cp, "SEG.ACK < SND.UNA or "
+				    "SEG.ACK > SND.NXT");
 				dumper_free(cp);
 				LIST_REMOVE(cp, entries);
 				free(cp);
@@ -432,6 +436,8 @@
 					    SEQ_GEQ(th->th_seq + tlen,
 						tp->rcv_nxt + tp->rcv_wnd))
 						printf("strange seq\n");
+					else
+						tp->rcv_nxt += tlen;
 
 
 				}
@@ -441,7 +447,6 @@
 			if (SEQ_GEQ(th->th_ack, tp->snd_una) &&
 			    SEQ_LEQ(th->th_ack, tp->snd_nxt)) {
 				tp->snd_una = th->th_ack;
-				tp->rcv_nxt = tp->snd_una + 1;
 				/* update send window */
 				if (SEQ_LT(tp->snd_wl1, th->th_seq) ||
 				    (tp->snd_wl1 == th->th_seq &&