From owner-svn-src-user@FreeBSD.ORG  Wed Dec  4 20:04:35 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7C630220;
 Wed,  4 Dec 2013 20:04:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 69CB71D16;
 Wed,  4 Dec 2013 20:04:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4K4Zu9064130;
 Wed, 4 Dec 2013 20:04:35 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB4K4ZRk064129;
 Wed, 4 Dec 2013 20:04:35 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201312042004.rB4K4ZRk064129@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 4 Dec 2013 20:04:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258935 - user/ae/inet6/sys/netinet6
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Dec 2013 20:04:35 -0000

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)) {
 				/*