From owner-svn-src-user@FreeBSD.ORG Tue Jan 22 12:34:23 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0A1A7516; Tue, 22 Jan 2013 12:34:23 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D6C23F69; Tue, 22 Jan 2013 12:34:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MCYMZH050950; Tue, 22 Jan 2013 12:34:22 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MCYMHd050948; Tue, 22 Jan 2013 12:34:22 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201301221234.r0MCYMHd050948@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Tue, 22 Jan 2013 12:34:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r245790 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 12:34:23 -0000 Author: ae Date: Tue Jan 22 12:34:22 2013 New Revision: 245790 URL: http://svnweb.freebsd.org/changeset/base/245790 Log: Add in6ifa_ifwithaddr() function. It is similar to ifa_ifwithaddr(), but optimized for IPv6. Modified: user/ae/inet6/sys/netinet6/in6.c user/ae/inet6/sys/netinet6/in6_var.h Modified: user/ae/inet6/sys/netinet6/in6.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6.c Tue Jan 22 12:10:51 2013 (r245789) +++ user/ae/inet6/sys/netinet6/in6.c Tue Jan 22 12:34:22 2013 (r245790) @@ -1904,6 +1904,33 @@ in6ifa_ifpwithaddr(struct ifnet *ifp, st } /* + * find the internet address corresponding to a given address. + * ifaddr is returned referenced. + */ +struct in6_ifaddr * +in6ifa_ifwithaddr(const struct sockaddr_in6 *sa6) +{ + struct in6_ifaddr *ia; + + IN6_IFADDR_RLOCK(); + LIST_FOREACH(ia, IN6ADDR_HASH(&sa6->sin6_addr), ia6_hash) { + if (IN6_ARE_ADDR_EQUAL(IA6_IN6(ia), &sa6->sin6_addr)) { + /* + * XXX: should we determine the scope and compare + * sin6_scope_id with corresponding zone id? + */ + if (sa6->sin6_scope_id != 0 && + sa6->sin6_scope_id != in6_getlinkzone(ia->ia_ifp)) + continue; + ifa_ref(ia); + break; + } + } + IN6_IFADDR_RUNLOCK(); + return (ia); +} + +/* * Convert IP6 address to printable (loggable) representation. Caller * has to make sure that ip6buf is at least INET6_ADDRSTRLEN long. */ Modified: user/ae/inet6/sys/netinet6/in6_var.h ============================================================================== --- user/ae/inet6/sys/netinet6/in6_var.h Tue Jan 22 12:10:51 2013 (r245789) +++ user/ae/inet6/sys/netinet6/in6_var.h Tue Jan 22 12:34:22 2013 (r245790) @@ -801,6 +801,7 @@ void in6_setmaxmtu(void); int in6_if2idlen(struct ifnet *); struct in6_ifaddr *in6ifa_ifpforlinklocal(struct ifnet *, int); struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, struct in6_addr *); +struct in6_ifaddr *in6ifa_ifwithaddr(const struct sockaddr_in6 *); char *ip6_sprintf(char *, const struct in6_addr *); int in6_addr2zoneid(struct ifnet *, struct in6_addr *, u_int32_t *); int in6_matchlen(struct in6_addr *, struct in6_addr *);