Deleted Added
full compact
ip6_input.c (83366) ip6_input.c (83934)
1/* $FreeBSD: head/sys/netinet6/ip6_input.c 83366 2001-09-12 08:38:13Z julian $ */
1/* $FreeBSD: head/sys/netinet6/ip6_input.c 83934 2001-09-25 18:40:52Z brooks $ */
2/* $KAME: ip6_input.c,v 1.194 2001/05/27 13:28:35 itojun Exp $ */
3
4/*
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

116#include <netinet6/ipsec6.h>
117#endif
118#endif
119
120#include <netinet6/ip6_fw.h>
121
122#include <netinet6/ip6protosw.h>
123
2/* $KAME: ip6_input.c,v 1.194 2001/05/27 13:28:35 itojun Exp $ */
3
4/*
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

116#include <netinet6/ipsec6.h>
117#endif
118#endif
119
120#include <netinet6/ip6_fw.h>
121
122#include <netinet6/ip6protosw.h>
123
124#include "faith.h"
125
126#include <net/net_osdep.h>
127
128extern struct domain inet6domain;
129extern struct ip6protosw inet6sw[];
130
131u_char ip6_protox[IPPROTO_MAX];
132static int ip6qmaxlen = IFQ_MAXLEN;
133struct in6_ifaddr *in6_ifaddr;

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

628 goto bad;
629 }
630 }
631 } /* XXX indentation (see above) */
632
633 /*
634 * FAITH(Firewall Aided Internet Translator)
635 */
124#include <net/net_osdep.h>
125
126extern struct domain inet6domain;
127extern struct ip6protosw inet6sw[];
128
129u_char ip6_protox[IPPROTO_MAX];
130static int ip6qmaxlen = IFQ_MAXLEN;
131struct in6_ifaddr *in6_ifaddr;

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

626 goto bad;
627 }
628 }
629 } /* XXX indentation (see above) */
630
631 /*
632 * FAITH(Firewall Aided Internet Translator)
633 */
636#if defined(NFAITH) && 0 < NFAITH
637 if (ip6_keepfaith) {
638 if (ip6_forward_rt.ro_rt && ip6_forward_rt.ro_rt->rt_ifp
639 && ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_FAITH) {
640 /* XXX do we need more sanity checks? */
641 ours = 1;
642 deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /*faith*/
643 goto hbhcheck;
644 }
645 }
634 if (ip6_keepfaith) {
635 if (ip6_forward_rt.ro_rt && ip6_forward_rt.ro_rt->rt_ifp
636 && ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_FAITH) {
637 /* XXX do we need more sanity checks? */
638 ours = 1;
639 deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /*faith*/
640 goto hbhcheck;
641 }
642 }
646#endif
647
648 /*
649 * Now there is no reason to process the packet if it's not our own
650 * and we're not a router.
651 */
652 if (!ip6_forwarding) {
653 ip6stat.ip6s_cantforward++;
654 in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard);

--- 1019 unchanged lines hidden ---
643
644 /*
645 * Now there is no reason to process the packet if it's not our own
646 * and we're not a router.
647 */
648 if (!ip6_forwarding) {
649 ip6stat.ip6s_cantforward++;
650 in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard);

--- 1019 unchanged lines hidden ---