Deleted Added
full compact
ip6_input.c (215956) ip6_input.c (222856)
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

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

56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 *
60 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94
61 */
62
63#include <sys/cdefs.h>
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

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

56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 *
60 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94
61 */
62
63#include <sys/cdefs.h>
64__FBSDID("$FreeBSD: head/sys/netinet6/ip6_input.c 215956 2010-11-27 21:51:39Z brucec $");
64__FBSDID("$FreeBSD: head/sys/netinet6/ip6_input.c 222856 2011-06-08 10:59:36Z bz $");
65
66#include "opt_inet.h"
67#include "opt_inet6.h"
68#include "opt_ipsec.h"
69#include "opt_route.h"
70
71#include <sys/param.h>
72#include <sys/systm.h>

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

499 */
500 if (IN6_IS_ADDR_V4COMPAT(&ip6->ip6_src) ||
501 IN6_IS_ADDR_V4COMPAT(&ip6->ip6_dst)) {
502 V_ip6stat.ip6s_badscope++;
503 in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr);
504 goto bad;
505 }
506#endif
65
66#include "opt_inet.h"
67#include "opt_inet6.h"
68#include "opt_ipsec.h"
69#include "opt_route.h"
70
71#include <sys/param.h>
72#include <sys/systm.h>

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

499 */
500 if (IN6_IS_ADDR_V4COMPAT(&ip6->ip6_src) ||
501 IN6_IS_ADDR_V4COMPAT(&ip6->ip6_dst)) {
502 V_ip6stat.ip6s_badscope++;
503 in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr);
504 goto bad;
505 }
506#endif
507#ifdef IPSEC
508 /*
509 * Bypass packet filtering for packets previously handled by IPsec.
510 */
511 if (ip6_ipsec_filtertunnel(m))
512 goto passin;
513#endif /* IPSEC */
507
508 /*
509 * Run through list of hooks for input packets.
510 *
511 * NB: Beware of the destination address changing
512 * (e.g. by NAT rewriting). When this happens,
513 * tell ip6_forward to do the right thing.
514 */

--- 1268 unchanged lines hidden ---
514
515 /*
516 * Run through list of hooks for input packets.
517 *
518 * NB: Beware of the destination address changing
519 * (e.g. by NAT rewriting). When this happens,
520 * tell ip6_forward to do the right thing.
521 */

--- 1268 unchanged lines hidden ---