From owner-svn-src-user@FreeBSD.ORG Thu Oct 24 00:00:24 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 E94BA421; Thu, 24 Oct 2013 00:00:24 +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 BD7E52A1F; Thu, 24 Oct 2013 00:00:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9O00OM6007777; Thu, 24 Oct 2013 00:00:24 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9O00OYW007776; Thu, 24 Oct 2013 00:00:24 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310240000.r9O00OYW007776@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 24 Oct 2013 00:00:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r257024 - 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:00:25 -0000 Author: ae Date: Thu Oct 24 00:00:24 2013 New Revision: 257024 URL: http://svnweb.freebsd.org/changeset/base/257024 Log: Scope related cleanup in nd6_ns_input(): * remove in6_setscope() calls; * don't do route lookup for link-local addresses. Modified: user/ae/inet6/sys/netinet6/nd6_nbr.c Modified: user/ae/inet6/sys/netinet6/nd6_nbr.c ============================================================================== --- user/ae/inet6/sys/netinet6/nd6_nbr.c Wed Oct 23 23:51:39 2013 (r257023) +++ user/ae/inet6/sys/netinet6/nd6_nbr.c Thu Oct 24 00:00:24 2013 (r257024) @@ -134,9 +134,6 @@ nd6_ns_input(struct mbuf *m, int off, in #endif ip6 = mtod(m, struct ip6_hdr *); /* adjust pointer for safety */ taddr6 = nd_ns->nd_ns_target; - if (in6_setscope(&taddr6, ifp, NULL) != 0) - goto bad; - if (ip6->ip6_hlim != 255) { nd6log((LOG_ERR, "nd6_ns_input: invalid hlim (%d) from %s to %s on %s\n", @@ -147,8 +144,7 @@ nd6_ns_input(struct mbuf *m, int off, in if (IN6_IS_ADDR_UNSPECIFIED(&saddr6)) { /* dst has to be a solicited node multicast address. */ - if (daddr6.s6_addr16[0] == IPV6_ADDR_INT16_MLL && - /* don't check ifindex portion */ + if (daddr6.s6_addr32[0] == IPV6_ADDR_INT32_MLL && daddr6.s6_addr32[1] == 0 && daddr6.s6_addr32[2] == IPV6_ADDR_INT32_ONE && daddr6.s6_addr8[12] == 0xff) { @@ -225,7 +221,7 @@ nd6_ns_input(struct mbuf *m, int off, in ifa = (struct ifaddr *)in6ifa_ifpwithaddr(ifp, &taddr6); /* (2) check. */ - if (ifa == NULL) { + if (ifa == NULL && !IN6_IS_ADDR_LINKLOCAL(&taddr6)) { struct rtentry *rt; struct sockaddr_in6 tsin6; int need_proxy; @@ -335,12 +331,7 @@ nd6_ns_input(struct mbuf *m, int off, in * S bit ("solicited") must be zero. */ if (IN6_IS_ADDR_UNSPECIFIED(&saddr6)) { - struct in6_addr in6_all; - - in6_all = in6addr_linklocal_allnodes; - if (in6_setscope(&in6_all, ifp, NULL) != 0) - goto bad; - nd6_na_output_fib(ifp, &in6_all, &taddr6, + nd6_na_output_fib(ifp, &in6addr_linklocal_allnodes, &taddr6, ((anycast || proxy || !tlladdr) ? 0 : ND_NA_FLAG_OVERRIDE) | rflag, tlladdr, proxy ? (struct sockaddr *)&proxydl : NULL, M_GETFIB(m));