Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/src/rev/f4a778898d2b
branches:  netbsd-1-5
changeset: 491700:f4a778898d2b
user:      he <he%NetBSD.org@localhost>
date:      Wed May 09 19:38:30 2001 +0000

description:
Pull up revision 1.32 (via patch, requested by itojun):
  Correct faith prefix determintaion.

diffstat:

 sys/netinet6/raw_ip6.c |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r 891a8938ba08 -r f4a778898d2b sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c    Wed May 09 19:38:03 2001 +0000
+++ b/sys/netinet6/raw_ip6.c    Wed May 09 19:38:30 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip6.c,v 1.23.2.2 2001/04/06 00:29:21 he Exp $      */
+/*     $NetBSD: raw_ip6.c,v 1.23.2.3 2001/05/09 19:38:30 he Exp $      */
 /*     $KAME: raw_ip6.c,v 1.28 2000/05/28 23:25:07 itojun Exp $        */
 
 /*
@@ -98,6 +98,9 @@
 #include <machine/stdarg.h>
 
 #include "faith.h"
+#if defined(NFAITH) && 0 < NFAITH
+#include <net/if_faith.h>
+#endif
 
 struct in6pcb rawin6pcb;
 #define ifatoia6(ifa)  ((struct in6_ifaddr *)(ifa))
@@ -133,12 +136,10 @@
        struct mbuf *opts = NULL;
 
 #if defined(NFAITH) && 0 < NFAITH
-       if (m->m_pkthdr.rcvif) {
-               if (m->m_pkthdr.rcvif->if_type == IFT_FAITH) {
-                       /* send icmp6 host unreach? */
-                       m_freem(m);
-                       return IPPROTO_DONE;
-               }
+       if (faithprefix(&ip6->ip6_dst)) {
+               /* send icmp6 host unreach? */
+               m_freem(m);
+               return IPPROTO_DONE;
        }
 #endif
 



Home | Main Index | Thread Index | Old Index