disallow old-style FQDN query as well, if net.inet6.icmp6.nodeinfo=0.

kame · Jan 2, 2000 · 8472e4f · 8472e4f
1 parent 95f7641
commit 8472e4f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/kame/sys/netinet6/icmp6.c b/kame/sys/netinet6/icmp6.c
@@ -654,6 +654,9 @@ icmp6_input(mp, offp, proto)
 
 		if (code != 0)
 			goto badcode;
+		if (!icmp6_nodeinfo)
+			break;
+
 		if (icmp6len == sizeof(struct icmp6_hdr) + 4)
 			mode = WRU;
 		else if (icmp6len >= sizeof(struct icmp6_hdr) + 8) /* XXX */
@@ -925,11 +928,6 @@ ni6_input(m, off)
 	int addrs;		/* for NI_QTYPE_NODEADDR */
 	struct ifnet *ifp = NULL; /* for NI_QTYPE_NODEADDR */
 
-	if (!icmp6_nodeinfo) {
-		m_freem(m);
-		return NULL;
-	}
-
 #ifndef PULLDOWN_TEST
 	ni6 = (struct icmp6_nodeinfo *)(mtod(m, caddr_t) + off);
 #else