From owner-p4-projects@FreeBSD.ORG  Thu Jun  4 03:47:54 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 599B3106566C; Thu,  4 Jun 2009 03:47:54 +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 0F1A3106564A
	for <perforce@FreeBSD.org>; Thu,  4 Jun 2009 03:47:54 +0000 (UTC)
	(envelope-from fangwang@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F09818FC1B
	for <perforce@FreeBSD.org>; Thu,  4 Jun 2009 03:47:53 +0000 (UTC)
	(envelope-from fangwang@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 n543lrfN093851
	for <perforce@FreeBSD.org>; Thu, 4 Jun 2009 03:47:53 GMT
	(envelope-from fangwang@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n543lrtF093849
	for perforce@freebsd.org; Thu, 4 Jun 2009 03:47:53 GMT
	(envelope-from fangwang@FreeBSD.org)
Date: Thu, 4 Jun 2009 03:47:53 GMT
Message-Id: <200906040347.n543lrtF093849@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fangwang@FreeBSD.org using -f
From: Fang Wang <fangwang@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163466 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, 04 Jun 2009 03:47:55 -0000

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

Change 163466 by fangwang@fangwang_utobsd on 2009/06/04 03:47:21

	Attach uto option to tcp header.

Affected files ...

.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_output.c#2 edit
.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#5 edit

Differences ...

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

@@ -1440,6 +1440,16 @@
 			TCPSTAT_INC(tcps_sack_send_blocks);
 			break;
 			}
+		case TOF_UTO:
+			{
+			unsigned short uto_load = (unsigned short)to->to_granularity;
+			uto_load += to->to_uto;
+			if (TCP_MAXOLEN - optlen < TCPOLEN_UTO)
+				continue;
+			optlen += TCPOLEN_UTO;
+			bcopy((u_char *)&uto_load, optp, sizeof(uto_load));
+			optp += sizeof(uto_load);
+			}
 		default:
 			panic("%s: unknown TCP option type", __func__);
 			break;

==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#5 (text+ko) ====

@@ -275,8 +275,8 @@
 #define	TOF_TS		0x0010		/* timestamp */
 #define	TOF_SIGNATURE	0x0040		/* TCP-MD5 signature option (RFC2385) */
 #define	TOF_SACK	0x0080		/* Peer sent SACK option */
-#define	TOF_MAXOPT	0x0100
-#define TOF_UTO		0x0200		/* user timeout (RFC5482) */
+#define TOF_UTO		0x0100		/* user timeout (RFC5482) */
+#define	TOF_MAXOPT	0x0200
 	u_int32_t	to_tsval;	/* new timestamp */
 	u_int32_t	to_tsecr;	/* reflected timestamp */
 	u_int16_t	to_mss;		/* maximum segment size */