Deleted Added
full compact
ip6_ipsec.c (222845) ip6_ipsec.c (230442)
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

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

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
30#include <sys/cdefs.h>
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

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

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
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/netinet6/ip6_ipsec.c 222845 2011-06-08 03:02:11Z bz $");
31__FBSDID("$FreeBSD: head/sys/netinet6/ip6_ipsec.c 230442 2012-01-22 02:13:19Z bz $");
32
33#include "opt_inet.h"
34#include "opt_inet6.h"
35#include "opt_ipsec.h"
36
37#include <sys/param.h>
38#include <sys/systm.h>
39#include <sys/kernel.h>

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

98/*
99 * Check if we have to jump over firewall processing for this packet.
100 * Called from ip6_input().
101 * 1 = jump over firewall, 0 = packet goes through firewall.
102 */
103int
104ip6_ipsec_filtertunnel(struct mbuf *m)
105{
32
33#include "opt_inet.h"
34#include "opt_inet6.h"
35#include "opt_ipsec.h"
36
37#include <sys/param.h>
38#include <sys/systm.h>
39#include <sys/kernel.h>

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

98/*
99 * Check if we have to jump over firewall processing for this packet.
100 * Called from ip6_input().
101 * 1 = jump over firewall, 0 = packet goes through firewall.
102 */
103int
104ip6_ipsec_filtertunnel(struct mbuf *m)
105{
106#if defined(IPSEC)
106#ifdef IPSEC
107
108 /*
109 * Bypass packet filtering for packets previously handled by IPsec.
110 */
111 if (!V_ip6_ipsec6_filtertunnel &&
112 m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL)
113 return 1;
114#endif

--- 276 unchanged lines hidden ---
107
108 /*
109 * Bypass packet filtering for packets previously handled by IPsec.
110 */
111 if (!V_ip6_ipsec6_filtertunnel &&
112 m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL)
113 return 1;
114#endif

--- 276 unchanged lines hidden ---