From owner-svn-src-user@FreeBSD.ORG Thu Oct 24 00:48:31 2013 Return-Path: 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 CD8C9442; Thu, 24 Oct 2013 00:48:31 +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 9FD432CF8; Thu, 24 Oct 2013 00:48:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9O0mVjg023370; Thu, 24 Oct 2013 00:48:31 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9O0mVN5023369; Thu, 24 Oct 2013 00:48:31 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310240048.r9O0mVN5023369@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 24 Oct 2013 00:48:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r257031 - 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: Thu, 24 Oct 2013 00:48:31 -0000 Author: ae Date: Thu Oct 24 00:48:31 2013 New Revision: 257031 URL: http://svnweb.freebsd.org/changeset/base/257031 Log: Scope related cleanup in rip6_bind(): * remove sa6_embedscope() call, use sa6_checkzone() instead; * use in6ifa_ifwithaddr() to determine interface where address is configured. * initialize inp->in6p_zoneid. Modified: user/ae/inet6/sys/netinet6/raw_ip6.c Modified: user/ae/inet6/sys/netinet6/raw_ip6.c ============================================================================== --- user/ae/inet6/sys/netinet6/raw_ip6.c Thu Oct 24 00:39:27 2013 (r257030) +++ user/ae/inet6/sys/netinet6/raw_ip6.c Thu Oct 24 00:48:31 2013 (r257031) @@ -721,7 +721,7 @@ rip6_bind(struct socket *so, struct sock { struct inpcb *inp; struct sockaddr_in6 *addr = (struct sockaddr_in6 *)nam; - struct ifaddr *ifa = NULL; + struct in6_ifaddr *ifa = NULL; int error = 0; inp = sotoinpcb(so); @@ -733,24 +733,24 @@ rip6_bind(struct socket *so, struct sock return (error); if (TAILQ_EMPTY(&V_ifnet) || addr->sin6_family != AF_INET6) return (EADDRNOTAVAIL); - if ((error = sa6_embedscope(addr, V_ip6_use_defzone)) != 0) + if ((error = sa6_checkzone(addr)) != 0) return (error); - - if (!IN6_IS_ADDR_UNSPECIFIED(&addr->sin6_addr) && - (ifa = ifa_ifwithaddr((struct sockaddr *)addr)) == NULL) - return (EADDRNOTAVAIL); - if (ifa != NULL && - ((struct in6_ifaddr *)ifa)->ia6_flags & - (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY| - IN6_IFF_DETACHED|IN6_IFF_DEPRECATED)) { - ifa_free(ifa); + if (!IN6_IS_ADDR_UNSPECIFIED(&addr->sin6_addr)) { + ifa = in6ifa_ifwithaddr(&addr->sin6_addr, addr->sin6_scope_id); + if (ifa == NULL) + return (EADDRNOTAVAIL); + } + if (ifa != NULL && ifa->ia6_flags & (IN6_IFF_ANYCAST | + IN6_IFF_NOTREADY | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED)) { + ifa_free(&ifa->ia_ifa); return (EADDRNOTAVAIL); } if (ifa != NULL) - ifa_free(ifa); + ifa_free(&ifa->ia_ifa); INP_INFO_WLOCK(&V_ripcbinfo); INP_WLOCK(inp); inp->in6p_laddr = addr->sin6_addr; + inp->in6p_zoneid = addr->sin6_scope_id; INP_WUNLOCK(inp); INP_INFO_WUNLOCK(&V_ripcbinfo); return (0);