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

[Andrey V. Elsukov]

Author: ae
Date: Wed Dec  4 20:04:34 2013
New Revision: 258935
URL: http://svnweb.freebsd.org/changeset/base/258935

Log:
  Use zone id from inpcb when connection has link-local scope and
  caller did not specified outgoing interface.

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

Modified: user/ae/inet6/sys/netinet6/ip6_output.c
==============================================================================
--- user/ae/inet6/sys/netinet6/ip6_output.c	Wed Dec  4 20:03:55 2013	(r258934)
+++ user/ae/inet6/sys/netinet6/ip6_output.c	Wed Dec  4 20:04:34 2013	(r258935)
@@ -724,7 +724,13 @@ again:
 					IP6STAT_INC(ip6s_badscope);
 					goto bad;
 				}
-			} else if (IN6_IS_ADDR_LINKLOCAL(&dst->sin6_addr) ||
+			}
+			if (inp != NULL && inp->in6p_zoneid != 0) {
+				ifp = in6_getlinkifnet(inp->in6p_zoneid);
+				if (ifp != NULL)
+					goto oif_found;
+			}
+			if (IN6_IS_ADDR_LINKLOCAL(&dst->sin6_addr) ||
 			    IN6_IS_ADDR_MC_INTFACELOCAL(&dst->sin6_addr) ||
 			    IN6_IS_ADDR_MC_LINKLOCAL(&dst->sin6_addr)) {
 				/*