Tue Dec 13 08:29:03 2016 UTC ()
Remove unnecessary inclusions of nd6.h


(ozaki-r)
diff -r1.9 -r1.10 src/sys/netinet/dccp_usrreq.c
diff -r1.5 -r1.6 src/sys/netinet/sctp_asconf.c
diff -r1.21 -r1.22 src/sys/netinet/tcp_congctl.c
diff -r1.32 -r1.33 src/sys/netinet/tcp_sack.c
diff -r1.16 -r1.17 src/sys/netinet/tcp_vtw.c
diff -r1.7 -r1.8 src/sys/netinet/tcp_vtw.h
diff -r1.9 -r1.10 src/sys/netinet6/dccp6_usrreq.c
diff -r1.154 -r1.155 src/sys/netinet6/in6_pcb.c
diff -r1.113 -r1.114 src/sys/netinet6/in6_proto.c
diff -r1.153 -r1.154 src/sys/netinet6/raw_ip6.c
diff -r1.10 -r1.11 src/sys/netinet6/sctp6_usrreq.c
cvs diff -r1.9 -r1.10 src/sys/netinet/dccp_usrreq.c (expand / switch to unified diff)

--- src/sys/netinet/dccp_usrreq.c 2016/07/07 06:55:43 1.9
+++ src/sys/netinet/dccp_usrreq.c 2016/12/13 08:29:03 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1/* $KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $ */ 1/* $KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $ */
2/* $NetBSD: dccp_usrreq.c,v 1.9 2016/07/07 06:55:43 msaitoh Exp $ */ 2/* $NetBSD: dccp_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson  5 * Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in the 15 * notice, this list of conditions and the following disclaimer in the
@@ -57,27 +57,27 @@ @@ -57,27 +57,27 @@
57 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 57 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
58 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 58 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
59 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 59 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
60 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 60 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
61 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 61 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
62 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 62 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
63 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 63 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
64 * SUCH DAMAGE. 64 * SUCH DAMAGE.
65 * 65 *
66 * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 66 * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
67 */ 67 */
68 68
69#include <sys/cdefs.h> 69#include <sys/cdefs.h>
70__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.9 2016/07/07 06:55:43 msaitoh Exp $"); 70__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $");
71 71
72#ifdef _KERNEL_OPT 72#ifdef _KERNEL_OPT
73#include "opt_inet.h" 73#include "opt_inet.h"
74#include "opt_dccp.h" 74#include "opt_dccp.h"
75#endif 75#endif
76 76
77#include <sys/param.h> 77#include <sys/param.h>
78#include <sys/systm.h> 78#include <sys/systm.h>
79#include <sys/domain.h> 79#include <sys/domain.h>
80#include <sys/kernel.h> 80#include <sys/kernel.h>
81#include <sys/pool.h> 81#include <sys/pool.h>
82#include <sys/lock.h> 82#include <sys/lock.h>
83#include <sys/malloc.h> 83#include <sys/malloc.h>
@@ -98,27 +98,26 @@ __KERNEL_RCSID(0, "$NetBSD: dccp_usrreq. @@ -98,27 +98,26 @@ __KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.
98#include <netinet/in_systm.h> 98#include <netinet/in_systm.h>
99#include <netinet/ip.h> 99#include <netinet/ip.h>
100#include <netinet/in_pcb.h> 100#include <netinet/in_pcb.h>
101#include <netinet/in_var.h> 101#include <netinet/in_var.h>
102#ifdef INET6 102#ifdef INET6
103#include <netinet/ip6.h> 103#include <netinet/ip6.h>
104#endif 104#endif
105#include <netinet/ip_icmp.h> 105#include <netinet/ip_icmp.h>
106#include <netinet/icmp_var.h> 106#include <netinet/icmp_var.h>
107#include <netinet/ip_var.h> 107#include <netinet/ip_var.h>
108#ifdef INET6 108#ifdef INET6
109#include <netinet6/in6_pcb.h> 109#include <netinet6/in6_pcb.h>
110#include <netinet6/ip6_var.h> 110#include <netinet6/ip6_var.h>
111#include <netinet6/nd6.h> 
112#include <netinet6/dccp6_var.h> 111#include <netinet6/dccp6_var.h>
113#endif 112#endif
114#include <netinet/dccp.h> 113#include <netinet/dccp.h>
115#include <netinet/dccp_var.h> 114#include <netinet/dccp_var.h>
116#include <netinet/dccp_cc_sw.h> 115#include <netinet/dccp_cc_sw.h>
117 116
118#define DEFAULT_CCID 2 117#define DEFAULT_CCID 2
119 118
120#define INP_INFO_LOCK_INIT(x,y) 119#define INP_INFO_LOCK_INIT(x,y)
121#define INP_INFO_WLOCK(x) 120#define INP_INFO_WLOCK(x)
122#define INP_INFO_WUNLOCK(x) 121#define INP_INFO_WUNLOCK(x)
123#define INP_INFO_RLOCK(x) 122#define INP_INFO_RLOCK(x)
124#define INP_INFO_RUNLOCK(x) 123#define INP_INFO_RUNLOCK(x)
cvs diff -r1.5 -r1.6 src/sys/netinet/sctp_asconf.c (expand / switch to unified diff)

--- src/sys/netinet/sctp_asconf.c 2016/07/07 09:32:02 1.5
+++ src/sys/netinet/sctp_asconf.c 2016/12/13 08:29:03 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sctp_asconf.c,v 1.5 2016/07/07 09:32:02 ozaki-r Exp $ */ 1/* $NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $ */
2/* $KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $ */ 2/* $KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. 5 * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS AND CONTRIBUTORS ``AS IS'' AND 20 * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS AND CONTRIBUTORS ``AS IS'' AND
21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS OR CONTRIBUTORS BE LIABLE 23 * ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE. 30 * SUCH DAMAGE.
31 */ 31 */
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.5 2016/07/07 09:32:02 ozaki-r Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $");
34 34
35#ifdef _KERNEL_OPT 35#ifdef _KERNEL_OPT
36#include "opt_ipsec.h" 36#include "opt_ipsec.h"
37#include "opt_inet.h" 37#include "opt_inet.h"
38#include "opt_sctp.h" 38#include "opt_sctp.h"
39#endif /* _KERNEL_OPT */ 39#endif /* _KERNEL_OPT */
40 40
41#include <sys/param.h> 41#include <sys/param.h>
42#include <sys/systm.h> 42#include <sys/systm.h>
43#include <sys/malloc.h> 43#include <sys/malloc.h>
44#include <sys/mbuf.h> 44#include <sys/mbuf.h>
45#include <sys/socket.h> 45#include <sys/socket.h>
46#include <sys/socketvar.h> 46#include <sys/socketvar.h>
@@ -53,27 +53,26 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_asconf. @@ -53,27 +53,26 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_asconf.
53 53
54#include <netinet/in.h> 54#include <netinet/in.h>
55#include <netinet/in_systm.h> 55#include <netinet/in_systm.h>
56#include <netinet/ip.h> 56#include <netinet/ip.h>
57#include <netinet/in_pcb.h> 57#include <netinet/in_pcb.h>
58#include <netinet/in_var.h> 58#include <netinet/in_var.h>
59#include <netinet/ip_var.h> 59#include <netinet/ip_var.h>
60 60
61#ifdef INET6 61#ifdef INET6
62#include <netinet/ip6.h> 62#include <netinet/ip6.h>
63#include <netinet6/ip6_var.h> 63#include <netinet6/ip6_var.h>
64#include <netinet6/in6_pcb.h> 64#include <netinet6/in6_pcb.h>
65#include <netinet/icmp6.h> 65#include <netinet/icmp6.h>
66#include <netinet6/nd6.h> 
67#include <netinet6/scope6_var.h> 66#include <netinet6/scope6_var.h>
68#endif /* INET6 */ 67#endif /* INET6 */
69 68
70#include <netinet/in_pcb.h> 69#include <netinet/in_pcb.h>
71 70
72#include <netinet/sctp_var.h> 71#include <netinet/sctp_var.h>
73#include <netinet/sctp_pcb.h> 72#include <netinet/sctp_pcb.h>
74#include <netinet/sctp_header.h> 73#include <netinet/sctp_header.h>
75#include <netinet/sctputil.h> 74#include <netinet/sctputil.h>
76#include <netinet/sctp_output.h> 75#include <netinet/sctp_output.h>
77#include <netinet/sctp_asconf.h> 76#include <netinet/sctp_asconf.h>
78 77
79/* 78/*
cvs diff -r1.21 -r1.22 src/sys/netinet/tcp_congctl.c (expand / switch to unified diff)

--- src/sys/netinet/tcp_congctl.c 2016/04/26 08:44:44 1.21
+++ src/sys/netinet/tcp_congctl.c 2016/12/13 08:29:03 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $ */ 1/* $NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc. 4 * Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe and Kevin M. Lahey of the Numerical Aerospace Simulation 8 * by Jason R. Thorpe and Kevin M. Lahey of the Numerical Aerospace Simulation
9 * Facility, NASA Ames Research Center. 9 * Facility, NASA Ames Research Center.
10 * This code is derived from software contributed to The NetBSD Foundation 10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Charles M. Hannum. 11 * by Charles M. Hannum.
12 * This code is derived from software contributed to The NetBSD Foundation 12 * This code is derived from software contributed to The NetBSD Foundation
13 * by Rui Paulo. 13 * by Rui Paulo.
14 * 14 *
@@ -125,27 +125,27 @@ @@ -125,27 +125,27 @@
125 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 125 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
126 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 126 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
127 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 127 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
128 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 128 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
129 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 129 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
130 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 130 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
131 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 131 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
132 * SUCH DAMAGE. 132 * SUCH DAMAGE.
133 * 133 *
134 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 134 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95
135 */ 135 */
136 136
137#include <sys/cdefs.h> 137#include <sys/cdefs.h>
138__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $"); 138__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $");
139 139
140#ifdef _KERNEL_OPT 140#ifdef _KERNEL_OPT
141#include "opt_inet.h" 141#include "opt_inet.h"
142#include "opt_tcp_debug.h" 142#include "opt_tcp_debug.h"
143#include "opt_tcp_congctl.h" 143#include "opt_tcp_congctl.h"
144#endif 144#endif
145 145
146#include <sys/param.h> 146#include <sys/param.h>
147#include <sys/systm.h> 147#include <sys/systm.h>
148#include <sys/malloc.h> 148#include <sys/malloc.h>
149#include <sys/mbuf.h> 149#include <sys/mbuf.h>
150#include <sys/protosw.h> 150#include <sys/protosw.h>
151#include <sys/socket.h> 151#include <sys/socket.h>
@@ -166,27 +166,26 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_congctl. @@ -166,27 +166,26 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_congctl.
166#include <netinet/in_var.h> 166#include <netinet/in_var.h>
167#include <netinet/ip_var.h> 167#include <netinet/ip_var.h>
168 168
169#ifdef INET6 169#ifdef INET6
170#ifndef INET 170#ifndef INET
171#include <netinet/in.h> 171#include <netinet/in.h>
172#endif 172#endif
173#include <netinet/ip6.h> 173#include <netinet/ip6.h>
174#include <netinet6/ip6_var.h> 174#include <netinet6/ip6_var.h>
175#include <netinet6/in6_pcb.h> 175#include <netinet6/in6_pcb.h>
176#include <netinet6/ip6_var.h> 176#include <netinet6/ip6_var.h>
177#include <netinet6/in6_var.h> 177#include <netinet6/in6_var.h>
178#include <netinet/icmp6.h> 178#include <netinet/icmp6.h>
179#include <netinet6/nd6.h> 
180#endif 179#endif
181 180
182#include <netinet/tcp.h> 181#include <netinet/tcp.h>
183#include <netinet/tcp_fsm.h> 182#include <netinet/tcp_fsm.h>
184#include <netinet/tcp_seq.h> 183#include <netinet/tcp_seq.h>
185#include <netinet/tcp_timer.h> 184#include <netinet/tcp_timer.h>
186#include <netinet/tcp_var.h> 185#include <netinet/tcp_var.h>
187#include <netinet/tcpip.h> 186#include <netinet/tcpip.h>
188#include <netinet/tcp_congctl.h> 187#include <netinet/tcp_congctl.h>
189#ifdef TCP_DEBUG 188#ifdef TCP_DEBUG
190#include <netinet/tcp_debug.h> 189#include <netinet/tcp_debug.h>
191#endif 190#endif
192 191
cvs diff -r1.32 -r1.33 src/sys/netinet/tcp_sack.c (expand / switch to unified diff)

--- src/sys/netinet/tcp_sack.c 2015/08/24 22:21:26 1.32
+++ src/sys/netinet/tcp_sack.c 2016/12/13 08:29:03 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $ */ 1/* $NetBSD: tcp_sack.c,v 1.33 2016/12/13 08:29:03 ozaki-r Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 The NetBSD Foundation, Inc. 4 * Copyright (c) 2005 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Kentaro A. Kurahone. 8 * by Kentaro A. Kurahone.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -92,27 +92,27 @@ @@ -92,27 +92,27 @@
92 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 92 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
93 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 93 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
94 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 94 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
95 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 95 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
96 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 96 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
97 * 97 *
98 * The views and conclusions contained in the software and documentation 98 * The views and conclusions contained in the software and documentation
99 * are those of the authors and should not be interpreted as representing 99 * are those of the authors and should not be interpreted as representing
100 * official policies, either expressed or implied, of the US Naval 100 * official policies, either expressed or implied, of the US Naval
101 * Research Laboratory (NRL). 101 * Research Laboratory (NRL).
102 */ 102 */
103 103
104#include <sys/cdefs.h> 104#include <sys/cdefs.h>
105__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $"); 105__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.33 2016/12/13 08:29:03 ozaki-r Exp $");
106 106
107#ifdef _KERNEL_OPT 107#ifdef _KERNEL_OPT
108#include "opt_inet.h" 108#include "opt_inet.h"
109#include "opt_inet_csum.h" 109#include "opt_inet_csum.h"
110#include "opt_tcp_debug.h" 110#include "opt_tcp_debug.h"
111#include "opt_ddb.h" 111#include "opt_ddb.h"
112#endif 112#endif
113 113
114#include <sys/param.h> 114#include <sys/param.h>
115#include <sys/systm.h> 115#include <sys/systm.h>
116#include <sys/mbuf.h> 116#include <sys/mbuf.h>
117#include <sys/protosw.h> 117#include <sys/protosw.h>
118#include <sys/socket.h> 118#include <sys/socket.h>
@@ -134,27 +134,26 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v @@ -134,27 +134,26 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v
134#include <netinet/in_var.h> 134#include <netinet/in_var.h>
135#include <netinet/ip_var.h> 135#include <netinet/ip_var.h>
136 136
137#ifdef INET6 137#ifdef INET6
138#ifndef INET 138#ifndef INET
139#include <netinet/in.h> 139#include <netinet/in.h>
140#endif 140#endif
141#include <netinet/ip6.h> 141#include <netinet/ip6.h>
142#include <netinet6/ip6_var.h> 142#include <netinet6/ip6_var.h>
143#include <netinet6/in6_pcb.h> 143#include <netinet6/in6_pcb.h>
144#include <netinet6/ip6_var.h> 144#include <netinet6/ip6_var.h>
145#include <netinet6/in6_var.h> 145#include <netinet6/in6_var.h>
146#include <netinet/icmp6.h> 146#include <netinet/icmp6.h>
147#include <netinet6/nd6.h> 
148#endif 147#endif
149 148
150#ifndef INET6 149#ifndef INET6
151/* always need ip6.h for IP6_EXTHDR_GET */ 150/* always need ip6.h for IP6_EXTHDR_GET */
152#include <netinet/ip6.h> 151#include <netinet/ip6.h>
153#endif 152#endif
154 153
155#include <netinet/tcp.h> 154#include <netinet/tcp.h>
156#include <netinet/tcp_fsm.h> 155#include <netinet/tcp_fsm.h>
157#include <netinet/tcp_seq.h> 156#include <netinet/tcp_seq.h>
158#include <netinet/tcp_timer.h> 157#include <netinet/tcp_timer.h>
159#include <netinet/tcp_var.h> 158#include <netinet/tcp_var.h>
160#include <netinet/tcpip.h> 159#include <netinet/tcpip.h>
cvs diff -r1.16 -r1.17 src/sys/netinet/tcp_vtw.c (expand / switch to unified diff)

--- src/sys/netinet/tcp_vtw.c 2016/07/28 07:54:31 1.16
+++ src/sys/netinet/tcp_vtw.c 2016/12/13 08:29:03 1.17
@@ -101,39 +101,38 @@ @@ -101,39 +101,38 @@
101#include <netinet/in.h> 101#include <netinet/in.h>
102#include <netinet/in_systm.h> 102#include <netinet/in_systm.h>
103#include <netinet/ip.h> 103#include <netinet/ip.h>
104#include <netinet/in_pcb.h> 104#include <netinet/in_pcb.h>
105#include <netinet/in_var.h> 105#include <netinet/in_var.h>
106#include <netinet/ip_var.h> 106#include <netinet/ip_var.h>
107#include <netinet/in_offload.h> 107#include <netinet/in_offload.h>
108#include <netinet/ip6.h> 108#include <netinet/ip6.h>
109#include <netinet6/ip6_var.h> 109#include <netinet6/ip6_var.h>
110#include <netinet6/in6_pcb.h> 110#include <netinet6/in6_pcb.h>
111#include <netinet6/ip6_var.h> 111#include <netinet6/ip6_var.h>
112#include <netinet6/in6_var.h> 112#include <netinet6/in6_var.h>
113#include <netinet/icmp6.h> 113#include <netinet/icmp6.h>
114#include <netinet6/nd6.h> 
115 114
116#include <netinet/tcp.h> 115#include <netinet/tcp.h>
117#include <netinet/tcp_fsm.h> 116#include <netinet/tcp_fsm.h>
118#include <netinet/tcp_seq.h> 117#include <netinet/tcp_seq.h>
119#include <netinet/tcp_timer.h> 118#include <netinet/tcp_timer.h>
120#include <netinet/tcp_var.h> 119#include <netinet/tcp_var.h>
121#include <netinet/tcp_private.h> 120#include <netinet/tcp_private.h>
122#include <netinet/tcpip.h> 121#include <netinet/tcpip.h>
123 122
124#include <netinet/tcp_vtw.h> 123#include <netinet/tcp_vtw.h>
125 124
126__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.16 2016/07/28 07:54:31 martin Exp $"); 125__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.17 2016/12/13 08:29:03 ozaki-r Exp $");
127 126
128#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0) 127#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
129 128
130static void vtw_debug_init(void); 129static void vtw_debug_init(void);
131 130
132fatp_ctl_t fat_tcpv4; 131fatp_ctl_t fat_tcpv4;
133fatp_ctl_t fat_tcpv6; 132fatp_ctl_t fat_tcpv6;
134vtw_ctl_t vtw_tcpv4[VTW_NCLASS]; 133vtw_ctl_t vtw_tcpv4[VTW_NCLASS];
135vtw_ctl_t vtw_tcpv6[VTW_NCLASS]; 134vtw_ctl_t vtw_tcpv6[VTW_NCLASS];
136vtw_stats_t vtw_stats; 135vtw_stats_t vtw_stats;
137 136
138/* We provide state for the lookup_ports iterator. 137/* We provide state for the lookup_ports iterator.
139 * As currently we are netlock-protected, there is one. 138 * As currently we are netlock-protected, there is one.
cvs diff -r1.7 -r1.8 src/sys/netinet/tcp_vtw.h (expand / switch to unified diff)

--- src/sys/netinet/tcp_vtw.h 2016/04/26 08:44:45 1.7
+++ src/sys/netinet/tcp_vtw.h 2016/12/13 08:29:03 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: tcp_vtw.h,v 1.7 2016/04/26 08:44:45 ozaki-r Exp $ */ 1/* $NetBSD: tcp_vtw.h,v 1.8 2016/12/13 08:29:03 ozaki-r Exp $ */
2/* 2/*
3 * Copyright (c) 2011 The NetBSD Foundation, Inc. 3 * Copyright (c) 2011 The NetBSD Foundation, Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to The NetBSD Foundation 6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Coyote Point Systems, Inc. 7 * by Coyote Point Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -133,27 +133,26 @@ @@ -133,27 +133,26 @@
133#include <netinet/in_var.h> 133#include <netinet/in_var.h>
134#include <netinet/ip_var.h> 134#include <netinet/ip_var.h>
135#include <netinet/in.h> 135#include <netinet/in.h>
136#include <netinet/tcp.h> 136#include <netinet/tcp.h>
137#include <netinet/tcp_timer.h> 137#include <netinet/tcp_timer.h>
138#include <netinet/tcp_var.h> 138#include <netinet/tcp_var.h>
139#include <netinet6/in6.h> 139#include <netinet6/in6.h>
140#include <netinet/ip6.h> 140#include <netinet/ip6.h>
141#include <netinet6/ip6_var.h> 141#include <netinet6/ip6_var.h>
142#include <netinet6/in6_pcb.h> 142#include <netinet6/in6_pcb.h>
143#include <netinet6/ip6_var.h> 143#include <netinet6/ip6_var.h>
144#include <netinet6/in6_var.h> 144#include <netinet6/in6_var.h>
145#include <netinet/icmp6.h> 145#include <netinet/icmp6.h>
146#include <netinet6/nd6.h> 
147 146
148#define VTW_NCLASS (1+3) /* # different classes */ 147#define VTW_NCLASS (1+3) /* # different classes */
149 148
150/* 149/*
151 * fat pointers, MI. 150 * fat pointers, MI.
152 */ 151 */
153struct fatp_mi; 152struct fatp_mi;
154 153
155typedef uint32_t fatp_word_t; 154typedef uint32_t fatp_word_t;
156 155
157typedef struct fatp_mi fatp_t; 156typedef struct fatp_mi fatp_t;
158 157
159/* Supported cacheline sizes: 32 64 128 bytes. See fatp_key(), 158/* Supported cacheline sizes: 32 64 128 bytes. See fatp_key(),
cvs diff -r1.9 -r1.10 src/sys/netinet6/dccp6_usrreq.c (expand / switch to unified diff)

--- src/sys/netinet6/dccp6_usrreq.c 2016/11/18 06:50:04 1.9
+++ src/sys/netinet6/dccp6_usrreq.c 2016/12/13 08:29:03 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1/* $KAME: dccp6_usrreq.c,v 1.13 2005/07/27 08:42:56 nishida Exp $ */ 1/* $KAME: dccp6_usrreq.c,v 1.13 2005/07/27 08:42:56 nishida Exp $ */
2/* $NetBSD: dccp6_usrreq.c,v 1.9 2016/11/18 06:50:04 knakahara Exp $ */ 2/* $NetBSD: dccp6_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $ */
3 3
4/* 4/*
5 * Copyright (C) 2003 WIDE Project. 5 * Copyright (C) 2003 WIDE Project.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
@@ -21,27 +21,27 @@ @@ -21,27 +21,27 @@
21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE. 30 * SUCH DAMAGE.
31 */ 31 */
32 32
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.9 2016/11/18 06:50:04 knakahara Exp $"); 34__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $");
35 35
36#ifdef _KERNEL_OPT 36#ifdef _KERNEL_OPT
37#include "opt_inet.h" 37#include "opt_inet.h"
38#include "opt_dccp.h" 38#include "opt_dccp.h"
39#include "opt_net_mpsafe.h" 39#include "opt_net_mpsafe.h"
40#endif 40#endif
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/domain.h> 44#include <sys/domain.h>
45#include <sys/kernel.h> 45#include <sys/kernel.h>
46#include <sys/pool.h> 46#include <sys/pool.h>
47#include <sys/lock.h> 47#include <sys/lock.h>
@@ -60,27 +60,26 @@ __KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq @@ -60,27 +60,26 @@ __KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq
60#include <net/if.h> 60#include <net/if.h>
61 61
62#include <netinet/in.h> 62#include <netinet/in.h>
63#include <netinet/in_systm.h> 63#include <netinet/in_systm.h>
64#include <netinet/ip.h> 64#include <netinet/ip.h>
65#include <netinet/in_pcb.h> 65#include <netinet/in_pcb.h>
66#include <netinet/in_var.h> 66#include <netinet/in_var.h>
67#include <netinet/ip6.h> 67#include <netinet/ip6.h>
68#include <netinet/ip_icmp.h> 68#include <netinet/ip_icmp.h>
69#include <netinet/icmp_var.h> 69#include <netinet/icmp_var.h>
70#include <netinet/ip_var.h> 70#include <netinet/ip_var.h>
71#include <netinet6/in6_pcb.h> 71#include <netinet6/in6_pcb.h>
72#include <netinet6/ip6_var.h> 72#include <netinet6/ip6_var.h>
73#include <netinet6/nd6.h> 
74#include <netinet/dccp.h> 73#include <netinet/dccp.h>
75#include <netinet/dccp_var.h> 74#include <netinet/dccp_var.h>
76#include <netinet6/dccp6_var.h> 75#include <netinet6/dccp6_var.h>
77#include <netinet/dccp_cc_sw.h> 76#include <netinet/dccp_cc_sw.h>
78 77
79#if !defined(__FreeBSD__) || __FreeBSD_version < 500000 78#if !defined(__FreeBSD__) || __FreeBSD_version < 500000
80#define INP_INFO_LOCK_INIT(x,y) 79#define INP_INFO_LOCK_INIT(x,y)
81#define INP_INFO_WLOCK(x) 80#define INP_INFO_WLOCK(x)
82#define INP_INFO_WUNLOCK(x) 81#define INP_INFO_WUNLOCK(x)
83#define INP_INFO_RLOCK(x) 82#define INP_INFO_RLOCK(x)
84#define INP_INFO_RUNLOCK(x) 83#define INP_INFO_RUNLOCK(x)
85#define INP_LOCK(x) 84#define INP_LOCK(x)
86#define INP_UNLOCK(x) 85#define INP_UNLOCK(x)
cvs diff -r1.154 -r1.155 src/sys/netinet6/in6_pcb.c (expand / switch to unified diff)

--- src/sys/netinet6/in6_pcb.c 2016/12/12 03:55:57 1.154
+++ src/sys/netinet6/in6_pcb.c 2016/12/13 08:29:03 1.155
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: in6_pcb.c,v 1.154 2016/12/12 03:55:57 ozaki-r Exp $ */ 1/* $NetBSD: in6_pcb.c,v 1.155 2016/12/13 08:29:03 ozaki-r Exp $ */
2/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */ 2/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
3 3
4/* 4/*
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -52,27 +52,27 @@ @@ -52,27 +52,27 @@
52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 * SUCH DAMAGE. 59 * SUCH DAMAGE.
60 * 60 *
61 * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94 61 * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94
62 */ 62 */
63 63
64#include <sys/cdefs.h> 64#include <sys/cdefs.h>
65__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.154 2016/12/12 03:55:57 ozaki-r Exp $"); 65__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.155 2016/12/13 08:29:03 ozaki-r Exp $");
66 66
67#ifdef _KERNEL_OPT 67#ifdef _KERNEL_OPT
68#include "opt_inet.h" 68#include "opt_inet.h"
69#include "opt_ipsec.h" 69#include "opt_ipsec.h"
70#endif 70#endif
71 71
72#include <sys/param.h> 72#include <sys/param.h>
73#include <sys/systm.h> 73#include <sys/systm.h>
74#include <sys/mbuf.h> 74#include <sys/mbuf.h>
75#include <sys/protosw.h> 75#include <sys/protosw.h>
76#include <sys/socket.h> 76#include <sys/socket.h>
77#include <sys/socketvar.h> 77#include <sys/socketvar.h>
78#include <sys/ioctl.h> 78#include <sys/ioctl.h>
@@ -86,27 +86,26 @@ __KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v  @@ -86,27 +86,26 @@ __KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v
86#include <net/if.h> 86#include <net/if.h>
87#include <net/route.h> 87#include <net/route.h>
88 88
89#include <netinet/in.h> 89#include <netinet/in.h>
90#include <netinet/in_var.h> 90#include <netinet/in_var.h>
91#include <netinet/in_systm.h> 91#include <netinet/in_systm.h>
92#include <netinet/ip.h> 92#include <netinet/ip.h>
93#include <netinet/in_pcb.h> 93#include <netinet/in_pcb.h>
94#include <netinet/ip6.h> 94#include <netinet/ip6.h>
95#include <netinet/portalgo.h> 95#include <netinet/portalgo.h>
96#include <netinet6/ip6_var.h> 96#include <netinet6/ip6_var.h>
97#include <netinet6/in6_pcb.h> 97#include <netinet6/in6_pcb.h>
98#include <netinet6/scope6_var.h> 98#include <netinet6/scope6_var.h>
99#include <netinet6/nd6.h> 
100 99
101#include "faith.h" 100#include "faith.h"
102 101
103#ifdef IPSEC 102#ifdef IPSEC
104#include <netipsec/ipsec.h> 103#include <netipsec/ipsec.h>
105#include <netipsec/ipsec6.h> 104#include <netipsec/ipsec6.h>
106#include <netipsec/key.h> 105#include <netipsec/key.h>
107#endif /* IPSEC */ 106#endif /* IPSEC */
108 107
109#include <netinet/tcp_vtw.h> 108#include <netinet/tcp_vtw.h>
110 109
111const struct in6_addr zeroin6_addr; 110const struct in6_addr zeroin6_addr;
112 111
cvs diff -r1.113 -r1.114 src/sys/netinet6/in6_proto.c (expand / switch to unified diff)

--- src/sys/netinet6/in6_proto.c 2016/07/06 10:49:49 1.113
+++ src/sys/netinet6/in6_proto.c 2016/12/13 08:29:03 1.114
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: in6_proto.c,v 1.113 2016/07/06 10:49:49 ozaki-r Exp $ */ 1/* $NetBSD: in6_proto.c,v 1.114 2016/12/13 08:29:03 ozaki-r Exp $ */
2/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ 2/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
3 3
4/* 4/*
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -52,27 +52,27 @@ @@ -52,27 +52,27 @@
52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 * SUCH DAMAGE. 59 * SUCH DAMAGE.
60 * 60 *
61 * @(#)in_proto.c 8.1 (Berkeley) 6/10/93 61 * @(#)in_proto.c 8.1 (Berkeley) 6/10/93
62 */ 62 */
63 63
64#include <sys/cdefs.h> 64#include <sys/cdefs.h>
65__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.113 2016/07/06 10:49:49 ozaki-r Exp $"); 65__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.114 2016/12/13 08:29:03 ozaki-r Exp $");
66 66
67#ifdef _KERNEL_OPT 67#ifdef _KERNEL_OPT
68#include "opt_gateway.h" 68#include "opt_gateway.h"
69#include "opt_inet.h" 69#include "opt_inet.h"
70#include "opt_ipsec.h" 70#include "opt_ipsec.h"
71#include "opt_dccp.h" 71#include "opt_dccp.h"
72#include "opt_sctp.h" 72#include "opt_sctp.h"
73#endif 73#endif
74 74
75#include <sys/param.h> 75#include <sys/param.h>
76#include <sys/socket.h> 76#include <sys/socket.h>
77#include <sys/protosw.h> 77#include <sys/protosw.h>
78#include <sys/kernel.h> 78#include <sys/kernel.h>
@@ -109,28 +109,26 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c, @@ -109,28 +109,26 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c,
109#include <netinet/dccp_var.h> 109#include <netinet/dccp_var.h>
110#include <netinet6/dccp6_var.h> 110#include <netinet6/dccp6_var.h>
111#endif 111#endif
112 112
113#ifdef SCTP 113#ifdef SCTP
114#include <netinet/sctp_pcb.h> 114#include <netinet/sctp_pcb.h>
115#include <netinet/sctp.h> 115#include <netinet/sctp.h>
116#include <netinet/sctp_var.h> 116#include <netinet/sctp_var.h>
117#include <netinet6/sctp6_var.h> 117#include <netinet6/sctp6_var.h>
118#endif 118#endif
119 119
120#include <netinet6/pim6_var.h> 120#include <netinet6/pim6_var.h>
121 121
122#include <netinet6/nd6.h> 
123 
124#ifdef IPSEC 122#ifdef IPSEC
125#include <netipsec/ipsec.h> 123#include <netipsec/ipsec.h>
126#include <netipsec/ipsec6.h> 124#include <netipsec/ipsec6.h>
127#include <netipsec/key.h> 125#include <netipsec/key.h>
128#endif /* IPSEC */ 126#endif /* IPSEC */
129 127
130 128
131#include "carp.h" 129#include "carp.h"
132#if NCARP > 0 130#if NCARP > 0
133#include <netinet/ip_carp.h> 131#include <netinet/ip_carp.h>
134#endif 132#endif
135 133
136#include "etherip.h" 134#include "etherip.h"
cvs diff -r1.153 -r1.154 src/sys/netinet6/raw_ip6.c (expand / switch to unified diff)

--- src/sys/netinet6/raw_ip6.c 2016/11/18 06:50:04 1.153
+++ src/sys/netinet6/raw_ip6.c 2016/12/13 08:29:03 1.154
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: raw_ip6.c,v 1.153 2016/11/18 06:50:04 knakahara Exp $ */ 1/* $NetBSD: raw_ip6.c,v 1.154 2016/12/13 08:29:03 ozaki-r Exp $ */
2/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */ 2/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
3 3
4/* 4/*
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -52,27 +52,27 @@ @@ -52,27 +52,27 @@
52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 * SUCH DAMAGE. 59 * SUCH DAMAGE.
60 * 60 *
61 * @(#)raw_ip.c 8.2 (Berkeley) 1/4/94 61 * @(#)raw_ip.c 8.2 (Berkeley) 1/4/94
62 */ 62 */
63 63
64#include <sys/cdefs.h> 64#include <sys/cdefs.h>
65__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.153 2016/11/18 06:50:04 knakahara Exp $"); 65__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.154 2016/12/13 08:29:03 ozaki-r Exp $");
66 66
67#ifdef _KERNEL_OPT 67#ifdef _KERNEL_OPT
68#include "opt_ipsec.h" 68#include "opt_ipsec.h"
69#include "opt_net_mpsafe.h" 69#include "opt_net_mpsafe.h"
70#endif 70#endif
71 71
72#include <sys/param.h> 72#include <sys/param.h>
73#include <sys/sysctl.h> 73#include <sys/sysctl.h>
74#include <sys/mbuf.h> 74#include <sys/mbuf.h>
75#include <sys/socket.h> 75#include <sys/socket.h>
76#include <sys/protosw.h> 76#include <sys/protosw.h>
77#include <sys/socketvar.h> 77#include <sys/socketvar.h>
78#include <sys/systm.h> 78#include <sys/systm.h>
@@ -83,27 +83,26 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v  @@ -83,27 +83,26 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v
83#include <net/if.h> 83#include <net/if.h>
84#include <net/if_types.h> 84#include <net/if_types.h>
85#include <net/net_stats.h> 85#include <net/net_stats.h>
86 86
87#include <netinet/in.h> 87#include <netinet/in.h>
88#include <netinet/in_var.h> 88#include <netinet/in_var.h>
89#include <netinet/ip6.h> 89#include <netinet/ip6.h>
90#include <netinet6/ip6_var.h> 90#include <netinet6/ip6_var.h>
91#include <netinet6/ip6_private.h> 91#include <netinet6/ip6_private.h>
92#include <netinet6/ip6_mroute.h> 92#include <netinet6/ip6_mroute.h>
93#include <netinet/icmp6.h> 93#include <netinet/icmp6.h>
94#include <netinet6/icmp6_private.h> 94#include <netinet6/icmp6_private.h>
95#include <netinet6/in6_pcb.h> 95#include <netinet6/in6_pcb.h>
96#include <netinet6/nd6.h> 
97#include <netinet6/ip6protosw.h> 96#include <netinet6/ip6protosw.h>
98#include <netinet6/scope6_var.h> 97#include <netinet6/scope6_var.h>
99#include <netinet6/raw_ip6.h> 98#include <netinet6/raw_ip6.h>
100 99
101#ifdef IPSEC 100#ifdef IPSEC
102#include <netipsec/ipsec.h> 101#include <netipsec/ipsec.h>
103#include <netipsec/ipsec_var.h> 102#include <netipsec/ipsec_var.h>
104#include <netipsec/ipsec_private.h> 103#include <netipsec/ipsec_private.h>
105#include <netipsec/ipsec6.h> 104#include <netipsec/ipsec6.h>
106#endif 105#endif
107 106
108#include "faith.h" 107#include "faith.h"
109#if defined(NFAITH) && 0 < NFAITH 108#if defined(NFAITH) && 0 < NFAITH
cvs diff -r1.10 -r1.11 src/sys/netinet6/sctp6_usrreq.c (expand / switch to unified diff)

--- src/sys/netinet6/sctp6_usrreq.c 2016/12/06 08:58:16 1.10
+++ src/sys/netinet6/sctp6_usrreq.c 2016/12/13 08:29:03 1.11
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */ 1/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
2/* $NetBSD: sctp6_usrreq.c,v 1.10 2016/12/06 08:58:16 knakahara Exp $ */ 2/* $NetBSD: sctp6_usrreq.c,v 1.11 2016/12/13 08:29:03 ozaki-r Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. 5 * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
@@ -23,27 +23,27 @@ @@ -23,27 +23,27 @@
23 * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS AND CONTRIBUTORS ``AS IS'' AND 23 * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS AND CONTRIBUTORS ``AS IS'' AND
24 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 24 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26 * ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS OR CONTRIBUTORS BE LIABLE 26 * ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS OR CONTRIBUTORS BE LIABLE
27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE. 33 * SUCH DAMAGE.
34 */ 34 */
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.10 2016/12/06 08:58:16 knakahara Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.11 2016/12/13 08:29:03 ozaki-r Exp $");
37 37
38#ifdef _KERNEL_OPT 38#ifdef _KERNEL_OPT
39#include "opt_inet.h" 39#include "opt_inet.h"
40#include "opt_ipsec.h" 40#include "opt_ipsec.h"
41#include "opt_sctp.h" 41#include "opt_sctp.h"
42#include "opt_net_mpsafe.h" 42#include "opt_net_mpsafe.h"
43#endif /* _KERNEL_OPT */ 43#endif /* _KERNEL_OPT */
44 44
45#include <sys/param.h> 45#include <sys/param.h>
46#include <sys/kernel.h> 46#include <sys/kernel.h>
47#include <sys/mbuf.h> 47#include <sys/mbuf.h>
48#include <sys/domain.h> 48#include <sys/domain.h>
49#include <sys/protosw.h> 49#include <sys/protosw.h>
@@ -69,27 +69,26 @@ __KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq @@ -69,27 +69,26 @@ __KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq
69#include <netinet/sctp_header.h> 69#include <netinet/sctp_header.h>
70#include <netinet/sctp_var.h> 70#include <netinet/sctp_var.h>
71#include <netinet/sctputil.h> 71#include <netinet/sctputil.h>
72#include <netinet/sctp_output.h> 72#include <netinet/sctp_output.h>
73#include <netinet/sctp_input.h> 73#include <netinet/sctp_input.h>
74#include <netinet/sctp_asconf.h> 74#include <netinet/sctp_asconf.h>
75#include <netinet6/ip6_var.h> 75#include <netinet6/ip6_var.h>
76#include <netinet6/scope6_var.h> 76#include <netinet6/scope6_var.h>
77#include <netinet/ip6.h> 77#include <netinet/ip6.h>
78#include <netinet6/in6_pcb.h> 78#include <netinet6/in6_pcb.h>
79#include <netinet/icmp6.h> 79#include <netinet/icmp6.h>
80#include <netinet6/sctp6_var.h> 80#include <netinet6/sctp6_var.h>
81#include <netinet6/ip6protosw.h> 81#include <netinet6/ip6protosw.h>
82#include <netinet6/nd6.h> 
83 82
84#ifdef IPSEC 83#ifdef IPSEC
85#include <netipsec/ipsec.h> 84#include <netipsec/ipsec.h>
86#include <netipsec/ipsec6.h> 85#include <netipsec/ipsec6.h>
87#endif /*IPSEC*/ 86#endif /*IPSEC*/
88 87
89#if defined(NFAITH) && NFAITH > 0 88#if defined(NFAITH) && NFAITH > 0
90#include <net/if_faith.h> 89#include <net/if_faith.h>
91#endif 90#endif
92 91
93#include <net/net_osdep.h> 92#include <net/net_osdep.h>
94 93
95#if defined(HAVE_NRL_INPCB) || defined(__FreeBSD__) 94#if defined(HAVE_NRL_INPCB) || defined(__FreeBSD__)