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

[Andrey V. Elsukov]

Author: ae
Date: Mon Nov 25 07:35:01 2013
New Revision: 258540
URL: http://svnweb.freebsd.org/changeset/base/258540

Log:
  Initialize sin6_scope_id using mbuf's rcvif.

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

Modified: user/ae/inet6/sys/netinet6/in6_pcb.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_pcb.c	Mon Nov 25 06:17:14 2013	(r258539)
+++ user/ae/inet6/sys/netinet6/in6_pcb.c	Mon Nov 25 07:35:01 2013	(r258540)
@@ -1170,8 +1170,8 @@ init_sin6(struct sockaddr_in6 *sin6, str
 	sin6->sin6_len = sizeof(*sin6);
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_addr = ip->ip6_src;
-
-	(void)sa6_recoverscope(sin6); /* XXX: should catch errors... */
-
+	if (m->m_pkthdr.rcvif != NULL)
+		sin6->sin6_scope_id = in6_getscopezone(m->m_pkthdr.rcvif,
+		    in6_addrscope(&sin6->sin6_addr));
 	return;
 }