svn commit: r255759 - head/sys/netinet

Bjoern A. Zeeb bz at FreeBSD.org
Sat Sep 21 10:01:52 UTC 2013


Author: bz
Date: Sat Sep 21 10:01:51 2013
New Revision: 255759
URL: http://svnweb.freebsd.org/changeset/base/255759

Log:
  Introduce spares in the TCP syncache and timewait structures
  so that fixed TCP_SIGNATURE handling can later be merged.
  
  This is derived from follow-up work to SVN r183001 posted to
  net@ on Sep 13 2008.
  
  Approved by:	re (gjb)

Modified:
  head/sys/netinet/tcp_syncache.h
  head/sys/netinet/tcp_var.h

Modified: head/sys/netinet/tcp_syncache.h
==============================================================================
--- head/sys/netinet/tcp_syncache.h	Sat Sep 21 09:17:14 2013	(r255758)
+++ head/sys/netinet/tcp_syncache.h	Sat Sep 21 10:01:51 2013	(r255759)
@@ -75,6 +75,7 @@ struct syncache {
 	struct label	*sc_label;		/* MAC label reference */
 	struct ucred	*sc_cred;		/* cred cache for jail checks */
 
+	void		*sc_pspare;		/* TCP_SIGNATURE */
 	u_int32_t	sc_spare[2];		/* UTO */
 };
 

Modified: head/sys/netinet/tcp_var.h
==============================================================================
--- head/sys/netinet/tcp_var.h	Sat Sep 21 09:17:14 2013	(r255758)
+++ head/sys/netinet/tcp_var.h	Sat Sep 21 10:01:51 2013	(r255759)
@@ -211,7 +211,7 @@ struct tcpcb {
 	u_int	t_tsomax;		/* tso burst length limit */
 
 	uint32_t t_ispare[8];		/* 5 UTO, 3 TBD */
-	void	*t_pspare2[4];		/* 4 TBD */
+	void	*t_pspare2[4];		/* 1 TCP_SIGNATURE, 3 TBD */
 	uint64_t _pad[6];		/* 6 TBD (1-2 CC/RTT?) */
 };
 
@@ -353,6 +353,8 @@ struct tcptw {
 	u_int		t_starttime;
 	int		tw_time;
 	TAILQ_ENTRY(tcptw) tw_2msl;
+	void		*tw_pspare;	/* TCP_SIGNATURE */
+	u_int		*tw_spare;	/* TCP_SIGNATURE */
 };
 
 #define	intotcpcb(ip)	((struct tcpcb *)(ip)->inp_ppcb)


More information about the svn-src-head mailing list