Deleted Added
full compact
ip6_ipsec.c (171260) ip6_ipsec.c (171732)
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California. 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) 1982, 1986, 1988, 1993
3 * The Regents of the University of California. 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_ipsec.c 171260 2007-07-05 16:29:40Z delphij $
29 * $FreeBSD: head/sys/netinet6/ip6_ipsec.c 171732 2007-08-05 16:16:15Z bz $
30 */
31
32#include "opt_ipsec.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <sys/mac.h>

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

72extern struct protosw inet6sw[];
73
74/*
75 * Check if we have to jump over firewall processing for this packet.
76 * Called from ip_input().
77 * 1 = jump over firewall, 0 = packet goes through firewall.
78 */
79int
30 */
31
32#include "opt_ipsec.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <sys/mac.h>

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

72extern struct protosw inet6sw[];
73
74/*
75 * Check if we have to jump over firewall processing for this packet.
76 * Called from ip_input().
77 * 1 = jump over firewall, 0 = packet goes through firewall.
78 */
79int
80ip6_ipsec_filtergif(struct mbuf *m)
80ip6_ipsec_filtertunnel(struct mbuf *m)
81{
81{
82#if defined(IPSEC) && !defined(IPSEC_FILTERGIF)
82#if defined(IPSEC) && !defined(IPSEC_FILTERTUNNEL)
83 /*
83 /*
84 * Bypass packet filtering for packets from a tunnel (gif).
84 * Bypass packet filtering for packets from a tunnel.
85 */
86 if (m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL)
87 return 1;
88#endif
89 return 0;
90}
91
92/*

--- 276 unchanged lines hidden ---
85 */
86 if (m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL)
87 return 1;
88#endif
89 return 0;
90}
91
92/*

--- 276 unchanged lines hidden ---