svn commit: r246756 - user/ae/inet6/sys/netinet6

[Andrey V. Elsukov]

Author: ae
Date: Wed Feb 13 09:20:55 2013
New Revision: 246756
URL: http://svnweb.freebsd.org/changeset/base/246756

Log:
  Remove in6_setscope and in6_clearscope from the NI code.
  Note, this code should be updated according to the RFC 4620.

Modified:
  user/ae/inet6/sys/netinet6/icmp6.c

Modified: user/ae/inet6/sys/netinet6/icmp6.c
==============================================================================
--- user/ae/inet6/sys/netinet6/icmp6.c	Wed Feb 13 09:10:33 2013	(r246755)
+++ user/ae/inet6/sys/netinet6/icmp6.c	Wed Feb 13 09:20:55 2013	(r246756)
@@ -1254,6 +1254,7 @@ icmp6_mtudisc_update(struct ip6ctlparam 
 /*
  * Process a Node Information Query packet, based on
  * draft-ietf-ipngwg-icmp-name-lookups-07.
+ * XXX: RFC 4620
  *
  * Spec incompatibilities:
  * - IPv6 Subject address handling
@@ -1392,8 +1393,6 @@ ni6_input(struct mbuf *m, int off)
 			/* m_pulldown instead of copy? */
 			m_copydata(m, off + sizeof(struct icmp6_nodeinfo),
 			    subjlen, (caddr_t)&in6_subj);
-			if (in6_setscope(&in6_subj, m->m_pkthdr.rcvif, NULL))
-				goto bad;
 
 			subj = (char *)&in6_subj;
 			if (IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &in6_subj))
@@ -1966,7 +1965,6 @@ ni6_store_addrs(struct icmp6_nodeinfo *n
 			/* copy the address itself */
 			bcopy(&ifa6->ia_addr.sin6_addr, cp,
 			    sizeof(struct in6_addr));
-			in6_clearscope((struct in6_addr *)cp); /* XXX */
 			cp += sizeof(struct in6_addr);
 
 			resid -= (sizeof(struct in6_addr) + sizeof(u_int32_t));