From owner-svn-src-stable@FreeBSD.ORG  Thu Oct  9 23:30:52 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8842A218;
 Thu,  9 Oct 2014 23:30:52 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74026C70;
 Thu,  9 Oct 2014 23:30:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99NUqFO076769;
 Thu, 9 Oct 2014 23:30:52 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99NUqd9076768;
 Thu, 9 Oct 2014 23:30:52 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201410092330.s99NUqd9076768@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 9 Oct 2014 23:30:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r272860 - stable/10/usr.sbin/route6d
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 23:30:52 -0000

Author: hrs
Date: Thu Oct  9 23:30:51 2014
New Revision: 272860
URL: https://svnweb.freebsd.org/changeset/base/272860

Log:
  MFC r270234:
  
    Recover sin6_scope_id of gateway addresses in riprecv() by using the if_index
    where a RIP packet was received.  This fixes a bug which prevented gateway
    addresses in fe80::/64 from being added.

Modified:
  stable/10/usr.sbin/route6d/route6d.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/route6d/route6d.c
==============================================================================
--- stable/10/usr.sbin/route6d/route6d.c	Thu Oct  9 23:29:44 2014	(r272859)
+++ stable/10/usr.sbin/route6d/route6d.c	Thu Oct  9 23:30:51 2014	(r272860)
@@ -2838,6 +2838,8 @@ addroute(struct riprt *rrt,
 	sin6->sin6_len = sizeof(struct sockaddr_in6);
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_addr = *gw;
+	if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
+		sin6->sin6_scope_id = ifcp->ifc_index;
 	sin6 = (struct sockaddr_in6 *)((char *)sin6 + ROUNDUP(sin6->sin6_len));
 	/* Netmask */
 	sin6->sin6_len = sizeof(struct sockaddr_in6);