From owner-svn-src-user@FreeBSD.ORG Fri Nov 22 05:25:04 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 74AB95B1; Fri, 22 Nov 2013 05:25:04 +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 650CB290C; Fri, 22 Nov 2013 05:25:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAM5P4eZ029494; Fri, 22 Nov 2013 05:25:04 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAM5P4r2029492; Fri, 22 Nov 2013 05:25:04 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201311220525.rAM5P4r2029492@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 22 Nov 2013 05:25:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258468 - 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: Fri, 22 Nov 2013 05:25:04 -0000 Author: ae Date: Fri Nov 22 05:25:03 2013 New Revision: 258468 URL: http://svnweb.freebsd.org/changeset/base/258468 Log: Use in6_getscopezone instead of sa6_recoverscope to initialize sin6_scope_id for LLA. Modified: user/ae/inet6/sys/netinet6/in6.c Modified: user/ae/inet6/sys/netinet6/in6.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6.c Fri Nov 22 05:02:37 2013 (r258467) +++ user/ae/inet6/sys/netinet6/in6.c Fri Nov 22 05:25:03 2013 (r258468) @@ -2261,11 +2261,10 @@ in6_lltable_dump(struct lltable *llt, st ndpc.rtm.rtm_type = RTM_GET; ndpc.rtm.rtm_flags = RTF_UP; ndpc.rtm.rtm_addrs = RTA_DST | RTA_GATEWAY; - ndpc.sin6.sin6_family = AF_INET6; - ndpc.sin6.sin6_len = sizeof(ndpc.sin6); bcopy(L3_ADDR(lle), &ndpc.sin6, L3_ADDR_LEN(lle)); - if (V_deembed_scopeid) - sa6_recoverscope(&ndpc.sin6); + if (IN6_IS_ADDR_LINKLOCAL(&ndpc.sin6.sin6_addr)) + ndpc.sin6.sin6_scope_id = in6_getscopezone( + ifp, IPV6_ADDR_SCOPE_LINKLOCAL); /* publish */ if (lle->la_flags & LLE_PUB)