Deleted Added
full compact
in6_gif.c (196019) in6_gif.c (207369)
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

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

25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $
30 */
31
32#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

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

25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet6/in6_gif.c 196019 2009-08-01 19:26:27Z rwatson $");
33__FBSDID("$FreeBSD: head/sys/netinet6/in6_gif.c 207369 2010-04-29 11:52:42Z bz $");
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/socket.h>
41#include <sys/sockio.h>
42#include <sys/mbuf.h>
43#include <sys/errno.h>
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/socket.h>
41#include <sys/sockio.h>
42#include <sys/mbuf.h>
43#include <sys/errno.h>
44#include <sys/kernel.h>
44#include <sys/queue.h>
45#include <sys/syslog.h>
45#include <sys/queue.h>
46#include <sys/syslog.h>
47#include <sys/sysctl.h>
46#include <sys/protosw.h>
47#include <sys/malloc.h>
48
49#include <net/if.h>
50#include <net/route.h>
51
52#include <netinet/in.h>
53#include <netinet/in_systm.h>

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

64#include <netinet6/ip6protosw.h>
65#include <netinet/ip_ecn.h>
66#ifdef INET6
67#include <netinet6/ip6_ecn.h>
68#endif
69
70#include <net/if_gif.h>
71
48#include <sys/protosw.h>
49#include <sys/malloc.h>
50
51#include <net/if.h>
52#include <net/route.h>
53
54#include <netinet/in.h>
55#include <netinet/in_systm.h>

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

66#include <netinet6/ip6protosw.h>
67#include <netinet/ip_ecn.h>
68#ifdef INET6
69#include <netinet6/ip6_ecn.h>
70#endif
71
72#include <net/if_gif.h>
73
74VNET_DEFINE(int, ip6_gif_hlim) = GIF_HLIM;
75#define V_ip6_gif_hlim VNET(ip6_gif_hlim)
76
77SYSCTL_DECL(_net_inet6_ip6);
78SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_GIF_HLIM, gifhlim, CTLFLAG_RW,
79 &VNET_NAME(ip6_gif_hlim), 0, "");
80
72static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
73 struct ifnet *);
74
75extern struct domain inet6domain;
76struct ip6protosw in6_gif_protosw = {
77 .pr_type = SOCK_RAW,
78 .pr_domain = &inet6domain,
79 .pr_protocol = 0, /* IPPROTO_IPV[46] */

--- 376 unchanged lines hidden ---
81static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
82 struct ifnet *);
83
84extern struct domain inet6domain;
85struct ip6protosw in6_gif_protosw = {
86 .pr_type = SOCK_RAW,
87 .pr_domain = &inet6domain,
88 .pr_protocol = 0, /* IPPROTO_IPV[46] */

--- 376 unchanged lines hidden ---