[src/netbsd-1-5]: src/sys/netinet6 Pull up revision 1.39 (via patch, requeste...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/28913558e19b
branches:  netbsd-1-5
changeset: 491216:28913558e19b
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 06 01:37:35 2001 +0000

description:
Pull up revision 1.39 (via patch, requested by itojun):
  Record IPsec packet history in m_aux structure.  Let ipfilter
  look at wire-format packet only (not the decapsulated ones), so
  that VPN setting can work with NAT/ipfilter settings.

diffstat:

 sys/netinet6/ip6_input.c |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 98f96f1c3f9d -r 28913558e19b sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Fri Apr 06 01:30:10 2001 +0000
+++ b/sys/netinet6/ip6_input.c  Fri Apr 06 01:37:35 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.22.2.3 2001/03/11 21:12:36 he Exp $    */
+/*     $NetBSD: ip6_input.c,v 1.22.2.4 2001/04/06 01:37:35 he Exp $    */
 /*     $KAME: ip6_input.c,v 1.119 2000/08/26 10:00:45 itojun Exp $     */
 
 /*
@@ -308,7 +308,15 @@
         * in the list may have previously cleared it.
         */
        m0 = m;
+#ifdef IPSEC
+       if (ipsec_gethist(m, NULL))
+               pfh = NULL;
+       else
+               pfh = pfil_hook_get(PFIL_IN,
+                   &inetsw[ip_protox[IPPROTO_IPV6]].pr_pfh);
+#else
        pfh = pfil_hook_get(PFIL_IN, &inetsw[ip_protox[IPPROTO_IPV6]].pr_pfh);
+#endif
        for (; pfh; pfh = pfh->pfil_link.tqe_next)
                if (pfh->pfil_func) {
                        rv = pfh->pfil_func(ip6, sizeof(*ip6),