Deleted Added
full compact
ip6_forward.c (54263) ip6_forward.c (55009)
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 *
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/ip6_forward.c 54263 1999-12-07 17:39:16Z shin $
29 * $FreeBSD: head/sys/netinet6/ip6_forward.c 55009 1999-12-22 19:13:38Z shin $
30 */
31
30 */
31
32#include "opt_key.h"
32#include "opt_ipsec.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/malloc.h>
37#include <sys/mbuf.h>
38#include <sys/domain.h>
39#include <sys/protosw.h>
40#include <sys/socket.h>

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

52#include <netinet6/ip6_var.h>
53#include <netinet6/icmp6.h>
54#include <netinet6/nd6.h>
55
56#ifdef IPSEC_IPV6FWD
57#include <netinet6/ipsec.h>
58#include <netinet6/ipsec6.h>
59#include <netkey/key.h>
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/malloc.h>
37#include <sys/mbuf.h>
38#include <sys/domain.h>
39#include <sys/protosw.h>
40#include <sys/socket.h>

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

52#include <netinet6/ip6_var.h>
53#include <netinet6/icmp6.h>
54#include <netinet6/nd6.h>
55
56#ifdef IPSEC_IPV6FWD
57#include <netinet6/ipsec.h>
58#include <netinet6/ipsec6.h>
59#include <netkey/key.h>
60#ifdef KEY_DEBUG
60#ifdef IPSEC_DEBUG
61#include <netkey/key_debug.h>
62#else
61#include <netkey/key_debug.h>
62#else
63#define DPRINTF(lev,arg)
64#define DDO(lev, stmt)
65#define DP(x, y, z)
66#endif /* KEY_DEBUG */
63#define KEYDEBUG(lev,arg)
64#endif
67#endif /* IPSEC_IPV6FWD */
68
69#ifdef IPV6FIREWALL
70#include <netinet6/ip6_fw.h>
71#endif
72
73#include <net/net_osdep.h>
74

--- 309 unchanged lines hidden ---
65#endif /* IPSEC_IPV6FWD */
66
67#ifdef IPV6FIREWALL
68#include <netinet6/ip6_fw.h>
69#endif
70
71#include <net/net_osdep.h>
72

--- 309 unchanged lines hidden ---