[src/netbsd-1-6]: src/sys/netinet6 Pull up revision 1.39 (requested by itojun...

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

details:   https://anonhg.NetBSD.org/src/rev/a14fe8a755ab
branches:  netbsd-1-6
changeset: 530805:a14fe8a755ab
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Oct 04 08:36:22 2003 +0000

description:
Pull up revision 1.39 (requested by itojun in ticket #1504):
shouldn't check scope match when encapsulating packet into tunnel mode.
iij seil team

diffstat:

 sys/netinet6/ip6_forward.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 3e18e743b26d -r a14fe8a755ab sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c        Sat Oct 04 08:34:30 2003 +0000
+++ b/sys/netinet6/ip6_forward.c        Sat Oct 04 08:36:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_forward.c,v 1.27.10.2 2003/10/02 20:46:39 tron Exp $       */
+/*     $NetBSD: ip6_forward.c,v 1.27.10.3 2003/10/04 08:36:22 tron Exp $       */
 /*     $KAME: ip6_forward.c,v 1.74 2001/06/12 23:54:55 itojun Exp $    */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.27.10.2 2003/10/02 20:46:39 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.27.10.3 2003/10/04 08:36:22 tron Exp $");
 
 #include "opt_ipsec.h"
 #include "opt_pfil_hooks.h"
@@ -360,7 +360,11 @@
         * [draft-ietf-ipngwg-icmp-v3-00.txt, Section 3.1]
         */
        if (in6_addr2scopeid(m->m_pkthdr.rcvif, &ip6->ip6_src) !=
-           in6_addr2scopeid(rt->rt_ifp, &ip6->ip6_src)) {
+           in6_addr2scopeid(rt->rt_ifp, &ip6->ip6_src)
+#ifdef IPSEC
+           && !ipsecrt
+#endif
+           ) {
                ip6stat.ip6s_cantforward++;
                ip6stat.ip6s_badscope++;
                in6_ifstat_inc(rt->rt_ifp, ifs6_in_discard);