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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.22.2.6
retrieving revision 1.23
diff -u -p -r1.22.2.6 -r1.23
--- src/sys/netinet6/ip6_input.c	2004/04/07 22:40:58	1.22.2.6
+++ src/sys/netinet6/ip6_input.c	2000/06/28 03:04:03	1.23
@@ -1,5 +1,5 @@
-/*	$NetBSD: ip6_input.c,v 1.22.2.6 2004/04/07 22:40:58 jmc Exp $	*/
-/*	$KAME: ip6_input.c,v 1.119 2000/08/26 10:00:45 itojun Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.23 2000/06/28 03:04:03 mrg Exp $	*/
+/*	$KAME: ip6_input.c,v 1.94 2000/06/13 10:06:19 jinmei Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -111,10 +111,6 @@
 #include <netinet6/ip6_fw.h>
 #endif
 
-#ifdef IPSEC
-#include <netinet6/ipsec.h>
-#endif
-
 #include <netinet6/ip6protosw.h>
 
 /* we need it for NLOOP. */
@@ -308,15 +304,7 @@ ip6_input(m)
 	 * in the list may have previously cleared it.
 	 */
 	m0 = m;
-#ifdef IPSEC
-	if (ipsec_gethist(m, NULL))
-		pfh = NULL;
-	else
-		pfh = pfil_hook_get(PFIL_IN,
-		    &inet6sw[ip6_protox[IPPROTO_IPV6]].pr_pfh);
-#else
-	pfh = pfil_hook_get(PFIL_IN, &inet6sw[ip6_protox[IPPROTO_IPV6]].pr_pfh);
-#endif
+	pfh = pfil_hook_get(PFIL_IN, &inetsw[ip_protox[IPPROTO_IPV6]].pr_pfh);
 	for (; pfh; pfh = pfh->pfil_link.tqe_next)
 		if (pfh->pfil_func) {
 			rv = pfh->pfil_func(ip6, sizeof(*ip6),
@@ -500,25 +488,16 @@ ip6_input(m)
 	    ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_LOOP) {
 		struct in6_ifaddr *ia6 =
 			(struct in6_ifaddr *)ip6_forward_rt.ro_rt->rt_ifa;
+		/* packet to tentative address must not be received */
 		if (ia6->ia6_flags & IN6_IFF_ANYCAST)
 			m->m_flags |= M_ANYCAST6;
-		/*
-		 * packets to a tentative, duplicated, or somehow invalid
-		 * address must not be accepted.
-		 */
 		if (!(ia6->ia6_flags & IN6_IFF_NOTREADY)) {
-			/* this address is ready */
+			/* this interface is ready */
 			ours = 1;
 			deliverifp = ia6->ia_ifp;	/* correct? */
 			goto hbhcheck;
 		} else {
-			/* address is not ready, so discard the packet. */
-			log(LOG_INFO,
-			    "ip6_input: packet to an unready address %s->%s",
-			    ip6_sprintf(&ip6->ip6_src),
-			    ip6_sprintf(&ip6->ip6_dst));
-
-			goto bad;
+			/* this interface is not ready, fall through */
 		}
 	}
 
@@ -707,19 +686,6 @@ ip6_input(m)
 			goto bad;
 		}
 
-#ifdef IPSEC
-		/*
-		 * enforce IPsec policy checking if we are seeing last header.
-		 * note that we do not visit this with protocols with pcb layer
-		 * code - like udp/tcp/raw ip.
-		 */
-		if ((inet6sw[ip6_protox[nxt]].pr_flags & PR_LASTHDR) != 0 &&
-		    ipsec6_in_reject(m, NULL)) {
-			ipsec6stat.in_polvio++;
-			goto bad;
-		}
-#endif
-		
 		nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt);
 	}
 	return;
@@ -1275,7 +1241,7 @@ ip6_nexthdr(m, off, proto, nxtp)
 		if (m->m_pkthdr.len < off + sizeof(fh))
 			return -1;
 		m_copydata(m, off, sizeof(fh), (caddr_t)&fh);
-		if ((fh.ip6f_offlg & IP6F_OFF_MASK) != 0)
+		if ((ntohs(fh.ip6f_offlg) & IP6F_OFF_MASK) != 0)
 			return -1;
 		if (nxtp)
 			*nxtp = fh.ip6f_nxt;
@@ -1359,7 +1325,7 @@ u_char	inet6ctlerrmap[PRC_NCMDS] = {
 	ENOPROTOOPT
 };
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 
 int
@@ -1371,8 +1337,6 @@ ip6_sysctl(name, namelen, oldp, oldlenp,
 	void *newp;
 	size_t newlen;
 {
-	int old, error;
-
 	/* All sysctl names at this level are terminal. */
 	if (namelen != 1)
 		return ENOTDIR;
@@ -1424,58 +1388,6 @@ ip6_sysctl(name, namelen, oldp, oldlenp,
 		return sysctl_int(oldp, oldlenp, newp, newlen,
 				&ip6_bindv6only);
 #endif
-	case IPV6CTL_ANONPORTMIN:
-		old = ip6_anonportmin;
-		error = sysctl_int(oldp, oldlenp, newp, newlen,
-		    &ip6_anonportmin);
-		if (ip6_anonportmin >= ip6_anonportmax || ip6_anonportmin < 0 ||
-		    ip6_anonportmin > 65535
-#ifndef IPNOPRIVPORTS
-		    || ip6_anonportmin < IPV6PORT_RESERVED
-#endif
-		    ) {
-			ip6_anonportmin = old;
-			return (EINVAL);
-		}
-		return (error);
-	case IPV6CTL_ANONPORTMAX:
-		old = ip6_anonportmax;
-		error = sysctl_int(oldp, oldlenp, newp, newlen,
-		    &ip6_anonportmax);
-		if (ip6_anonportmin >= ip6_anonportmax || ip6_anonportmax < 0 ||
-		    ip6_anonportmax > 65535
-#ifndef IPNOPRIVPORTS
-		    || ip6_anonportmax < IPV6PORT_RESERVED
-#endif
-		    ) {
-			ip6_anonportmax = old;
-			return (EINVAL);
-		}
-		return (error);
-#ifndef IPNOPRIVPORTS
-	case IPV6CTL_LOWPORTMIN:
-		old = ip6_lowportmin;
-		error = sysctl_int(oldp, oldlenp, newp, newlen,
-		    &ip6_lowportmin);
-		if (ip6_lowportmin >= ip6_lowportmax ||
-		    ip6_lowportmin > IPV6PORT_RESERVEDMAX ||
-		    ip6_lowportmin < IPV6PORT_RESERVEDMIN) {
-			ip6_lowportmin = old;
-			return (EINVAL);
-		}
-		return (error);
-	case IPV6CTL_LOWPORTMAX:
-		old = ip6_lowportmax;
-		error = sysctl_int(oldp, oldlenp, newp, newlen,
-		    &ip6_lowportmax);
-		if (ip6_lowportmin >= ip6_lowportmax ||
-		    ip6_lowportmax > IPV6PORT_RESERVEDMAX ||
-		    ip6_lowportmax < IPV6PORT_RESERVEDMIN) {
-			ip6_lowportmax = old;
-			return (EINVAL);
-		}
-		return (error);
-#endif
 	default:
 		return EOPNOTSUPP;
 	}