From owner-svn-src-user@FreeBSD.ORG  Wed Oct 16 08:24:06 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 ESMTP id B9B236A7;
 Wed, 16 Oct 2013 08:24:06 +0000 (UTC) (envelope-from ae@FreeBSD.org)
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 A7B742A07;
 Wed, 16 Oct 2013 08:24:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G8O6oM072207;
 Wed, 16 Oct 2013 08:24:06 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G8O670072206;
 Wed, 16 Oct 2013 08:24:06 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201310160824.r9G8O670072206@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 16 Oct 2013 08:24:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256596 - 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.14
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, 16 Oct 2013 08:24:06 -0000

Author: ae
Date: Wed Oct 16 08:24:06 2013
New Revision: 256596
URL: http://svnweb.freebsd.org/changeset/base/256596

Log:
  Rename lookup_addrsel_policy() into lookup_policy_label(). Now it
  returns label insted of address policy.

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	Wed Oct 16 08:21:44 2013	(r256595)
+++ user/ae/inet6/sys/netinet6/in6_src.c	Wed Oct 16 08:24:06 2013	(r256596)
@@ -134,7 +134,7 @@ static int in6_selectif(struct sockaddr_
 	struct ip6_moptions *, struct route_in6 *ro, struct ifnet **,
 	struct ifnet *, u_int);
 
-static struct in6_addrpolicy *lookup_addrsel_policy(struct sockaddr_in6 *);
+static int lookup_policy_label(const struct in6_addr *, uint32_t);
 
 static void init_policy_queue(void);
 static int add_addrsel_policyent(struct in6_addrpolicy *);
@@ -949,21 +949,24 @@ addrsel_policy_init(void)
 	ADDRSEL_SXLOCK_INIT();
 }
 
-static struct in6_addrpolicy *
-lookup_addrsel_policy(struct sockaddr_in6 *key)
+static int
+lookup_policy_label(const struct in6_addr *addr, uint32_t zoneid)
 {
+	struct sockaddr_in6 sa6;
 	struct in6_addrpolicy *match = NULL;
 
-	ADDRSEL_LOCK();
-	match = match_addrsel_policy(key);
+	sa6.sin6_addr = *addr;
+	sa6.sin6_scope_id = zoneid;
 
+	ADDRSEL_LOCK();
+	match = match_addrsel_policy(&sa6);
 	if (match == NULL)
 		match = &V_defaultaddrpolicy;
 	else
 		match->use++;
 	ADDRSEL_UNLOCK();
 
-	return (match);
+	return (match->label);
 }
 
 /*