[src/netbsd-1-5]: src/sys pullup from main trunc (approved by releng-1-5)

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

details:   https://anonhg.NetBSD.org/src/rev/62ce17b6049f
branches:  netbsd-1-5
changeset: 488366:62ce17b6049f
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Jul 03 08:31:57 2000 +0000

description:
pullup from main trunc (approved by releng-1-5)
repair kernel faithd(8) support.  there were two mistakes:
(1) tcp6_input dropped packets for translation
(2) in6_pcblookup_connect was too strict

diffstat:

 sys/netinet/tcp_input.c |  12 +-----------
 sys/netinet6/in6_pcb.c  |   8 ++------
 2 files changed, 3 insertions(+), 17 deletions(-)

diffs (48 lines):

diff -r c41d5600df5e -r 62ce17b6049f sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Mon Jul 03 02:27:20 2000 +0000
+++ b/sys/netinet/tcp_input.c   Mon Jul 03 08:31:57 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.108 2000/05/05 15:05:29 matt Exp $     */
+/*     $NetBSD: tcp_input.c,v 1.108.4.1 2000/07/03 08:31:57 itojun Exp $       */
 
 /*
 %%% portions-copyright-nrl-95
@@ -516,16 +516,6 @@
 {
        struct mbuf *m = *mp;
 
-#if defined(NFAITH) && 0 < NFAITH
-       if (m->m_pkthdr.rcvif) {
-               if (m->m_pkthdr.rcvif->if_type == IFT_FAITH) {
-                       /* XXX send icmp6 host/port unreach? */
-                       m_freem(m);
-                       return IPPROTO_DONE;
-               }
-       }
-#endif
-
        /*
         * draft-itojun-ipv6-tcp-to-anycast
         * better place to put this in?
diff -r c41d5600df5e -r 62ce17b6049f sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c    Mon Jul 03 02:27:20 2000 +0000
+++ b/sys/netinet6/in6_pcb.c    Mon Jul 03 08:31:57 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: in6_pcb.c,v 1.26 2000/06/08 13:51:33 itojun Exp $      */
-/*     $KAME: in6_pcb.c,v 1.45 2000/06/05 00:41:58 itojun Exp $        */
+/*     $NetBSD: in6_pcb.c,v 1.26.2.1 2000/07/03 08:31:59 itojun Exp $  */
+/*     $KAME: in6_pcb.c,v 1.55 2000/07/02 07:50:30 itojun Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -807,10 +807,6 @@
        u_int16_t fport = fport_arg, lport = lport_arg;
 
        for (in6p = head->in6p_next; in6p != head; in6p = in6p->in6p_next) {
-#if defined(NFAITH) && NFAITH > 0
-               if (faith && (in6p->in6p_flags & IN6P_FAITH) == 0)
-                       continue;
-#endif
                /* find exact match on both source and dest */
                if (in6p->in6p_fport != fport)
                        continue;