Deleted Added
full compact
ip6_input.c (185571) ip6_input.c (185895)
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 47 unchanged lines hidden (view full) ---

56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 *
60 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94
61 */
62
63#include <sys/cdefs.h>
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 47 unchanged lines hidden (view full) ---

56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 *
60 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94
61 */
62
63#include <sys/cdefs.h>
64__FBSDID("$FreeBSD: head/sys/netinet6/ip6_input.c 185571 2008-12-02 21:37:28Z bz $");
64__FBSDID("$FreeBSD: head/sys/netinet6/ip6_input.c 185895 2008-12-10 23:12:39Z zec $");
65
66#include "opt_inet.h"
67#include "opt_inet6.h"
68#include "opt_ipsec.h"
69
70#include <sys/param.h>
71#include <sys/systm.h>
72#include <sys/malloc.h>

--- 42 unchanged lines hidden (view full) ---

115
116#include <netinet6/ip6protosw.h>
117
118extern struct domain inet6domain;
119
120u_char ip6_protox[IPPROTO_MAX];
121static struct ifqueue ip6intrq;
122
65
66#include "opt_inet.h"
67#include "opt_inet6.h"
68#include "opt_ipsec.h"
69
70#include <sys/param.h>
71#include <sys/systm.h>
72#include <sys/malloc.h>

--- 42 unchanged lines hidden (view full) ---

115
116#include <netinet6/ip6protosw.h>
117
118extern struct domain inet6domain;
119
120u_char ip6_protox[IPPROTO_MAX];
121static struct ifqueue ip6intrq;
122
123#ifndef VIMAGE
124#ifndef VIMAGE_GLOBALS
125struct vnet_inet6 vnet_inet6_0;
126#endif
127#endif
128
123#ifdef VIMAGE_GLOBALS
124static int ip6qmaxlen;
125struct in6_ifaddr *in6_ifaddr;
126struct ip6stat ip6stat;
127#endif
128
129extern struct callout in6_tmpaddrtimer_ch;
130

--- 36 unchanged lines hidden (view full) ---

167
168 V_ip6qmaxlen = IFQ_MAXLEN;
169 V_in6_maxmtu = 0;
170#ifdef IP6_AUTO_LINKLOCAL
171 V_ip6_auto_linklocal = IP6_AUTO_LINKLOCAL;
172#else
173 V_ip6_auto_linklocal = 1; /* enable by default */
174#endif
129#ifdef VIMAGE_GLOBALS
130static int ip6qmaxlen;
131struct in6_ifaddr *in6_ifaddr;
132struct ip6stat ip6stat;
133#endif
134
135extern struct callout in6_tmpaddrtimer_ch;
136

--- 36 unchanged lines hidden (view full) ---

173
174 V_ip6qmaxlen = IFQ_MAXLEN;
175 V_in6_maxmtu = 0;
176#ifdef IP6_AUTO_LINKLOCAL
177 V_ip6_auto_linklocal = IP6_AUTO_LINKLOCAL;
178#else
179 V_ip6_auto_linklocal = 1; /* enable by default */
180#endif
181 TUNABLE_INT_FETCH("net.inet6.ip6.auto_linklocal",
182 &V_ip6_auto_linklocal);
175
176#ifndef IPV6FORWARDING
177#ifdef GATEWAY6
178#define IPV6FORWARDING 1 /* forward IP6 packets not for us */
179#else
180#define IPV6FORWARDING 0 /* don't forward IP6 packets not for us */
181#endif /* GATEWAY6 */
182#endif /* !IPV6FORWARDING */

--- 1493 unchanged lines hidden ---
183
184#ifndef IPV6FORWARDING
185#ifdef GATEWAY6
186#define IPV6FORWARDING 1 /* forward IP6 packets not for us */
187#else
188#define IPV6FORWARDING 0 /* don't forward IP6 packets not for us */
189#endif /* GATEWAY6 */
190#endif /* !IPV6FORWARDING */

--- 1493 unchanged lines hidden ---