[src/netbsd-1-5]: src/sys/netinet6 Apply patch (requested by martti):

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

details:   https://anonhg.NetBSD.org/src/rev/e9aa72c6771c
branches:  netbsd-1-5
changeset: 492870:e9aa72c6771c
user:      he <he%NetBSD.org@localhost>
date:      Tue Feb 26 20:14:36 2002 +0000

description:
Apply patch (requested by martti):
  Fix it so that IPFilter handles IPv6 traffic.

diffstat:

 sys/netinet6/ip6_forward.c |  6 ++++--
 sys/netinet6/ip6_input.c   |  6 +++---
 sys/netinet6/ip6_output.c  |  6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (75 lines):

diff -r bc2254aa0cfd -r e9aa72c6771c sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c        Tue Feb 26 20:07:40 2002 +0000
+++ b/sys/netinet6/ip6_forward.c        Tue Feb 26 20:14:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_forward.c,v 1.12.2.7 2002/02/09 17:02:15 he Exp $  */
+/*     $NetBSD: ip6_forward.c,v 1.12.2.8 2002/02/26 20:14:36 he Exp $  */
 /*     $KAME: ip6_forward.c,v 1.56 2000/09/22 04:01:37 itojun Exp $    */
 
 /*
@@ -57,6 +57,7 @@
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
+#include <netinet6/ip6protosw.h>
 
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
@@ -503,7 +504,8 @@
         * Run through list of hooks for output packets.
         */
        m1 = m;
-       pfh = pfil_hook_get(PFIL_OUT, &inetsw[ip_protox[IPPROTO_IPV6]].pr_pfh);
+       pfh = pfil_hook_get(PFIL_OUT,
+               &inet6sw[ip6_protox[IPPROTO_IPV6]].pr_pfh);
        for (; pfh; pfh = pfh->pfil_link.tqe_next)
                if (pfh->pfil_func) {
                        rv = pfh->pfil_func(ip6, sizeof(*ip6),
diff -r bc2254aa0cfd -r e9aa72c6771c sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Tue Feb 26 20:07:40 2002 +0000
+++ b/sys/netinet6/ip6_input.c  Tue Feb 26 20:14:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.22.2.4 2001/04/06 01:37:35 he Exp $    */
+/*     $NetBSD: ip6_input.c,v 1.22.2.5 2002/02/26 20:14:36 he Exp $    */
 /*     $KAME: ip6_input.c,v 1.119 2000/08/26 10:00:45 itojun Exp $     */
 
 /*
@@ -313,9 +313,9 @@
                pfh = NULL;
        else
                pfh = pfil_hook_get(PFIL_IN,
-                   &inetsw[ip_protox[IPPROTO_IPV6]].pr_pfh);
+                   &inet6sw[ip6_protox[IPPROTO_IPV6]].pr_pfh);
 #else
-       pfh = pfil_hook_get(PFIL_IN, &inetsw[ip_protox[IPPROTO_IPV6]].pr_pfh);
+       pfh = pfil_hook_get(PFIL_IN, &inet6sw[ip6_protox[IPPROTO_IPV6]].pr_pfh);
 #endif
        for (; pfh; pfh = pfh->pfil_link.tqe_next)
                if (pfh->pfil_func) {
diff -r bc2254aa0cfd -r e9aa72c6771c sys/netinet6/ip6_output.c
--- a/sys/netinet6/ip6_output.c Tue Feb 26 20:07:40 2002 +0000
+++ b/sys/netinet6/ip6_output.c Tue Feb 26 20:14:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_output.c,v 1.23.2.5 2001/04/22 18:11:17 he Exp $   */
+/*     $NetBSD: ip6_output.c,v 1.23.2.6 2002/02/26 20:14:37 he Exp $   */
 /*     $KAME: ip6_output.c,v 1.109 2000/05/31 05:03:09 jinmei Exp $    */
 
 /*
@@ -92,6 +92,7 @@
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/nd6.h>
+#include <netinet6/ip6protosw.h>
 
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
@@ -841,7 +842,8 @@
         * Run through list of hooks for output packets.
         */
        m1 = m;
-       pfh = pfil_hook_get(PFIL_OUT, &inetsw[ip_protox[IPPROTO_IPV6]].pr_pfh);
+       pfh = pfil_hook_get(PFIL_OUT,
+               &inet6sw[ip6_protox[IPPROTO_IPV6]].pr_pfh);
        for (; pfh; pfh = pfh->pfil_link.tqe_next)
                if (pfh->pfil_func) {
                        rv = pfh->pfil_func(ip6, sizeof(*ip6), ifp, 1, &m1);