PERFORCE change 163462 for review

[Fang Wang]

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

Change 163462 by fangwang at fangwang_utobsd on 2009/06/04 02:35:18

	fix wrong whitespace. 

Affected files ...

.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp.h#3 edit
.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.h#2 edit
.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#4 edit

Differences ...

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

@@ -96,8 +96,8 @@
 #define    TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
 #define	TCPOPT_SIGNATURE	19		/* Keyed MD5: RFC 2385 */
 #define	   TCPOLEN_SIGNATURE		18
-#define TCPOPT_UTO      28
-#define    TCPOLEN_UTO          4
+#define TCPOPT_UTO		28
+#define    TCPOLEN_UTO			4
 
 /* Miscellaneous constants */
 #define	MAX_SACK_BLKS	6	/* Max # SACK blocks stored at receiver side */
@@ -152,7 +152,7 @@
 #define TCP_MD5SIG	0x10	/* use MD5 digests (RFC2385) */
 #define	TCP_INFO	0x20	/* retrieve tcp_info structure */
 #define	TCP_CONGESTION	0x40	/* get/set congestion control algorithm */
-#define TCP_UTO     0x80    /* set tcp user timeout */
+#define TCP_UTO		0x80	/* set tcp user timeout */
 
 #define	TCP_CA_NAME_MAX	16	/* max congestion control name length */
 
@@ -161,7 +161,7 @@
 #define	TCPI_OPT_WSCALE		0x04
 #define	TCPI_OPT_ECN		0x08
 #define	TCPI_OPT_TOE		0x10
-#define TCPI_OPT_UTO        0x20
+#define TCPI_OPT_UTO		0x20
 
 /*
  * The TCP_INFO socket option comes from the Linux 2.6 TCP API, and permits
@@ -221,7 +221,7 @@
 	u_int32_t	tcpi_snd_nxt;		/* Next egress seqno */
 	u_int32_t	tcpi_rcv_nxt;		/* Next ingress seqno */
 	u_int32_t	tcpi_toe_tid;		/* HWTID for TOE endpoints */
-	u_int32_t   tcpi_uto;           /* tcp user timeout value */
+	u_int32_t	tcpi_uto;		/* tcp user timeout value */
 
 	/* Padding to grow without breaking ABI. */
 	u_int32_t	__tcpi_pad[28];		/* Padding. */

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

@@ -69,6 +69,8 @@
 	u_int8_t	sc_ip_tos;		/* IPv4 TOS */
 	u_int8_t	sc_requested_s_scale:4,
 			sc_requested_r_scale:4;
+	u_int16_t	sc_granularity:1,	/* user timeout granularity */
+			sc_uto:15;		/* user timeout, UTO */
 	u_int16_t	sc_flags;
 #ifndef TCP_OFFLOAD_DISABLE
 	struct toe_usrreqs *sc_tu;		/* TOE operations */
@@ -91,6 +93,7 @@
 #define SCF_SIGNATURE	0x20			/* send MD5 digests */
 #define SCF_SACK	0x80			/* send SACK option */
 #define SCF_ECN		0x100			/* send ECN setup packet */
+#define SCF_UTO		0x200			/* send UTO option */
 
 #define	SYNCOOKIE_SECRET_SIZE	8	/* dwords */
 #define	SYNCOOKIE_LIFETIME	16	/* seconds */

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

@@ -192,13 +192,14 @@
 	int	t_bytes_acked;		/* # bytes acked during current RTT */
 
 /* user timeout variables (RFC 5482) */
-    u_int  t_rcvuto;        /* received user timeout value */
-    u_char  rcv_uto_granularity:1; /* received user timeout granularity */
-    u_int  t_snduto;       /* send user timeout value */
-    u_char  snd_uto_granularity:1; /* received user timeout granularity */
-    u_char  uto_enable:1;  /* flag controls whether the UTO option is enabled for a connection */
-    u_char  uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */
-    u_int  t_uto;   /* implemented user timeout value */
+    u_int  t_rcvuto;			/* received user timeout value */
+    u_int  t_snduto;			/* send user timeout value */
+    u_char  rcv_uto_granularity:1;	/* received user timeout granularity */
+    u_char  snd_uto_granularity:1;	/* received user timeout granularity */
+    u_char  uto_enable:1;		/* flag controls whether the UTO option is enabled for a connection */
+    u_char  uto_changeable:1;		/* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */
+    u_char  uto_impl:1;			/* flag that controls whelther implement user timeout */
+    u_int  t_uto;			/* implemented user timeout value */
 };
 
 /*
@@ -230,7 +231,8 @@
 #define	TF_ECN_PERMIT	0x4000000	/* connection ECN-ready */
 #define	TF_ECN_SND_CWR	0x8000000	/* ECN CWR in queue */
 #define	TF_ECN_SND_ECE	0x10000000	/* ECN ECE in queue */
-#define TF_RCVD_UTO     0x20000000  /* a user timeout was received in SYN */
+#define TF_RCVD_UTO     0x20000000	/* a user timeout was received in SYN */
+#define TF_NEEDUTO      0x40000000	/* send user timeout */
 
 #define IN_FASTRECOVERY(tp)	(tp->t_flags & TF_FASTRECOVERY)
 #define ENTER_FASTRECOVERY(tp)	tp->t_flags |= TF_FASTRECOVERY
@@ -274,7 +276,7 @@
 #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		0x0200		/* user timeout (RFC5482) */
 	u_int32_t	to_tsval;	/* new timestamp */
 	u_int32_t	to_tsecr;	/* reflected timestamp */
 	u_int16_t	to_mss;		/* maximum segment size */
@@ -282,8 +284,8 @@
 	u_int8_t	to_nsacks;	/* number of SACK blocks */
 	u_char		*to_sacks;	/* pointer to the first SACK blocks */
 	u_char		*to_signature;	/* pointer to the TCP-MD5 signature */
-    u_int16_t   to_uto:15;  /* user timeout */
-    u_int16_t   to_granularity:1; /* user timeout granularity */
+	u_int16_t	to_granularity:1,/* user timeout granularity */
+			to_uto:15;	/* user timeout */
 };
 
 /*