| ip_input.c (171167) | ip_input.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 --- 13 unchanged lines hidden (view full) --- 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 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 | 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 --- 13 unchanged lines hidden (view full) --- 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 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 |
| 30 * $FreeBSD: head/sys/netinet/ip_input.c 171167 2007-07-03 12:13:45Z gnn $ | 30 * $FreeBSD: head/sys/netinet/ip_input.c 171732 2007-08-05 16:16:15Z bz $ |
| 31 */ 32 33#include "opt_bootp.h" 34#include "opt_ipfw.h" 35#include "opt_ipstealth.h" 36#include "opt_ipsec.h" 37#include "opt_mac.h" 38#include "opt_carp.h" --- 351 unchanged lines hidden (view full) --- 390 m->m_pkthdr.len = ip->ip_len; 391 } else 392 m_adj(m, ip->ip_len - m->m_pkthdr.len); 393 } 394#ifdef IPSEC 395 /* 396 * Bypass packet filtering for packets from a tunnel (gif). 397 */ | 31 */ 32 33#include "opt_bootp.h" 34#include "opt_ipfw.h" 35#include "opt_ipstealth.h" 36#include "opt_ipsec.h" 37#include "opt_mac.h" 38#include "opt_carp.h" --- 351 unchanged lines hidden (view full) --- 390 m->m_pkthdr.len = ip->ip_len; 391 } else 392 m_adj(m, ip->ip_len - m->m_pkthdr.len); 393 } 394#ifdef IPSEC 395 /* 396 * Bypass packet filtering for packets from a tunnel (gif). 397 */ |
| 398 if (ip_ipsec_filtergif(m)) | 398 if (ip_ipsec_filtertunnel(m)) |
| 399 goto passin; 400#endif /* IPSEC */ 401 402 /* 403 * Run through list of hooks for input packets. 404 * 405 * NB: Beware of the destination address changing (e.g. 406 * by NAT rewriting). When this happens, tell --- 1190 unchanged lines hidden --- | 399 goto passin; 400#endif /* IPSEC */ 401 402 /* 403 * Run through list of hooks for input packets. 404 * 405 * NB: Beware of the destination address changing (e.g. 406 * by NAT rewriting). When this happens, tell --- 1190 unchanged lines hidden --- |