From owner-p4-projects@FreeBSD.ORG  Thu Jul 23 17:07:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0BAF51065692; Thu, 23 Jul 2009 17:07:18 +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 BB4D31065680
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 17:07:17 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A90118FC1E
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 17:07:17 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6NH7HWc056121
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 17:07:17 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6NH7H4Y056119
	for perforce@freebsd.org; Thu, 23 Jul 2009 17:07:17 GMT
	(envelope-from andre@freebsd.org)
Date: Thu, 23 Jul 2009 17:07:17 GMT
Message-Id: <200907231707.n6NH7H4Y056119@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166462 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, 23 Jul 2009 17:07:19 -0000

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

Change 166462 by andre@andre_flirtbox on 2009/07/23 17:07:03

	Simplify D-SACK handling tcp_reass_sack() and remove
	code duplication.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_reass.c#41 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_reass.c#41 (text+ko) ====

@@ -594,7 +594,7 @@
 {
 	int nsacks = 0;
 	tcp_seq sack_seq;
-	struct tcp_reass_block *trb;
+	struct tcp_reass_block *trb, trbs;
 
 	INP_WLOCK_ASSERT(tp->t_inpcb);
 	KASSERT(numsacks > 0,
@@ -602,18 +602,12 @@
 	KASSERT(!LIST_EMPTY(&tp->rcv_reass_sack),
 	    ("%s: sack list empty", __func__));
 
-	/* DSACK */
-	if (tp->rcv_reass_dsack.start == tp->rcv_reass_dsack.end) {
-		sack_seq = htonl(tp->rcv_reass_dsack.start);
-		bcopy((u_char *)&sack_seq, optp, sizeof(sack_seq));
-		optp += sizeof(sack_seq);
-		sack_seq = htonl(tp->rcv_reass_dsack.end);
-		bcopy((u_char *)&sack_seq, optp, sizeof(sack_seq));
-		optp += sizeof(sack_seq);
-		tp->rcv_reass_dsack.start = 0;
-		tp->rcv_reass_dsack.end = 0;
-		numsacks--;
-		nsacks++;
+	/* Create D-SACK block and temporarily insert it. */
+	if (tp->rcv_reass_dsack.start != tp->rcv_reass_dsack.end) {
+		bzero(&trbs, sizeof(trbs));
+		trbs.trb_seqs = htonl(tp->rcv_reass_dsack.start);
+		trbs.trb_seqe = htonl(tp->rcv_reass_dsack.end);
+		LIST_INSERT_HEAD(&tp->rcv_reass_sack, &trbs, trb_sack);
 	}
 
 	/*
@@ -634,6 +628,13 @@
 		nsacks++;
 	}
 
+	/* Remove D-SACK block again. */
+	if (LIST_FIRST(&tp->rcv_reass_sack) == &trbs) {
+		LIST_REMOVE(&trbs, trb_sack);
+		tp->rcv_reass_dsack.start = 0;
+		tp->rcv_reass_dsack.end = 0;
+	}
+
 	return (nsacks);
 }