Update to FreeBSD head 2018-04-01

Git mirror commit 8dfb1ccc26d1cea7e2529303003ff61f9f1784c4.

Update #3472.

1 files changed, 30 insertions, 6 deletions

diff --git a/freebsd/sys/netinet/tcp_var.h b/freebsd/sys/netinet/tcp_var.h
index 35b44410..f09bd19c 100644
--- a/freebsd/sys/netinet/tcp_var.h
+++ b/freebsd/sys/netinet/tcp_var.h
@@ -79,6 +79,8 @@ struct sackhint {
 	uint64_t	_pad[1];	/* TBD */
 };
 
+STAILQ_HEAD(tcp_log_stailq, tcp_log_mem);
+
 /*
  * Tcp control block, one per tcp; fields:
  * Organized for 16 byte cacheline efficiency.
@@ -189,12 +191,21 @@ struct tcpcb {
 	u_int	t_tsomaxsegcount;	/* TSO maximum segment count */
 	u_int	t_tsomaxsegsize;	/* TSO maximum segment size in bytes */
 	u_int	t_flags2;		/* More tcpcb flags storage */
+	int	t_logstate;		/* State of "black box" logging */
+	struct tcp_log_stailq t_logs;	/* Log buffer */
+	int	t_lognum;		/* Number of log entries */
+	uint32_t t_logsn;		/* Log "serial number" */
+	struct tcp_log_id_node *t_lin;
+	struct tcp_log_id_bucket *t_lib;
+	const char *t_output_caller;	/* Function that called tcp_output */
 	struct tcp_function_block *t_fb;/* TCP function call block */
 	void	*t_fb_ptr;		/* Pointer to t_fb specific data */
-#ifdef TCP_RFC7413
-	uint64_t t_tfo_cookie;		/* TCP Fast Open cookie */
-	unsigned int *t_tfo_pending;	/* TCP Fast Open pending counter */
-#endif
+	uint8_t t_tfo_client_cookie_len; /* TCP Fast Open client cookie length */
+	unsigned int *t_tfo_pending;	/* TCP Fast Open server pending counter */
+	union {
+		uint8_t client[TCP_FASTOPEN_MAX_COOKIE_LEN];
+		uint64_t server;
+	} t_tfo_cookie;			/* TCP Fast Open cookie to send */
 #ifdef TCPPCAP
 	struct mbufq t_inpkts;		/* List of saved input packets. */
 	struct mbufq t_outpkts;		/* List of saved output packets. */
@@ -265,6 +276,7 @@ struct tcp_function_block {
 	int	(*tfb_tcp_handoff_ok)(struct tcpcb *);
 	volatile uint32_t tfb_refcnt;
 	uint32_t  tfb_flags;
+	uint8_t	tfb_id;
 };
 
 struct tcp_function {
@@ -337,11 +349,12 @@ TAILQ_HEAD(tcp_funchead, tcp_function);
 #define	TCPOOB_HADDATA	0x02
 
 /*
- * Flags for PLPMTU handling, t_flags2
+ * Flags for the extended TCP flags field, t_flags2
  */
 #define	TF2_PLPMTU_BLACKHOLE	0x00000001 /* Possible PLPMTUD Black Hole. */
 #define	TF2_PLPMTU_PMTUD	0x00000002 /* Allowed to attempt PLPMTUD. */
 #define	TF2_PLPMTU_MAXSEGSNT	0x00000004 /* Last seg sent was full seg. */
+#define	TF2_LOG_AUTO		0x00000008 /* Session is auto-logging. */
 
 /*
  * Structure to hold TCP options that are only used during segment
@@ -365,7 +378,7 @@ struct tcpopt {
 	u_int32_t	to_tsecr;	/* reflected timestamp */
 	u_char		*to_sacks;	/* pointer to the first SACK blocks */
 	u_char		*to_signature;	/* pointer to the TCP-MD5 signature */
-	u_char		*to_tfo_cookie; /* pointer to the TFO cookie */
+	u_int8_t	*to_tfo_cookie; /* pointer to the TFO cookie */
 	u_int16_t	to_mss;		/* maximum segment size */
 	u_int8_t	to_wscale;	/* window scaling */
 	u_int8_t	to_nsacks;	/* number of SACK blocks */
@@ -652,6 +665,7 @@ struct xtcpcb {
 	size_t		xt_len;		/* length of this structure */
 	struct xinpcb	xt_inp;
 	char		xt_stack[TCP_FUNCTION_NAME_LEN_MAX];	/* (s) */
+	char		xt_logid[TCP_LOG_ID_LEN];	/* (s) */
 	int64_t		spare64[8];
 	int32_t		t_state;		/* (s,p) */
 	uint32_t	t_flags;		/* (s,p) */
@@ -664,14 +678,24 @@ struct xtcpcb {
 	int32_t		tt_keep;		/* (s) */
 	int32_t		tt_2msl;		/* (s) */
 	int32_t		tt_delack;		/* (s) */
+	int32_t		t_logstate;		/* (3) */
 	int32_t		spare32[32];
 } __aligned(8);
+
 #ifdef _KERNEL
 void	tcp_inptoxtp(const struct inpcb *, struct xtcpcb *);
 #endif
 #endif
 
 /*
+ * TCP function name-to-id mapping exported to user-land via sysctl(3).
+ */
+struct tcp_function_id {
+	uint8_t		tfi_id;
+	char		tfi_name[TCP_FUNCTION_NAME_LEN_MAX];
+};
+
+/*
  * Identifiers for TCP sysctl nodes
  */
 #define	TCPCTL_DO_RFC1323	1	/* use RFC-1323 extensions */