From owner-svn-src-user@FreeBSD.ORG  Tue May 27 08:30:06 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BDD6C353;
 Tue, 27 May 2014 08:30:06 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AC4092D00;
 Tue, 27 May 2014 08:30:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4R8U66E074116;
 Tue, 27 May 2014 08:30:06 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4R8U6xU074115;
 Tue, 27 May 2014 08:30:06 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201405270830.s4R8U6xU074115@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 27 May 2014 08:30:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r266739 - 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.18
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: Tue, 27 May 2014 08:30:06 -0000

Author: ae
Date: Tue May 27 08:30:06 2014
New Revision: 266739
URL: http://svnweb.freebsd.org/changeset/base/266739

Log:
  Restore no_prefer_iface flag support in the SAS.
  
  Discussed with:	melifaro

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

Modified: user/ae/inet6/sys/netinet6/in6_src.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_src.c	Tue May 27 08:14:54 2014	(r266738)
+++ user/ae/inet6/sys/netinet6/in6_src.c	Tue May 27 08:30:06 2014	(r266739)
@@ -229,10 +229,12 @@ srcaddrcmp(struct srcaddr_choice *c, str
 	 * XXX: This is a TODO.
 	 */
 	/* Rule 5: Prefer outgoing interface. */
-	if (c->ia->ia_ifp == dst->ifp && ia->ia_ifp != dst->ifp)
-		NEXT(5);
-	if (c->ia->ia_ifp != dst->ifp && ia->ia_ifp == dst->ifp)
-		REPLACE(5);
+	if (!(ND_IFINFO(dst->ifp)->flags & ND6_IFF_NO_PREFER_IFACE)) {
+		if (c->ia->ia_ifp == dst->ifp && ia->ia_ifp != dst->ifp)
+			NEXT(5);
+		if (c->ia->ia_ifp != dst->ifp && ia->ia_ifp == dst->ifp)
+			REPLACE(5);
+	}
 	/*
 	 * Rule 5.5: Prefer addresses in a prefix advertised by
 	 * the next-hop.