Deleted Added
sdiff udiff text old ( 54263 ) new ( 55009 )
full compact
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

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

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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 * $FreeBSD: head/sys/netinet6/in6_proto.c 54263 1999-12-07 17:39:16Z shin $
29 * $FreeBSD: head/sys/netinet6/in6_proto.c 55009 1999-12-22 19:13:38Z shin $
30 */
31
32/*
33 * Copyright (c) 1982, 1986, 1993
34 * The Regents of the University of California. All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions

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

59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 * SUCH DAMAGE.
63 *
64 * @(#)in_proto.c 8.1 (Berkeley) 6/10/93
65 */
66
67#include "opt_ipsec.h"
68
69#include <sys/param.h>
70#include <sys/socket.h>
71#include <sys/socketvar.h>
72#include <sys/protosw.h>
73#include <sys/kernel.h>
74#include <sys/domain.h>
75#include <sys/mbuf.h>
76#include <sys/systm.h>

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

99
100#include <netinet6/pim6_var.h>
101
102#include <netinet6/nd6.h>
103#include <netinet6/in6_prefix.h>
104
105#ifdef IPSEC
106#include <netinet6/ipsec.h>
105#include <netinet6/ipsec6.h>
107#include <netinet6/ah.h>
108#include <netinet6/ipsec6.h>
109#include <netinet6/ah6.h>
110#ifdef IPSEC_ESP
111#include <netinet6/esp.h>
112#include <netinet6/esp6.h>
113#endif
110#include <netinet6/ipcomp.h>
114#endif /*IPSEC*/
115
116#include <netinet6/ip6protosw.h>
117
118#include "gif.h"
119#if NGIF > 0
120#include <netinet6/in6_gif.h>
121#endif

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

184#ifdef IPSEC_ESP
185{ SOCK_RAW, &inet6domain, IPPROTO_ESP, PR_ATOMIC|PR_ADDR,
186 esp6_input, 0, 0, 0,
187 0,
188 0, 0, 0, 0,
189 &nousrreqs,
190},
191#endif
189{ SOCK_RAW, &inet6domain, IPPROTO_IPCOMP, PR_ATOMIC|PR_ADDR,
190 ipcomp6_input, 0, 0, 0,
191 0,
192 0, 0, 0, 0,
193 &nousrreqs,
194},
192#endif /* IPSEC */
193#if NGIF > 0
194{ SOCK_RAW, &inet6domain, IPPROTO_IPV4, PR_ATOMIC|PR_ADDR,
195 in6_gif_input,0, 0, 0,
196 0,
197 0, 0, 0, 0,
198 &nousrreqs
199},

--- 209 unchanged lines hidden ---