src/sys/netinet6/ip6_input.c - diff

Return to ip6_input.c CVS log

Up to [cvs.NetBSD.org] / src / sys / netinet6

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

-version 1.38, 2001/03/16 12:22:34
+version 1.39, 2001/03/21 19:12:56
 Line 303  ip6_input(m)
 Line 303  ip6_input(m)
 Line 303  ip6_input(m)
           * Note that filters must _never_ set this flag, as another filter
           * in the list may have previously cleared it.
           */
-         if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif,
+         /*
-                            PFIL_IN) != 0)
+          * let ipfilter look at packet on the wire,
-                 return;
+          * not the decapsulated packet.
-         if (m == NULL)
+          */
-                 return;
+ #ifdef IPSEC
-         ip6 = mtod(m, struct ip6_hdr *);
+         if (!ipsec_gethist(m, NULL))
+ #else
+         if (1)
+ #endif
+         {
+                 if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif,
+                                    PFIL_IN) != 0)
+                         return;
+                 if (m == NULL)
+                         return;
+                 ip6 = mtod(m, struct ip6_hdr *);
+         }
  #endif /* PFIL_HOOKS */