From owner-svn-src-user@FreeBSD.ORG Thu Nov 21 02:42: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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D742F14D; Thu, 21 Nov 2013 02:42:23 +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 AECA92AC8; Thu, 21 Nov 2013 02:42:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAL2gN4I083958; Thu, 21 Nov 2013 02:42:23 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAL2gNZS083956; Thu, 21 Nov 2013 02:42:23 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311210242.rAL2gNZS083956@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 21 Nov 2013 02:42:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258413 - 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.16 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: Thu, 21 Nov 2013 02:42:23 -0000 Author: ae Date: Thu Nov 21 02:42:22 2013 New Revision: 258413 URL: http://svnweb.freebsd.org/changeset/base/258413 Log: Add sa6_checkzone_ifp() function. It is similar to sa6_checkzone, but has additional argument - ifnet. It is used for scope zone index initialization. Modified: user/ae/inet6/sys/netinet6/scope6.c user/ae/inet6/sys/netinet6/scope6_var.h Modified: user/ae/inet6/sys/netinet6/scope6.c ============================================================================== --- user/ae/inet6/sys/netinet6/scope6.c Thu Nov 21 01:08:10 2013 (r258412) +++ user/ae/inet6/sys/netinet6/scope6.c Thu Nov 21 02:42:22 2013 (r258413) @@ -500,3 +500,24 @@ sa6_checkzone(struct sockaddr_in6 *sa6) /* Return error if we can't determine zone id */ return (sa6->sin6_scope_id ? 0: EADDRNOTAVAIL); } + +/* + * This function is similar to sa6_checkzone, but it uses given ifp + * to initialize sin6_scope_id. + */ +int +sa6_checkzone_ifp(struct ifnet *ifp, struct sockaddr_in6 *sa6) +{ + int scope; + + scope = in6_addrscope(&sa6->sin6_addr); + if (scope == IPV6_ADDR_SCOPE_LINKLOCAL || + scope == IPV6_ADDR_SCOPE_INTFACELOCAL) { + if (sa6->sin6_scope_id != 0 && + sa6->sin6_scope_id != in6_getscopezone(ifp, scope)) + return (EADDRNOTAVAIL); + if (sa6->sin6_scope_id == 0) + sa6->sin6_scope_id = in6_getscopezone(ifp, scope); + } + return (sa6_checkzone(sa6)); +} Modified: user/ae/inet6/sys/netinet6/scope6_var.h ============================================================================== --- user/ae/inet6/sys/netinet6/scope6_var.h Thu Nov 21 01:08:10 2013 (r258412) +++ user/ae/inet6/sys/netinet6/scope6_var.h Thu Nov 21 02:42:22 2013 (r258413) @@ -59,6 +59,7 @@ u_int32_t scope6_addr2default(struct in6 int sa6_embedscope(struct sockaddr_in6 *, int); int sa6_recoverscope(struct sockaddr_in6 *); int sa6_checkzone(struct sockaddr_in6 *); +int sa6_checkzone_ifp(struct ifnet *, struct sockaddr_in6 *); int in6_setscope(struct in6_addr *, struct ifnet *, u_int32_t *); int in6_clearscope(struct in6_addr *); uint16_t in6_getscope(struct in6_addr *);