Deleted Added
full compact
ip_ipsec.c (171167) ip_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/netinet/ip_ipsec.c 171167 2007-07-03 12:13:45Z gnn $
29 * $FreeBSD: head/sys/netinet/ip_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/malloc.h>

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

64extern struct protosw inetsw[];
65
66/*
67 * Check if we have to jump over firewall processing for this packet.
68 * Called from ip_input().
69 * 1 = jump over firewall, 0 = packet goes through firewall.
70 */
71int
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/malloc.h>

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

64extern struct protosw inetsw[];
65
66/*
67 * Check if we have to jump over firewall processing for this packet.
68 * Called from ip_input().
69 * 1 = jump over firewall, 0 = packet goes through firewall.
70 */
71int
72ip_ipsec_filtergif(struct mbuf *m)
72ip_ipsec_filtertunnel(struct mbuf *m)
73{
73{
74#if defined(IPSEC) && !defined(IPSEC_FILTERGIF)
74#if defined(IPSEC) && !defined(IPSEC_FILTERTUNNEL)
75 /*
75 /*
76 * Bypass packet filtering for packets from a tunnel (gif).
76 * Bypass packet filtering for packets from a tunnel.
77 */
78 if (m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL)
79 return 1;
80#endif
81 return 0;
82}
83
84/*

--- 302 unchanged lines hidden ---
77 */
78 if (m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL)
79 return 1;
80#endif
81 return 0;
82}
83
84/*

--- 302 unchanged lines hidden ---