Module Name: src
Committed By: maxv
Date: Sun Apr 29 12:12:42 UTC 2018
Modified Files:
src/sys/netinet: tcp_var.h tcpip.h
Log Message:
Move struct tcpiphdr from tcpip.h to tcp_var.h, to match UDP (udpiphdr in
udp_var.h).
tcpip.h is now empty, and can be removed.
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/sys/netinet/tcp_var.h
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/tcpip.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.185 src/sys/netinet/tcp_var.h:1.186
--- src/sys/netinet/tcp_var.h:1.185 Wed Mar 28 14:22:16 2018
+++ src/sys/netinet/tcp_var.h Sun Apr 29 12:12:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_var.h,v 1.185 2018/03/28 14:22:16 maxv Exp $ */
+/* $NetBSD: tcp_var.h,v 1.186 2018/04/29 12:12:42 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -142,7 +142,7 @@
#endif
/*
- * Kernel variables for tcp.
+ * TCP kernel structures and variables.
*/
#include <sys/callout.h>
@@ -163,6 +163,29 @@
#endif /* TCP_SIGNATURE */
/*
+ * Tcp+ip header, after ip options removed.
+ */
+struct tcpiphdr {
+ struct ipovly ti_i; /* overlaid ip structure */
+ struct tcphdr ti_t; /* tcp header */
+} __packed;
+#define ti_x1 ti_i.ih_x1
+#define ti_pr ti_i.ih_pr
+#define ti_len ti_i.ih_len
+#define ti_src ti_i.ih_src
+#define ti_dst ti_i.ih_dst
+#define ti_sport ti_t.th_sport
+#define ti_dport ti_t.th_dport
+#define ti_seq ti_t.th_seq
+#define ti_ack ti_t.th_ack
+#define ti_x2 ti_t.th_x2
+#define ti_off ti_t.th_off
+#define ti_flags ti_t.th_flags
+#define ti_win ti_t.th_win
+#define ti_sum ti_t.th_sum
+#define ti_urp ti_t.th_urp
+
+/*
* SACK option block.
*/
struct sackblk {
Index: src/sys/netinet/tcpip.h
diff -u src/sys/netinet/tcpip.h:1.11 src/sys/netinet/tcpip.h:1.12
--- src/sys/netinet/tcpip.h:1.11 Tue Dec 25 18:33:47 2007
+++ src/sys/netinet/tcpip.h Sun Apr 29 12:12:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcpip.h,v 1.11 2007/12/25 18:33:47 perry Exp $ */
+/* $NetBSD: tcpip.h,v 1.12 2018/04/29 12:12:42 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -34,27 +34,5 @@
#ifndef _NETINET_TCPIP_H_
#define _NETINET_TCPIP_H_
-/*
- * Tcp+ip header, after ip options removed.
- */
-struct tcpiphdr {
- struct ipovly ti_i; /* overlaid ip structure */
- struct tcphdr ti_t; /* tcp header */
-} __packed;
-#define ti_x1 ti_i.ih_x1
-#define ti_pr ti_i.ih_pr
-#define ti_len ti_i.ih_len
-#define ti_src ti_i.ih_src
-#define ti_dst ti_i.ih_dst
-#define ti_sport ti_t.th_sport
-#define ti_dport ti_t.th_dport
-#define ti_seq ti_t.th_seq
-#define ti_ack ti_t.th_ack
-#define ti_x2 ti_t.th_x2
-#define ti_off ti_t.th_off
-#define ti_flags ti_t.th_flags
-#define ti_win ti_t.th_win
-#define ti_sum ti_t.th_sum
-#define ti_urp ti_t.th_urp
#endif /* !_NETINET_TCPIP_H_ */
