From owner-p4-projects@FreeBSD.ORG  Wed Aug 27 13:00:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 233BD1065687; Wed, 27 Aug 2008 13:00:20 +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 DAD0E1065685
	for <perforce@FreeBSD.org>; Wed, 27 Aug 2008 13:00:19 +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 C9B868FC17
	for <perforce@FreeBSD.org>; Wed, 27 Aug 2008 13:00:19 +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 m7RD0JQf083727
	for <perforce@FreeBSD.org>; Wed, 27 Aug 2008 13:00:19 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RD0JNK083725
	for perforce@freebsd.org; Wed, 27 Aug 2008 13:00:19 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Wed, 27 Aug 2008 13:00:19 GMT
Message-Id: <200808271300.m7RD0JNK083725@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 148605 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: Wed, 27 Aug 2008 13:00:20 -0000

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

Change 148605 by rpaulo@rpaulo_phi on 2008/08/27 12:59:21

	Expand snd_scale and rcv_scale as per RFC 1323.
	Add more debugging information.

Affected files ...

.. //depot/projects/soc2008/rpaulo-tcpad/dumper.c#14 edit
.. //depot/projects/soc2008/rpaulo-tcpad/verify.c#18 edit

Differences ...

==== //depot/projects/soc2008/rpaulo-tcpad/dumper.c#14 (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/dumper.c#13 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#14 $
  */
 
 #include <assert.h>
@@ -62,6 +62,8 @@
 	head = cp->pktshead;
 	assert(head != NULL);
 
+	DPRINTF(DEBUG_DUMP, "%s: %p %p\n", __func__, cp, head);
+
 	dp = malloc(sizeof(*dp));
 	if (dp == NULL) {
 		fprintf(stderr, "%s: malloc failed\n", __func__);
@@ -88,7 +90,12 @@
 	va_list ap;
 
 	assert(cp != NULL);
-	assert(cp->pktshead != NULL);
+	/*
+	 * XXX: might happen. explain why
+	 */
+	if (cp->pktshead == NULL)
+		return;
+	//assert(cp->pktshead != NULL);
 
 	for (i = 0; i < 3000; i++) {
 		snprintf(path, sizeof(path), "%s/dump%03d.txt", DUMPER_PATH, i);
@@ -189,4 +196,5 @@
 	}
 	free(head);
 	cp->pktshead = NULL;
+	DPRINTF(DEBUG_DUMP, "freeing done\n");
 }

==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#18 (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#17 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#18 $
  */
 
 #include <stdio.h>
@@ -304,7 +304,7 @@
 			return (cp);
 		}
 		tp->irs = th->th_seq;
-		tp->rcv_wnd = th->th_win;
+		tp->rcv_wnd = th->th_win >> tp->rcv_scale;
 	}
 
 	/*
@@ -334,8 +334,8 @@
 				return (NULL);
 			}
 			break;
-		default:
-			dumper_error(cp, "RST with no known state");
+		//default:
+			//dumper_error(cp, "RST with no known state");
 		}
 	}
 	/*
@@ -473,7 +473,7 @@
 				if (SEQ_LT(tp->snd_wl1, th->th_seq) ||
 				    (tp->snd_wl1 == th->th_seq &&
 				     SEQ_LEQ(tp->snd_wl2, th->th_ack))) {
-					tp->snd_wnd = th->th_win;
+					tp->snd_wnd = th->th_win << tp->snd_scale;
 					tp->snd_wl1 = th->th_seq;
 					tp->snd_wl2 = th->th_ack;
 				}