From owner-p4-projects@FreeBSD.ORG  Tue Jun 14 17:25:22 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 01CEF1065772; Tue, 14 Jun 2011 17:25:21 +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 247E0106566B
	for <perforce@freebsd.org>; Tue, 14 Jun 2011 17:25:21 +0000 (UTC)
	(envelope-from cnicutar@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 12AF18FC0A
	for <perforce@freebsd.org>; Tue, 14 Jun 2011 17:25:21 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5EHPKPm090900
	for <perforce@freebsd.org>; Tue, 14 Jun 2011 17:25:20 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5EHPK74090897
	for perforce@freebsd.org; Tue, 14 Jun 2011 17:25:20 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Tue, 14 Jun 2011 17:25:20 GMT
Message-Id: <201106141725.p5EHPK74090897@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	cnicutar@freebsd.org using -f
From: Catalin Nicutar <cnicutar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 194757 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 14 Jun 2011 17:25:22 -0000

http://p4web.freebsd.org/@@194757?ac=10

Change 194757 by cnicutar@cnicutar_cronos on 2011/06/14 17:25:06

	Send UTO on first SYN

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_output.c#2 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_output.c#2 (text+ko) ====

@@ -704,6 +704,11 @@
 				to.to_sacks = (u_char *)tp->sackblks;
 			}
 		}
+		/* UTO */
+		if ((flags & TH_SYN) && (tp->t_flags & TF_SND_UTO)) {
+			to.to_uto = tp->snd_uto;
+			to.to_flags |= TOF_UTO;
+		}
 #ifdef TCP_SIGNATURE
 		/* TCP-MD5 (RFC2385). */
 		if (tp->t_flags & TF_SIGNATURE)
@@ -1370,6 +1375,21 @@
 			bcopy((u_char *)&to->to_mss, optp, sizeof(to->to_mss));
 			optp += sizeof(to->to_mss);
 			break;
+		case TOF_UTO:
+			while (optlen % 4) {
+				optlen += TCPOLEN_NOP;
+				*optp++ = TCPOPT_NOP;
+			}
+			if (TCP_MAXOLEN - optlen < TCPOLEN_UTO)
+				continue;
+			optlen += TCPOLEN_UTO;
+			*optp++ = TCPOPT_UTO;
+			*optp++ = TCPOLEN_UTO;
+
+			to->to_uto = htons(to->to_uto);
+			bcopy((u_char *)&to->to_uto, optp, sizeof(to->to_uto));
+			optp += sizeof(to->to_uto);
+			break;
 		case TOF_SCALE:
 			while (!optlen || optlen % 2 != 1) {
 				optlen += TCPOLEN_NOP;