From owner-svn-src-user@FreeBSD.ORG Fri Oct 18 13:02:09 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 ESMTP id D2523EA8; Fri, 18 Oct 2013 13:02:09 +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 A5D432F0A; Fri, 18 Oct 2013 13:02:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ID29NZ054361; Fri, 18 Oct 2013 13:02:09 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ID29Ud054360; Fri, 18 Oct 2013 13:02:09 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310181302.r9ID29Ud054360@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 18 Oct 2013 13:02:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256738 - 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: Fri, 18 Oct 2013 13:02:09 -0000 Author: ae Date: Fri Oct 18 13:02:09 2013 New Revision: 256738 URL: http://svnweb.freebsd.org/changeset/base/256738 Log: Scope related cleanup in in6_control(): * remove sa6_embedscope(), sa6_recoverscope() and in6_setscope() calls; * use sa6_checkzone() to check sockaddr_in6 structure. Before this check initialize sin6_scope_id if it is zero. We can do this, because we know interface and can use ifnet to determine zone id. Modified: user/ae/inet6/sys/netinet6/in6.c Modified: user/ae/inet6/sys/netinet6/in6.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6.c Fri Oct 18 12:51:28 2013 (r256737) +++ user/ae/inet6/sys/netinet6/in6.c Fri Oct 18 13:02:09 2013 (r256738) @@ -454,10 +454,10 @@ in6_control(struct socket *so, u_long cm break; } if (sa6 && sa6->sin6_family == AF_INET6) { - if (sa6->sin6_scope_id != 0) - error = sa6_embedscope(sa6, 0); - else - error = in6_setscope(&sa6->sin6_addr, ifp, NULL); + if (sa6->sin6_scope_id == 0) + sa6->sin6_scope_id = in6_getscopezone(ifp, + in6_addrscope(&sa6->sin6_addr)); + error = sa6_checkzone(sa6); if (error != 0) return (error); if (td != NULL && (error = prison_check_ip6(td->td_ucred, @@ -557,8 +557,6 @@ in6_control(struct socket *so, u_long cm switch (cmd) { case SIOCGIFADDR_IN6: ifr->ifr_addr = ia->ia_addr; - if ((error = sa6_recoverscope(&ifr->ifr_addr)) != 0) - goto out; break; case SIOCGIFDSTADDR_IN6: @@ -571,8 +569,6 @@ in6_control(struct socket *so, u_long cm * an error? */ ifr->ifr_dstaddr = ia->ia_dstaddr; - if ((error = sa6_recoverscope(&ifr->ifr_dstaddr)) != 0) - goto out; break; case SIOCGIFNETMASK_IN6: @@ -1818,26 +1814,11 @@ in6_lifaddr_ioctl(struct socket *so, u_l ia = ifa2ia6(ifa); if (cmd == SIOCGLIFADDR) { - int error; - /* fill in the if_laddrreq structure */ bcopy(&ia->ia_addr, &iflr->addr, ia->ia_addr.sin6_len); - error = sa6_recoverscope( - (struct sockaddr_in6 *)&iflr->addr); - if (error != 0) { - ifa_free(ifa); - return (error); - } - if ((ifp->if_flags & IFF_POINTOPOINT) != 0) { bcopy(&ia->ia_dstaddr, &iflr->dstaddr, ia->ia_dstaddr.sin6_len); - error = sa6_recoverscope( - (struct sockaddr_in6 *)&iflr->dstaddr); - if (error != 0) { - ifa_free(ifa); - return (error); - } } else bzero(&iflr->dstaddr, sizeof(iflr->dstaddr));